Parser refresh

prism/src/parser/PrismParser.java

@@ -1658,7 +1658,7 @@ Expression ExpressionTemporalBinary(boolean prop, boolean pathprop) throws Parse
 
         //Accumulation
         ExpressionAccumulation accexp;
-        AccumulationConstraint constr;
+        AccumulationConstraintBasic constr;
         TemporalOperatorBound bound;
         Expression reg;
         ArrayList<Expression> fireOn;
@@ -1765,7 +1765,7 @@ accexp.setBoundExpression(bound);
         }
         jj_consume_token(RBRACE);
         jj_consume_token(LBRACE);
-        constr = ExpressionAccumulationConstraint();
+        constr = ExpressionAccumulationConstraintBasic();
 accexp.setConstraint(constr);
         jj_consume_token(RBRACE);
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -1918,7 +1918,7 @@ exprTemp.setOperand2(expr); exprTemp.setPosition(begin, getToken(0)); ret = expr
 /* START
    Accumulation Specification */
   static final public ExpressionAccumulation ExpressionAccumulationUnary(boolean prop, boolean pathprop) throws ParseException {ExpressionAccumulation ret;
-        AccumulationConstraint constr;
+        AccumulationConstraintBasic constr;
         TemporalOperatorBound bound;
         Expression reg;
         ArrayList<Expression> fireOn;
@@ -1974,7 +1974,7 @@ ret.setBoundExpression(bound);
     }
     jj_consume_token(RBRACE);
     jj_consume_token(LBRACE);
-    constr = ExpressionAccumulationConstraint();
+    constr = ExpressionAccumulationConstraintBasic();
 ret.setConstraint(constr);
     jj_consume_token(RBRACE);
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -2100,13 +2100,13 @@ ret.add(s);
     throw new Error("Missing return statement in function");
 }
 
-  static final public AccumulationConstraint ExpressionAccumulationConstraint() throws ParseException {AccumulationConstraint ret;
+  static final public AccumulationConstraintBasic ExpressionAccumulationConstraintBasic() throws ParseException {AccumulationConstraintBasic ret;
         ArrayList<AccumulationFactor> factors;
         TemporalOperatorBound bound;
     // (LiCo = Constant)
             factors = ExpressionAccumulationLinearCombination();
     bound = BoundExpression();
-{if ("" != null) return new AccumulationConstraint(factors, bound);}
+{if ("" != null) return new AccumulationConstraintBasic(factors, bound);}
     throw new Error("Missing return statement in function");
 }