diff --git a/prism/src/parser/PrismParser.java b/prism/src/parser/PrismParser.java index 81b9042b..cf2b1405 100644 --- a/prism/src/parser/PrismParser.java +++ b/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); diff --git a/prism/src/parser/PrismParser.jj b/prism/src/parser/PrismParser.jj index 79f58b72..e50f44ee 100644 --- a/prism/src/parser/PrismParser.jj +++ b/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 =

( mode = IdentifierExpression() )? ( + (( begin =

( modifier = IdentifierExpression() )? ( ( r = LtGt() prob = Expression(false, false) { relOp = ExpressionBinaryOp.opSymbols[r]; isBool = true; } ) |( { relOp = "="; isBool = false; } ) |( { relOp = "min="; isBool = false; } ) @@ -1479,7 +1479,7 @@ Expression ExpressionProb(boolean prop, boolean pathprop) : // Path formula, optional filter expr = Expression(prop, true) (filter = Filter())? { - ret.setMode(mode == null ? null : mode.getName()); + ret.setModifier(modifier == null ? null : modifier.getName()); ret.setRelOp(relOp); ret.setProb(prob); ret.setExpression(expr); diff --git a/prism/src/parser/ast/ExpressionQuant.java b/prism/src/parser/ast/ExpressionQuant.java index 8c231a2f..2c52875c 100644 --- a/prism/src/parser/ast/ExpressionQuant.java +++ b/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; }