Parser refresh

prism/src/parser/PrismParser.java

@@ -2194,7 +2194,7 @@ factors.add(factor);
         throw new ParseException();
       }
       Identifier();
-func = AccumulationFunction.ACC_TIME;
+func = new AccumulationFunction(AccumulationType.ACC_TIME);
     } else if (jj_2_13(1)) {
       if (getToken(1).kind==REG_IDENT && getToken(1).image.equals("steps")) {
 
@@ -2203,7 +2203,7 @@ func = AccumulationFunction.ACC_TIME;
         throw new ParseException();
       }
       Identifier();
-func = AccumulationFunction.ACC_STEPS;
+func = new AccumulationFunction(AccumulationType.ACC_STEPS);
     } else if (jj_2_14(1)) {
       if (getToken(1).kind==REG_IDENT && getToken(1).image.equals("reward")) {
 
@@ -2221,7 +2221,7 @@ func = AccumulationFunction.ACC_STEPS;
         jj_la1[57] = jj_gen;
         ;
       }
-func = AccumulationFunction.ACC_REWARD;
+func = new AccumulationFunction(AccumulationType.ACC_REWARD);
                    func.setRewardIndex(rewardIndex);
     } else {
       jj_consume_token(-1);
@@ -4718,13 +4718,16 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3_23()) return false;
+    if (jj_3_23()) {
     jj_scanpos = xsp;
-    if (!jj_3_24()) return false;
+    if (jj_3_24()) {
     jj_scanpos = xsp;
-    if (!jj_3_25()) return false;
+    if (jj_3_25()) {
     jj_scanpos = xsp;
     if (jj_3R_54()) return true;
+    }
+    }
+    }
     return false;
   }
 
@@ -4816,11 +4819,13 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_103()) return false;
+    if (jj_3R_103()) {
     jj_scanpos = xsp;
-    if (!jj_3R_104()) return false;
+    if (jj_3R_104()) {
     jj_scanpos = xsp;
     if (jj_3R_105()) return true;
+    }
+    }
     return false;
   }
 
@@ -4873,11 +4878,13 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3_19()) return false;
+    if (jj_3_19()) {
     jj_scanpos = xsp;
-    if (!jj_3_20()) return false;
+    if (jj_3_20()) {
     jj_scanpos = xsp;
     if (jj_3_21()) return true;
+    }
+    }
     return false;
   }
 
@@ -5009,17 +5016,22 @@ fl.setLHS(s);
     if (jj_scan_token(LPARENTH)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_228()) return false;
+    if (jj_3R_228()) {
     jj_scanpos = xsp;
-    if (!jj_3R_229()) return false;
+    if (jj_3R_229()) {
     jj_scanpos = xsp;
-    if (!jj_3R_230()) return false;
+    if (jj_3R_230()) {
     jj_scanpos = xsp;
-    if (!jj_3R_231()) return false;
+    if (jj_3R_231()) {
     jj_scanpos = xsp;
-    if (!jj_3R_232()) return false;
+    if (jj_3R_232()) {
     jj_scanpos = xsp;
     if (jj_3R_233()) return true;
+    }
+    }
+    }
+    }
+    }
     if (jj_scan_token(COMMA)) return true;
     if (jj_3R_57()) return true;
     xsp = jj_scanpos;
@@ -5067,9 +5079,10 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_256()) return false;
+    if (jj_3R_256()) {
     jj_scanpos = xsp;
     if (jj_3R_257()) return true;
+    }
     return false;
   }
 
@@ -5083,9 +5096,10 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_106()) return false;
+    if (jj_3R_106()) {
     jj_scanpos = xsp;
     if (jj_3R_107()) return true;
+    }
     return false;
   }
 
@@ -5178,9 +5192,10 @@ fl.setLHS(s);
     if (jj_scan_token(GT)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_155()) return false;
+    if (jj_3R_155()) {
     jj_scanpos = xsp;
     if (jj_3R_156()) return true;
+    }
     return false;
   }
 
@@ -5189,9 +5204,10 @@ fl.setLHS(s);
     if (jj_scan_token(GE)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_153()) return false;
+    if (jj_3R_153()) {
     jj_scanpos = xsp;
     if (jj_3R_154()) return true;
+    }
     return false;
   }
 
@@ -5199,20 +5215,24 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_211()) return false;
+    if (jj_3R_211()) {
     jj_scanpos = xsp;
-    if (!jj_3R_212()) return false;
+    if (jj_3R_212()) {
     jj_scanpos = xsp;
     if (jj_3R_213()) return true;
+    }
+    }
     xsp = jj_scanpos;
-    if (!jj_3R_214()) return false;
+    if (jj_3R_214()) {
     jj_scanpos = xsp;
     if (jj_3R_215()) return true;
+    }
     if (jj_scan_token(LBRACKET)) return true;
     xsp = jj_scanpos;
-    if (!jj_3_22()) return false;
+    if (jj_3_22()) {
     jj_scanpos = xsp;
     if (jj_3R_216()) return true;
+    }
     if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
@@ -5222,9 +5242,10 @@ fl.setLHS(s);
     if (jj_scan_token(LT)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_151()) return false;
+    if (jj_3R_151()) {
     jj_scanpos = xsp;
     if (jj_3R_152()) return true;
+    }
     return false;
   }
 
@@ -5233,9 +5254,10 @@ fl.setLHS(s);
     if (jj_scan_token(LE)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_149()) return false;
+    if (jj_3R_149()) {
     jj_scanpos = xsp;
     if (jj_3R_150()) return true;
+    }
     return false;
   }
 
@@ -5243,17 +5265,22 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_134()) return false;
+    if (jj_3R_134()) {
     jj_scanpos = xsp;
-    if (!jj_3R_135()) return false;
+    if (jj_3R_135()) {
     jj_scanpos = xsp;
-    if (!jj_3R_136()) return false;
+    if (jj_3R_136()) {
     jj_scanpos = xsp;
-    if (!jj_3R_137()) return false;
+    if (jj_3R_137()) {
     jj_scanpos = xsp;
-    if (!jj_3R_138()) return false;
+    if (jj_3R_138()) {
     jj_scanpos = xsp;
     if (jj_3R_139()) return true;
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
@@ -5324,9 +5351,10 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_scan_token(87)) return false;
+    if (jj_scan_token(87)) {
     jj_scanpos = xsp;
     if (jj_scan_token(90)) return true;
+    }
     return false;
   }
 
@@ -5399,9 +5427,10 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_261()) return false;
+    if (jj_3R_261()) {
     jj_scanpos = xsp;
     if (jj_3R_262()) return true;
+    }
     return false;
   }
 
@@ -5472,9 +5501,10 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_251()) return false;
+    if (jj_3R_251()) {
     jj_scanpos = xsp;
     if (jj_3R_252()) return true;
+    }
     return false;
   }
 
@@ -5516,13 +5546,15 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_224()) return false;
+    if (jj_3R_224()) {
     jj_scanpos = xsp;
     if (jj_3R_225()) return true;
+    }
     xsp = jj_scanpos;
-    if (!jj_3R_226()) return false;
+    if (jj_3R_226()) {
     jj_scanpos = xsp;
     if (jj_3R_227()) return true;
+    }
     return false;
   }
 
@@ -5550,13 +5582,16 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_200()) return false;
+    if (jj_3R_200()) {
     jj_scanpos = xsp;
-    if (!jj_3R_201()) return false;
+    if (jj_3R_201()) {
     jj_scanpos = xsp;
-    if (!jj_3R_202()) return false;
+    if (jj_3R_202()) {
     jj_scanpos = xsp;
     if (jj_3R_203()) return true;
+    }
+    }
+    }
     return false;
   }
 
@@ -5564,9 +5599,10 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_131()) return false;
+    if (jj_3R_131()) {
     jj_scanpos = xsp;
     if (jj_3R_132()) return true;
+    }
     xsp = jj_scanpos;
     if (jj_3R_133()) jj_scanpos = xsp;
     return false;
@@ -5678,11 +5714,13 @@ fl.setLHS(s);
     if (jj_scan_token(LPARENTH)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_208()) return false;
+    if (jj_3R_208()) {
     jj_scanpos = xsp;
-    if (!jj_3R_209()) return false;
+    if (jj_3R_209()) {
     jj_scanpos = xsp;
     if (jj_3R_210()) return true;
+    }
+    }
     if (jj_scan_token(COMMA)) return true;
     if (jj_3R_207()) return true;
     if (jj_scan_token(RPARENTH)) return true;
@@ -5703,11 +5741,13 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3_12()) return false;
+    if (jj_3_12()) {
     jj_scanpos = xsp;
-    if (!jj_3_13()) return false;
+    if (jj_3_13()) {
     jj_scanpos = xsp;
     if (jj_3_14()) return true;
+    }
+    }
     return false;
   }
 
@@ -5751,9 +5791,10 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_205()) return false;
+    if (jj_3R_205()) {
     jj_scanpos = xsp;
     if (jj_3R_206()) return true;
+    }
     if (jj_scan_token(LPARENTH)) return true;
     if (jj_3R_207()) return true;
     if (jj_scan_token(RPARENTH)) return true;
@@ -5782,9 +5823,10 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3_11()) return false;
+    if (jj_3_11()) {
     jj_scanpos = xsp;
     if (jj_3R_157()) return true;
+    }
     return false;
   }
 
@@ -5874,17 +5916,22 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_244()) return false;
+    if (jj_3R_244()) {
     jj_scanpos = xsp;
-    if (!jj_3R_245()) return false;
+    if (jj_3R_245()) {
     jj_scanpos = xsp;
-    if (!jj_3R_246()) return false;
+    if (jj_3R_246()) {
     jj_scanpos = xsp;
-    if (!jj_3R_247()) return false;
+    if (jj_3R_247()) {
     jj_scanpos = xsp;
-    if (!jj_3R_248()) return false;
+    if (jj_3R_248()) {
     jj_scanpos = xsp;
     if (jj_3R_249()) return true;
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
@@ -5984,9 +6031,10 @@ fl.setLHS(s);
     if (jj_scan_token(LBRACE)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_197()) return false;
+    if (jj_3R_197()) {
     jj_scanpos = xsp;
     if (jj_3R_198()) return true;
+    }
     if (jj_scan_token(RBRACE)) return true;
     return false;
   }
@@ -6018,9 +6066,10 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_142()) return false;
+    if (jj_3R_142()) {
     jj_scanpos = xsp;
     if (jj_3R_143()) return true;
+    }
     return false;
   }
 
@@ -6093,31 +6142,43 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_168()) return false;
+    if (jj_3R_168()) {
     jj_scanpos = xsp;
-    if (!jj_3R_169()) return false;
+    if (jj_3R_169()) {
     jj_scanpos = xsp;
-    if (!jj_3R_170()) return false;
+    if (jj_3R_170()) {
     jj_scanpos = xsp;
-    if (!jj_3R_171()) return false;
+    if (jj_3R_171()) {
     jj_scanpos = xsp;
-    if (!jj_3R_172()) return false;
+    if (jj_3R_172()) {
     jj_scanpos = xsp;
-    if (!jj_3R_173()) return false;
+    if (jj_3R_173()) {
     jj_scanpos = xsp;
-    if (!jj_3R_174()) return false;
+    if (jj_3R_174()) {
     jj_scanpos = xsp;
-    if (!jj_3R_175()) return false;
+    if (jj_3R_175()) {
     jj_scanpos = xsp;
-    if (!jj_3R_176()) return false;
+    if (jj_3R_176()) {
     jj_scanpos = xsp;
-    if (!jj_3R_177()) return false;
+    if (jj_3R_177()) {
     jj_scanpos = xsp;
-    if (!jj_3R_178()) return false;
+    if (jj_3R_178()) {
     jj_scanpos = xsp;
-    if (!jj_3R_179()) return false;
+    if (jj_3R_179()) {
     jj_scanpos = xsp;
     if (jj_3R_180()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
@@ -6193,9 +6254,10 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_278()) return false;
+    if (jj_3R_278()) {
     jj_scanpos = xsp;
     if (jj_3R_279()) return true;
+    }
     return false;
   }
 
@@ -6226,9 +6288,10 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_280()) return false;
+    if (jj_3R_280()) {
     jj_scanpos = xsp;
     if (jj_3R_281()) return true;
+    }
     if (jj_3R_270()) return true;
     return false;
   }
@@ -6237,9 +6300,10 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_52()) return false;
+    if (jj_3R_52()) {
     jj_scanpos = xsp;
     if (jj_scan_token(49)) return true;
+    }
     return false;
   }
 
@@ -6254,18 +6318,22 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_112()) return false;
+    if (jj_3R_112()) {
     jj_scanpos = xsp;
-    if (!jj_3R_113()) return false;
+    if (jj_3R_113()) {
     jj_scanpos = xsp;
-    if (!jj_3R_114()) return false;
+    if (jj_3R_114()) {
     jj_scanpos = xsp;
     if (jj_3R_115()) return true;
+    }
+    }
+    }
     if (jj_scan_token(LBRACE)) return true;
     xsp = jj_scanpos;
-    if (!jj_3R_116()) return false;
+    if (jj_3R_116()) {
     jj_scanpos = xsp;
     if (jj_3R_117()) return true;
+    }
     if (jj_scan_token(RBRACE)) return true;
     if (jj_scan_token(LBRACE)) return true;
     if (jj_3R_101()) return true;
@@ -6294,9 +6362,10 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_259()) return false;
+    if (jj_3R_259()) {
     jj_scanpos = xsp;
     if (jj_3R_260()) return true;
+    }
     return false;
   }
 
@@ -6365,9 +6434,10 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_272()) return false;
+    if (jj_3R_272()) {
     jj_scanpos = xsp;
     if (jj_3R_273()) return true;
+    }
     if (jj_3R_263()) return true;
     return false;
   }
@@ -6395,9 +6465,10 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_108()) return false;
+    if (jj_3R_108()) {
     jj_scanpos = xsp;
     if (jj_3R_109()) return true;
+    }
     return false;
   }
 
@@ -6417,15 +6488,18 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_217()) return false;
+    if (jj_3R_217()) {
     jj_scanpos = xsp;
-    if (!jj_3R_218()) return false;
+    if (jj_3R_218()) {
     jj_scanpos = xsp;
     if (jj_3R_219()) return true;
+    }
+    }
     xsp = jj_scanpos;
-    if (!jj_3R_220()) return false;
+    if (jj_3R_220()) {
     jj_scanpos = xsp;
     if (jj_3R_221()) return true;
+    }
     if (jj_scan_token(LBRACKET)) return true;
     if (jj_3R_222()) return true;
     xsp = jj_scanpos;
@@ -6461,11 +6535,13 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_89()) return false;
+    if (jj_3R_89()) {
     jj_scanpos = xsp;
-    if (!jj_3R_90()) return false;
+    if (jj_3R_90()) {
     jj_scanpos = xsp;
     if (jj_3R_91()) return true;
+    }
+    }
     xsp = jj_scanpos;
     if (jj_3R_92()) jj_scanpos = xsp;
     if (jj_3R_74()) return true;
@@ -6476,11 +6552,13 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_79()) return false;
+    if (jj_3R_79()) {
     jj_scanpos = xsp;
-    if (!jj_3R_80()) return false;
+    if (jj_3R_80()) {
     jj_scanpos = xsp;
     if (jj_3R_81()) return true;
+    }
+    }
     return false;
   }
 
@@ -6530,13 +6608,16 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_70()) return false;
+    if (jj_3R_70()) {
     jj_scanpos = xsp;
-    if (!jj_3R_71()) return false;
+    if (jj_3R_71()) {
     jj_scanpos = xsp;
-    if (!jj_3R_72()) return false;
+    if (jj_3R_72()) {
     jj_scanpos = xsp;
     if (jj_3R_73()) return true;
+    }
+    }
+    }
     return false;
   }
 
@@ -6602,9 +6683,10 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_265()) return false;
+    if (jj_3R_265()) {
     jj_scanpos = xsp;
     if (jj_3R_266()) return true;
+    }
     return false;
   }
 
@@ -6632,9 +6714,10 @@ fl.setLHS(s);
     if (jj_scan_token(LBRACE)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_99()) return false;
+    if (jj_3R_99()) {
     jj_scanpos = xsp;
     if (jj_3R_100()) return true;
+    }
     if (jj_scan_token(RBRACE)) return true;
     if (jj_scan_token(LBRACE)) return true;
     if (jj_3R_101()) return true;
@@ -6650,9 +6733,10 @@ fl.setLHS(s);
     if (jj_scan_token(S)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_55()) return false;
+    if (jj_3R_55()) {
     jj_scanpos = xsp;
     if (jj_3R_56()) return true;
+    }
     if (jj_scan_token(LBRACKET)) return true;
     if (jj_3R_57()) return true;
     xsp = jj_scanpos;
@@ -6684,9 +6768,10 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_120()) return false;
+    if (jj_3R_120()) {
     jj_scanpos = xsp;
     if (jj_3R_121()) return true;
+    }
     return false;
   }
 
@@ -6730,9 +6815,10 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_182()) return false;
+    if (jj_3R_182()) {
     jj_scanpos = xsp;
     if (jj_3R_183()) return true;
+    }
     return false;
   }
 
@@ -6746,9 +6832,10 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_82()) return false;
+    if (jj_3R_82()) {
     jj_scanpos = xsp;
     if (jj_3R_83()) return true;
+    }
     return false;
   }
 
@@ -6756,11 +6843,13 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_95()) return false;
+    if (jj_3R_95()) {
     jj_scanpos = xsp;
-    if (!jj_3R_96()) return false;
+    if (jj_3R_96()) {
     jj_scanpos = xsp;
     if (jj_3R_97()) return true;
+    }
+    }
     xsp = jj_scanpos;
     if (jj_3R_98()) jj_scanpos = xsp;
     if (jj_3R_74()) return true;
@@ -6772,9 +6861,10 @@ fl.setLHS(s);
     if (jj_scan_token(LBRACE)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_84()) return false;
+    if (jj_3R_84()) {
     jj_scanpos = xsp;
     if (jj_3R_85()) return true;
+    }
     if (jj_scan_token(RBRACE)) return true;
     return false;
   }
@@ -6868,9 +6958,10 @@ fl.setLHS(s);
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_282()) return false;
+    if (jj_3R_282()) {
     jj_scanpos = xsp;
     if (jj_3R_283()) return true;
+    }
     return false;
   }
 
@@ -7085,13 +7176,8 @@ fl.setLHS(s);
   }
 
   @SuppressWarnings("serial")
-  static private final class LookaheadSuccess extends java.lang.Error {
-    @Override
-    public Throwable fillInStackTrace() {
-      return this;
-    }
-  }
-  static private final LookaheadSuccess jj_ls = new LookaheadSuccess();
+  static private final class LookaheadSuccess extends java.lang.Error { }
+  static final private LookaheadSuccess jj_ls = new LookaheadSuccess();
   static private boolean jj_scan_token(int kind) {
 	 if (jj_scanpos == jj_lastpos) {
 	   jj_la--;
@@ -7224,6 +7310,7 @@ fl.setLHS(s);
 	 return new ParseException(token, exptokseq, tokenImage);
   }
 
+  static private int trace_indent = 0;
   static private boolean trace_enabled;
 
 /** Trace enabled. */

prism/src/parser/PrismParserTokenManager.java

@@ -15,7 +15,6 @@ import prism.PrismLangException;
 import explicit.MinMax;
 
 /** Token Manager. */
-@SuppressWarnings ("unused")
 public class PrismParserTokenManager implements PrismParserConstants {
 
   /** Debug output. */