[DAG-copy] Adapt existing visitors to be DAG-aware

Steffen Märcker · Steffen Märcker · commit 51f0d1cf7216 · 2018-03-09T18:16:44.000+01:00
Rename the method visit to visitNow in existing visitor classes.
This makes them traverse the AST without visiting nodes multiple times.
diff --git a/prism/src/automata/LTL2RabinLibrary.java b/prism/src/automata/LTL2RabinLibrary.java
@@ -132,7 +132,7 @@ public static DA<BitSet, AcceptanceRabin> getDRAforLTL(Expression ltl, Values co
 		labels = new ArrayList<String>();
 		ltl.accept(new ASTTraverse()
 		{
-			public Object visit(ExpressionLabel e) throws PrismLangException
+			public Object visitNow(ExpressionLabel e) throws PrismLangException
 			{
 				labels.add(e.getName());
 				return null;
@@ -144,7 +144,7 @@ public Object visit(ExpressionLabel e) throws PrismLangException
 		Expression ltl2 = ltl.deepCopy();
 		ltl2.accept(new ASTTraverseModify()
 		{
-			public Object visit(ExpressionLabel e) throws PrismLangException
+			public Object visitNow(ExpressionLabel e) throws PrismLangException
 			{
 				int i = labels.indexOf(e.getName());
 				//char letter = (char) ('a' + i);
diff --git a/prism/src/parser/BooleanUtils.java b/prism/src/parser/BooleanUtils.java
@@ -118,18 +118,18 @@ private static Expression removeImpliesIffAndParentheses(Expression expr)
 		try {
 			exprMod = (Expression) expr.accept(new ASTTraverseModify()
 			{
-				public Object visit(ExpressionUnaryOp e) throws PrismLangException
+				public Object visitNow(ExpressionUnaryOp e) throws PrismLangException
 				{
 					// Remove parentheses: (a)
 					if (Expression.isParenth(e)) {
 						Expression a = (Expression) (e.getOperand().accept(this));
 						// (a)  ==  a 
 						return a;
 					}
-					return super.visit(e);
+					return super.visitNow(e);
 				}
 
-				public Object visit(ExpressionBinaryOp e) throws PrismLangException
+				public Object visitNow(ExpressionBinaryOp e) throws PrismLangException
 				{
 					// Remove implication: a => b
 					if (Expression.isImplies(e)) {
@@ -145,7 +145,7 @@ public Object visit(ExpressionBinaryOp e) throws PrismLangException
 						// a <=> b  ==  (a | !b) & (!a | b) 
 						return Expression.And(Expression.Or(a, Expression.Not(b)), Expression.Or(Expression.Not(a.deepCopy()), b.deepCopy()));
 					}
-					return super.visit(e);
+					return super.visitNow(e);
 				}
 			});
 		} catch (PrismLangException e) {
diff --git a/prism/src/parser/PrismParser.java b/prism/src/parser/PrismParser.java
@@ -80,7 +80,7 @@ else if (args[0].equals("-expression") || args[0].equals("-e")) {
                         else if (args[0].equals("-ltl") || args[0].equals("-l")) {
                                 Expression expr = p.parseSingleLTLFormula(str);
                                 expr = (Expression) expr.accept(new ASTTraverseModify() {
-                                        public Object visit(ExpressionIdent e) throws PrismLangException
+                                        public Object visitNow(ExpressionIdent e) throws PrismLangException
                                         {
                                                 return new parser.ast.ExpressionVar(e.getName(), TypeBool.getInstance());
                                         }
@@ -99,7 +99,7 @@ public Object visit(ExpressionIdent e) throws PrismLangException
                                         System.out.println("Syntactically co-safe: " + Expression.isCoSafeLTLSyntactic(exprPnf));
                                 }
                                 Expression expr2 = (Expression) expr.deepCopy().accept(new ASTTraverseModify() {
-                                        public Object visit(ExpressionVar e) throws PrismLangException
+                                        public Object visitNow(ExpressionVar e) throws PrismLangException
                                         {
                                                         return new parser.ast.ExpressionLabel(e.getName());
                                         }
diff --git a/prism/src/parser/visitor/EvaluatePartially.java b/prism/src/parser/visitor/EvaluatePartially.java
@@ -42,7 +42,7 @@ public EvaluatePartially(EvaluateContext ec)
 		this.ec = ec;
 	}
 	
-	public Object visit(ExpressionConstant e) throws PrismLangException
+	public Object visitNow(ExpressionConstant e) throws PrismLangException
 	{
 		Object val = ec.getConstantValue(e.getName());
 		if (val == null) {
@@ -52,7 +52,7 @@ public Object visit(ExpressionConstant e) throws PrismLangException
 		}
 	}
 	
-	public Object visit(ExpressionVar e) throws PrismLangException
+	public Object visitNow(ExpressionVar e) throws PrismLangException
 	{
 		Object val = ec.getVarValue(e.getName(), e.getIndex());
 		if (val == null) {
diff --git a/prism/src/parser/visitor/ExpandConstants.java b/prism/src/parser/visitor/ExpandConstants.java
@@ -42,7 +42,7 @@ public ExpandConstants(ConstantList constantList)
 		this.constantList = constantList;
 	}
 	
-	public Object visit(ExpressionConstant e) throws PrismLangException
+	public Object visitNow(ExpressionConstant e) throws PrismLangException
 	{
 		int i;
 		Type t;
diff --git a/prism/src/parser/visitor/ExpandFormulas.java b/prism/src/parser/visitor/ExpandFormulas.java
@@ -48,7 +48,7 @@ public ExpandFormulas(FormulaList formulaList, boolean replace)
 		this.replace = replace;
 	}
 	
-	public Object visit(ExpressionFormula e) throws PrismLangException
+	public Object visitNow(ExpressionFormula e) throws PrismLangException
 	{
 		int i;
 		Type t;
diff --git a/prism/src/parser/visitor/ExpandLabels.java b/prism/src/parser/visitor/ExpandLabels.java
@@ -44,7 +44,7 @@ public ExpandLabels(LabelList labelList)
 		this.labelList = labelList;
 	}
 	
-	public Object visit(ExpressionLabel e) throws PrismLangException
+	public Object visitNow(ExpressionLabel e) throws PrismLangException
 	{
 		int i;
 		Type t;
diff --git a/prism/src/parser/visitor/ExpandPropRefsAndLabels.java b/prism/src/parser/visitor/ExpandPropRefsAndLabels.java
@@ -49,7 +49,7 @@ public ExpandPropRefsAndLabels(PropertiesFile propertiesFile, LabelList labelLis
 		this.labelList = labelList;
 	}
 	
-	public Object visit(ExpressionLabel e) throws PrismLangException
+	public Object visitNow(ExpressionLabel e) throws PrismLangException
 	{
 		int i;
 		Type t;
@@ -84,7 +84,7 @@ public Object visit(ExpressionLabel e) throws PrismLangException
 		return e;
 	}
 
-	public Object visit(ExpressionProp e) throws PrismLangException
+	public Object visitNow(ExpressionProp e) throws PrismLangException
 	{
 		Property prop;
 		Type t;
diff --git a/prism/src/parser/visitor/ExpressionTraverseNonNested.java b/prism/src/parser/visitor/ExpressionTraverseNonNested.java
@@ -42,9 +42,9 @@
  * <br/>
  * Subclasses should not override<br/>
  * <ul>
- *  <li>{@code visit(ExpressionProb)}</li>
- *  <li>{@code visit(ExpressionReward)}</li>
- *  <li>{@code visit(ExpressionSS)}</li>
+ *  <li>{@code visitNow(ExpressionProb)}</li>
+ *  <li>{@code visitNow(ExpressionReward)}</li>
+ *  <li>{@code visitNow(ExpressionSS)}</li>
  * </ul>
  */
 public class ExpressionTraverseNonNested extends ASTTraverse
@@ -74,7 +74,7 @@ private boolean inLimit()
 	}
 
 	@Override
-	public Object visit(ExpressionProb e) throws PrismLangException
+	public Object visitNow(ExpressionProb e) throws PrismLangException
 	{
 		currentNesting++;
 		// only visit if we are still in limit
@@ -88,7 +88,7 @@ public Object visit(ExpressionProb e) throws PrismLangException
 	}
 
 	@Override
-	public Object visit(ExpressionReward e) throws PrismLangException
+	public Object visitNow(ExpressionReward e) throws PrismLangException
 	{
 		currentNesting++;
 		// only visit if we are still in limit
@@ -102,7 +102,7 @@ public Object visit(ExpressionReward e) throws PrismLangException
 	}
 
 	@Override
-	public Object visit(ExpressionSS e) throws PrismLangException
+	public Object visitNow(ExpressionSS e) throws PrismLangException
 	{
 		currentNesting++;
 		// only visit if we are still in limit
diff --git a/prism/src/parser/visitor/FindAllConstants.java b/prism/src/parser/visitor/FindAllConstants.java
@@ -41,7 +41,7 @@ public FindAllConstants(ConstantList constantList)
 		this.constantList = constantList;
 	}
 	
-	public Object visit(ExpressionIdent e) throws PrismLangException
+	public Object visitNow(ExpressionIdent e) throws PrismLangException
 	{
 		int i;
 		// See if identifier corresponds to a constant
diff --git a/prism/src/parser/visitor/FindAllFormulas.java b/prism/src/parser/visitor/FindAllFormulas.java
@@ -41,7 +41,7 @@ public FindAllFormulas(FormulaList formulaList)
 		this.formulaList = formulaList;
 	}
 	
-	public Object visit(ExpressionIdent e) throws PrismLangException
+	public Object visitNow(ExpressionIdent e) throws PrismLangException
 	{
 		int i;
 		// See if identifier corresponds to a formula
diff --git a/prism/src/parser/visitor/FindAllPropRefs.java b/prism/src/parser/visitor/FindAllPropRefs.java
@@ -43,7 +43,7 @@ public FindAllPropRefs(ModulesFile mf, PropertiesFile pf)
 		this.pf = pf;
 	}
 	
-	public Object visit(ExpressionLabel e) throws PrismLangException
+	public Object visitNow(ExpressionLabel e) throws PrismLangException
 	{
 		String name;
 		Property prop = null;
diff --git a/prism/src/parser/visitor/FindAllVars.java b/prism/src/parser/visitor/FindAllVars.java
@@ -71,7 +71,7 @@ public void visitPost(Update e) throws PrismLangException
 		}
 	}
 	
-	public Object visit(ExpressionIdent e) throws PrismLangException
+	public Object visitNow(ExpressionIdent e) throws PrismLangException
 	{
 		int i;
 		// See if identifier corresponds to a variable
@@ -89,7 +89,7 @@ public Object visit(ExpressionIdent e) throws PrismLangException
 	}
 	
 	// Also re-compute info for ExpressionVar objects in case variable indices have changed
-	public Object visit(ExpressionVar e) throws PrismLangException
+	public Object visitNow(ExpressionVar e) throws PrismLangException
 	{
 		int i;
 		// See if identifier corresponds to a variable
diff --git a/prism/src/parser/visitor/ModulesFileSemanticCheck.java b/prism/src/parser/visitor/ModulesFileSemanticCheck.java
@@ -93,15 +93,15 @@ public void visitPost(ModulesFile e) throws PrismLangException
 		}
 	}
 
-	public Object visit(SystemReference e) throws PrismLangException
+	public Object visitNow(SystemReference e) throws PrismLangException
 	{
 		// Make sure referenced system exists
 		if (modulesFile.getSystemDefnByName(e.getName()) == null)
 			throw new PrismLangException("Reference to system " + e.getName() + " which does not exist", e);
 		return null;
 	}
 	
-	public Object visit(FormulaList e) throws PrismLangException
+	public Object visitNow(FormulaList e) throws PrismLangException
 	{
 		// Override - don't need to do any semantic checks on formulas
 		// (they will have been expanded in place, where needed)
@@ -181,7 +181,7 @@ public void visitPre(parser.ast.Module e) throws PrismLangException
 		//inModule = e;
 	}
 
-	public Object visit(parser.ast.Module e) throws PrismLangException
+	public Object visitNow(Module e) throws PrismLangException
 	{
 		// Override this so we can keep track of when we are in an invariant
 		visitPre(e);
@@ -208,7 +208,7 @@ public void visitPost(parser.ast.Module e) throws PrismLangException
 		//inModule = null;
 	}
 
-	public Object visit(Command e) throws PrismLangException
+	public Object visitNow(Command e) throws PrismLangException
 	{
 		// Override this so we can keep track of when we are in a command
 		visitPre(e);
diff --git a/prism/src/parser/visitor/PropertiesSemanticCheck.java b/prism/src/parser/visitor/PropertiesSemanticCheck.java
@@ -78,7 +78,7 @@ public void setModelInfo(ModelInfo modelInfo)
 		}
 	}
 
-	public Object visit(FormulaList e) throws PrismLangException
+	public Object visitNow(FormulaList e) throws PrismLangException
 	{
 		// Override - don't need to do any semantic checks on formulas
 		// (they will have been expanded in place, where needed)
diff --git a/prism/src/parser/visitor/ReplaceLabels.java b/prism/src/parser/visitor/ReplaceLabels.java
@@ -52,7 +52,7 @@ public ReplaceLabels(String labelFrom, String labelTo)
 	}
 
 	@Override
-	public Object visit(ExpressionLabel e)
+	public Object visitNow(ExpressionLabel e)
 	{
 		if (e.getName() == null)
 			return e;
diff --git a/prism/src/parser/visitor/Simplify.java b/prism/src/parser/visitor/Simplify.java
@@ -35,7 +35,7 @@
  */
 public class Simplify extends ASTTraverseModify
 {
-	public Object visit(ExpressionBinaryOp e) throws PrismLangException
+	public Object visitNow(ExpressionBinaryOp e) throws PrismLangException
 	{
 		// Apply recursively
 		e.setOperand1((Expression) (e.getOperand1().accept(this)));
@@ -159,7 +159,7 @@ public Object visit(ExpressionBinaryOp e) throws PrismLangException
 		return e;
 	}
 
-	public Object visit(ExpressionUnaryOp e) throws PrismLangException
+	public Object visitNow(ExpressionUnaryOp e) throws PrismLangException
 	{
 		// Apply recursively
 		e.setOperand((Expression) (e.getOperand().accept(this)));
@@ -174,7 +174,7 @@ public Object visit(ExpressionUnaryOp e) throws PrismLangException
 		return e;
 	}
 
-	public Object visit(ExpressionITE e) throws PrismLangException
+	public Object visitNow(ExpressionITE e) throws PrismLangException
 	{
 		// Apply recursively
 		e.setOperand1((Expression) (e.getOperand1().accept(this)));
@@ -194,7 +194,7 @@ public Object visit(ExpressionITE e) throws PrismLangException
 		return e;
 	}
 
-	public Object visit(ExpressionFunc e) throws PrismLangException
+	public Object visitNow(ExpressionFunc e) throws PrismLangException
 	{
 		int i, n;
 		boolean literal;
@@ -218,7 +218,7 @@ public Object visit(ExpressionFunc e) throws PrismLangException
 		return e;
 	}
 	
-	public Object visit(ExpressionFormula e) throws PrismLangException
+	public Object visitNow(ExpressionFormula e) throws PrismLangException
 	{
 		// If formula has an attached definition, just replace it with that
 		return e.getDefinition() != null ? e.getDefinition() : e;
diff --git a/prism/src/parser/visitor/TypeCheck.java b/prism/src/parser/visitor/TypeCheck.java
@@ -584,7 +584,7 @@ public void visitPost(ExpressionProp e) throws PrismLangException
 	{
 		// Recursively type check referenced property
 		// (may not have been done yet, e.g. because that property appears later than the current one in a PropertiesFile)
-		// (NB: recursive check not triggered in visit() method because PropertiesFile not available there)
+		// (NB: recursive check not triggered in visitNow() method because PropertiesFile not available there)
 		// However, if a PropertiesFile is not available *and* we have a type stored already, don't recompute
 		// (in case typeCheck() is called by getType() later without passing a PropertieFile)
 		if (propertiesFile == null) {
diff --git a/prism/src/pta/DigitalClocks.java b/prism/src/pta/DigitalClocks.java
@@ -128,7 +128,7 @@ public void translate(ModulesFile modulesFile, PropertiesFile propertiesFile, Ex
 		for (RewardStruct rs : modulesFile.getRewardStructs()) {
 			rs.accept(new ASTTraverseModify()
 			{
-				public Object visit(ExpressionVar e) throws PrismLangException
+				public Object visitNow(ExpressionVar e) throws PrismLangException
 				{
 					if (e.getType() instanceof TypeClock) {
 						throw new PrismLangException("Reward structures cannot contain references to clocks", e);
@@ -165,7 +165,7 @@ public Object visit(ExpressionVar e) throws PrismLangException
 		// Change all clock variable declarations to bounded integers
 		mf = (ModulesFile) mf.accept(new ASTTraverseModify()
 		{
-			public Object visit(Declaration e) throws PrismLangException
+			public Object visitNow(Declaration e) throws PrismLangException
 			{
 				if (e.getDeclType() instanceof DeclarationClock) {
 					int cMax = cci.getScaledClockMax(e.getName());
@@ -185,7 +185,7 @@ public Object visit(Declaration e) throws PrismLangException
 		allInVariants = null;
 		mf = (ModulesFile) mf.accept(new ASTTraverseModify()
 		{
-			public Object visit(parser.ast.Module e) throws PrismLangException
+			public Object visitNow(Module e) throws PrismLangException
 			{
 				Command timeCommand;
 				Updates ups;
@@ -203,7 +203,7 @@ public Object visit(parser.ast.Module e) throws PrismLangException
 				// Replace all clocks x with x+1 in invariant
 				invar = (Expression) invar.accept(new ASTTraverseModify()
 				{
-					public Object visit(ExpressionVar e) throws PrismLangException
+					public Object visitNow(ExpressionVar e) throws PrismLangException
 					{
 						if (e.getType() instanceof TypeClock) {
 							return Expression.Plus(e, Expression.Int(1));
@@ -248,7 +248,7 @@ public Object visit(ExpressionVar e) throws PrismLangException
 		asttm = new ASTTraverseModify()
 		{
 			// Resets
-			public Object visit(Update e) throws PrismLangException
+			public Object visitNow(Update e) throws PrismLangException
 			{
 				int i, n;
 				ExpressionFunc exprFunc;
@@ -270,7 +270,7 @@ public Object visit(Update e) throws PrismLangException
 			}
 
 			// Variable accesses
-			public Object visit(ExpressionVar e) throws PrismLangException
+			public Object visitNow(ExpressionVar e) throws PrismLangException
 			{
 				if (e.getType() instanceof TypeClock) {
 					e.setType(TypeInt.getInstance());
diff --git a/prism/src/pta/PTAModelChecker.java b/prism/src/pta/PTAModelChecker.java
@@ -119,7 +119,7 @@ public Result check(Expression expr) throws PrismException
 		// (do this before modifications below for better error reporting)
 		expr.accept(new ASTTraverseModify()
 		{
-			public Object visit(ExpressionVar e) throws PrismLangException
+			public Object visitNow(ExpressionVar e) throws PrismLangException
 			{
 				if (e.getType() instanceof TypeClock) {
 					throw new PrismLangException("Properties cannot contain references to clocks (try the digital clocks engine instead)", e);

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ public static DA<BitSet, AcceptanceRabin> getDRAforLTL(Expression ltl, Values co`
`132`	`132`	`labels = new ArrayList<String>();`
`133`	`133`	`ltl.accept(new ASTTraverse()`
`134`	`134`	`{`
`135`		`- public Object visit(ExpressionLabel e) throws PrismLangException`
	`135`	`+ public Object visitNow(ExpressionLabel e) throws PrismLangException`
`136`	`136`	`{`
`137`	`137`	`labels.add(e.getName());`
`138`	`138`	`return null;`
`@@ -144,7 +144,7 @@ public Object visit(ExpressionLabel e) throws PrismLangException`
`144`	`144`	`Expression ltl2 = ltl.deepCopy();`
`145`	`145`	`ltl2.accept(new ASTTraverseModify()`
`146`	`146`	`{`
`147`		`- public Object visit(ExpressionLabel e) throws PrismLangException`
	`147`	`+ public Object visitNow(ExpressionLabel e) throws PrismLangException`
`148`	`148`	`{`
`149`	`149`	`int i = labels.indexOf(e.getName());`
`150`	`150`	`//char letter = (char) ('a' + i);`
Original file line number	Diff line number	Diff line change
`@@ -118,18 +118,18 @@ private static Expression removeImpliesIffAndParentheses(Expression expr)`
`118`	`118`	`try {`
`119`	`119`	`exprMod = (Expression) expr.accept(new ASTTraverseModify()`
`120`	`120`	`{`
`121`		`- public Object visit(ExpressionUnaryOp e) throws PrismLangException`
	`121`	`+ public Object visitNow(ExpressionUnaryOp e) throws PrismLangException`
`122`	`122`	`{`
`123`	`123`	`// Remove parentheses: (a)`
`124`	`124`	`if (Expression.isParenth(e)) {`
`125`	`125`	`Expression a = (Expression) (e.getOperand().accept(this));`
`126`	`126`	`// (a) == a`
`127`	`127`	`return a;`
`128`	`128`	`}`
`129`		`- return super.visit(e);`
	`129`	`+ return super.visitNow(e);`
`130`	`130`	`}`
`131`	`131`
`132`		`- public Object visit(ExpressionBinaryOp e) throws PrismLangException`
	`132`	`+ public Object visitNow(ExpressionBinaryOp e) throws PrismLangException`
`133`	`133`	`{`
`134`	`134`	`// Remove implication: a => b`
`135`	`135`	`if (Expression.isImplies(e)) {`
`@@ -145,7 +145,7 @@ public Object visit(ExpressionBinaryOp e) throws PrismLangException`
`145`	`145`	`// a <=> b == (a \| !b) & (!a \| b)`
`146`	`146`	`return Expression.And(Expression.Or(a, Expression.Not(b)), Expression.Or(Expression.Not(a.deepCopy()), b.deepCopy()));`
`147`	`147`	`}`
`148`		`- return super.visit(e);`
	`148`	`+ return super.visitNow(e);`
`149`	`149`	`}`
`150`	`150`	`});`
`151`	`151`	`} catch (PrismLangException e) {`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ else if (args[0].equals("-expression") \|\| args[0].equals("-e")) {`
`80`	`80`	`else if (args[0].equals("-ltl") \|\| args[0].equals("-l")) {`
`81`	`81`	`Expression expr = p.parseSingleLTLFormula(str);`
`82`	`82`	`expr = (Expression) expr.accept(new ASTTraverseModify() {`
`83`		`- public Object visit(ExpressionIdent e) throws PrismLangException`
	`83`	`+ public Object visitNow(ExpressionIdent e) throws PrismLangException`
`84`	`84`	`{`
`85`	`85`	`return new parser.ast.ExpressionVar(e.getName(), TypeBool.getInstance());`
`86`	`86`	`}`
`@@ -99,7 +99,7 @@ public Object visit(ExpressionIdent e) throws PrismLangException`
`99`	`99`	`System.out.println("Syntactically co-safe: " + Expression.isCoSafeLTLSyntactic(exprPnf));`
`100`	`100`	`}`
`101`	`101`	`Expression expr2 = (Expression) expr.deepCopy().accept(new ASTTraverseModify() {`
`102`		`- public Object visit(ExpressionVar e) throws PrismLangException`
	`102`	`+ public Object visitNow(ExpressionVar e) throws PrismLangException`
`103`	`103`	`{`
`104`	`104`	`return new parser.ast.ExpressionLabel(e.getName());`
`105`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public EvaluatePartially(EvaluateContext ec)`
`42`	`42`	`this.ec = ec;`
`43`	`43`	`}`
`44`	`44`
`45`		`- public Object visit(ExpressionConstant e) throws PrismLangException`
	`45`	`+ public Object visitNow(ExpressionConstant e) throws PrismLangException`
`46`	`46`	`{`
`47`	`47`	`Object val = ec.getConstantValue(e.getName());`
`48`	`48`	`if (val == null) {`
`@@ -52,7 +52,7 @@ public Object visit(ExpressionConstant e) throws PrismLangException`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`- public Object visit(ExpressionVar e) throws PrismLangException`
	`55`	`+ public Object visitNow(ExpressionVar e) throws PrismLangException`
`56`	`56`	`{`
`57`	`57`	`Object val = ec.getVarValue(e.getName(), e.getIndex());`
`58`	`58`	`if (val == null) {`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public ExpandConstants(ConstantList constantList)`
`42`	`42`	`this.constantList = constantList;`
`43`	`43`	`}`
`44`	`44`
`45`		`- public Object visit(ExpressionConstant e) throws PrismLangException`
	`45`	`+ public Object visitNow(ExpressionConstant e) throws PrismLangException`
`46`	`46`	`{`
`47`	`47`	`int i;`
`48`	`48`	`Type t;`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public ExpandFormulas(FormulaList formulaList, boolean replace)`
`48`	`48`	`this.replace = replace;`
`49`	`49`	`}`
`50`	`50`
`51`		`- public Object visit(ExpressionFormula e) throws PrismLangException`
	`51`	`+ public Object visitNow(ExpressionFormula e) throws PrismLangException`
`52`	`52`	`{`
`53`	`53`	`int i;`
`54`	`54`	`Type t;`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public ExpandLabels(LabelList labelList)`
`44`	`44`	`this.labelList = labelList;`
`45`	`45`	`}`
`46`	`46`
`47`		`- public Object visit(ExpressionLabel e) throws PrismLangException`
	`47`	`+ public Object visitNow(ExpressionLabel e) throws PrismLangException`
`48`	`48`	`{`
`49`	`49`	`int i;`
`50`	`50`	`Type t;`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public ExpandPropRefsAndLabels(PropertiesFile propertiesFile, LabelList labelLis`
`49`	`49`	`this.labelList = labelList;`
`50`	`50`	`}`
`51`	`51`
`52`		`- public Object visit(ExpressionLabel e) throws PrismLangException`
	`52`	`+ public Object visitNow(ExpressionLabel e) throws PrismLangException`
`53`	`53`	`{`
`54`	`54`	`int i;`
`55`	`55`	`Type t;`
`@@ -84,7 +84,7 @@ public Object visit(ExpressionLabel e) throws PrismLangException`
`84`	`84`	`return e;`
`85`	`85`	`}`
`86`	`86`
`87`		`- public Object visit(ExpressionProp e) throws PrismLangException`
	`87`	`+ public Object visitNow(ExpressionProp e) throws PrismLangException`
`88`	`88`	`{`
`89`	`89`	`Property prop;`
`90`	`90`	`Type t;`
Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,9 @@`
`42`	`42`	`* <br/>`
`43`	`43`	`* Subclasses should not override<br/>`
`44`	`44`	`* <ul>`
`45`		`- * <li>{@code visit(ExpressionProb)}</li>`
`46`		`- * <li>{@code visit(ExpressionReward)}</li>`
`47`		`- * <li>{@code visit(ExpressionSS)}</li>`
	`45`	`+ * <li>{@code visitNow(ExpressionProb)}</li>`
	`46`	`+ * <li>{@code visitNow(ExpressionReward)}</li>`
	`47`	`+ * <li>{@code visitNow(ExpressionSS)}</li>`
`48`	`48`	`* </ul>`
`49`	`49`	`*/`
`50`	`50`	`public class ExpressionTraverseNonNested extends ASTTraverse`
`@@ -74,7 +74,7 @@ private boolean inLimit()`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`@Override`
`77`		`- public Object visit(ExpressionProb e) throws PrismLangException`
	`77`	`+ public Object visitNow(ExpressionProb e) throws PrismLangException`
`78`	`78`	`{`
`79`	`79`	`currentNesting++;`
`80`	`80`	`// only visit if we are still in limit`
`@@ -88,7 +88,7 @@ public Object visit(ExpressionProb e) throws PrismLangException`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`@Override`
`91`		`- public Object visit(ExpressionReward e) throws PrismLangException`
	`91`	`+ public Object visitNow(ExpressionReward e) throws PrismLangException`
`92`	`92`	`{`
`93`	`93`	`currentNesting++;`
`94`	`94`	`// only visit if we are still in limit`
`@@ -102,7 +102,7 @@ public Object visit(ExpressionReward e) throws PrismLangException`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`@Override`
`105`		`- public Object visit(ExpressionSS e) throws PrismLangException`
	`105`	`+ public Object visitNow(ExpressionSS e) throws PrismLangException`
`106`	`106`	`{`
`107`	`107`	`currentNesting++;`
`108`	`108`	`// only visit if we are still in limit`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public FindAllConstants(ConstantList constantList)`
`41`	`41`	`this.constantList = constantList;`
`42`	`42`	`}`
`43`	`43`
`44`		`- public Object visit(ExpressionIdent e) throws PrismLangException`
	`44`	`+ public Object visitNow(ExpressionIdent e) throws PrismLangException`
`45`	`45`	`{`
`46`	`46`	`int i;`
`47`	`47`	`// See if identifier corresponds to a constant`