From 891f45b3abf0e346036f351c108bda0cf39c499a Mon Sep 17 00:00:00 2001
From: Daniel Plagge <plagge@cs.uni-duesseldorf.de>
Date: Tue, 12 Feb 2013 22:41:09 +0100
Subject: [PATCH] bugfix: passing bound variables was not always guaranteed
---
.../de/prob/eventb/translator/ExpressionVisitor.java | 12 ++----------
.../de/prob/eventb/translator/PredicateVisitor.java | 1 -
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/de.prob.core/src/de/prob/eventb/translator/ExpressionVisitor.java b/de.prob.core/src/de/prob/eventb/translator/ExpressionVisitor.java
index e5dd6830..5516aafa 100644
--- a/de.prob.core/src/de/prob/eventb/translator/ExpressionVisitor.java
+++ b/de.prob.core/src/de/prob/eventb/translator/ExpressionVisitor.java
@@ -115,13 +115,6 @@ public class ExpressionVisitor extends SimpleVisitorAdapter implements // NOPMD
// we need some abilities of the linked list, using List is not an option
private boolean expressionSet = false;
- @SuppressWarnings("unused")
- private ExpressionVisitor() { // we want to prevent clients from calling
- // the default constructor
- super();
- throw new AssertionError("Do not call this constructor");
- }
-
public ExpressionVisitor(final LinkedList<String> bounds) { // NOPMD
super();
this.bounds = bounds;
@@ -633,8 +626,7 @@ public class ExpressionVisitor extends SimpleVisitorAdapter implements // NOPMD
Expression[] expressions = expression.getChildExpressions();
List<PExpression> childExprs = new ArrayList<PExpression>();
for (Expression e : expressions) {
- ExpressionVisitor v = new ExpressionVisitor(
- new LinkedList<String>());
+ ExpressionVisitor v = new ExpressionVisitor(bounds);
e.accept(v);
childExprs.add(v.getExpression());
}
@@ -643,7 +635,7 @@ public class ExpressionVisitor extends SimpleVisitorAdapter implements // NOPMD
Predicate[] childPredicates = expression.getChildPredicates();
List<PPredicate> childPreds = new ArrayList<PPredicate>();
for (Predicate pd : childPredicates) {
- PredicateVisitor v = new PredicateVisitor(null);
+ PredicateVisitor v = new PredicateVisitor(bounds);
pd.accept(v);
childPreds.add(v.getPredicate());
}
diff --git a/de.prob.core/src/de/prob/eventb/translator/PredicateVisitor.java b/de.prob.core/src/de/prob/eventb/translator/PredicateVisitor.java
index 035811a2..59463a55 100644
--- a/de.prob.core/src/de/prob/eventb/translator/PredicateVisitor.java
+++ b/de.prob.core/src/de/prob/eventb/translator/PredicateVisitor.java
@@ -418,7 +418,6 @@ public class PredicateVisitor extends SimpleVisitorAdapter implements // NOPMD
AExtendedPredPredicate p = new AExtendedPredPredicate();
IPredicateExtension extension = predicate.getExtension();
String symbol = extension.getSyntaxSymbol();
- Object origin = extension.getOrigin();
// FIXME THEORY-PLUGIN re-enable when the theory plugin was released
--
GitLab