ExpressionQuant: mode -> modifier.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10034 bbc10eb1-c90d-0410-af57-cb519fbb1720

prism/src/parser/PrismParser.java

@@ -2433,7 +2433,7 @@ public class PrismParser implements PrismParserConstants {
 
 // (Property) expression: probabilistic operator P
   static final public Expression ExpressionProb(boolean prop, boolean pathprop) throws ParseException {
-        ExpressionIdent mode = null;
+        ExpressionIdent modifier = null;
         int r;
         String relOp = null;
         Expression prob = null;
@@ -2449,7 +2449,7 @@ public class PrismParser implements PrismParserConstants {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case LPARENTH:
         jj_consume_token(LPARENTH);
-        mode = IdentifierExpression();
+        modifier = IdentifierExpression();
         jj_consume_token(RPARENTH);
         break;
       default:
@@ -2516,7 +2516,7 @@ public class PrismParser implements PrismParserConstants {
       ;
     }
     jj_consume_token(RBRACKET);
-                ret.setMode(mode == null ? null : mode.getName());
+                ret.setModifier(modifier == null ? null : modifier.getName());
                 ret.setRelOp(relOp);
                 ret.setProb(prob);
                 ret.setExpression(expr);

prism/src/parser/PrismParser.jj

@@ -1454,7 +1454,7 @@ Expression ExpressionParenth(boolean prop, boolean pathprop) :
 
 Expression ExpressionProb(boolean prop, boolean pathprop) :
 {
-	ExpressionIdent mode = null;
+	ExpressionIdent modifier = null;
 	int r;
 	String relOp = null;
 	Expression prob = null;
@@ -1468,7 +1468,7 @@ Expression ExpressionProb(boolean prop, boolean pathprop) :
 	// This production is only allowed in expressions if the "prop" parameter is true
 	{ if (!prop) throw generateParseException(); }
 	// Various options for "P" keyword and attached symbols
-	(( begin = <P> ( <LPARENTH> mode = IdentifierExpression() <RPARENTH> )? (
+	(( begin = <P> ( <LPARENTH> modifier = IdentifierExpression() <RPARENTH> )? (
 			( r = LtGt() prob = Expression(false, false) { relOp = ExpressionBinaryOp.opSymbols[r]; isBool = true; } )
 	       |( <EQ> <QMARK> { relOp = "="; isBool = false; } )
 	       |( <MIN> <EQ> <QMARK> { relOp = "min="; isBool = false; } )
@@ -1479,7 +1479,7 @@ Expression ExpressionProb(boolean prop, boolean pathprop) :
 	// Path formula, optional filter
 	<LBRACKET> expr = Expression(prop, true) (filter = Filter())? <RBRACKET>
 	{
-		ret.setMode(mode == null ? null : mode.getName());
+		ret.setModifier(modifier == null ? null : modifier.getName());
 		ret.setRelOp(relOp);
 		ret.setProb(prob);
 		ret.setExpression(expr);

prism/src/parser/ast/ExpressionQuant.java

@@ -53,7 +53,7 @@ public abstract class ExpressionQuant extends Expression
 	/**
 	 * Set the (optional) "modifier" for this operator.
 	 */
-	public void setMode(String modifier)
+	public void setModifier(String modifier)
 	{
 		this.modifier = modifier;
 	}