imported patch rewardcounter-TemporalOperatorBounds-use-refresh.patch

prism/src/parser/PrismParserConstants.java

@@ -179,21 +179,23 @@ public interface PrismParserConstants {
   /** RegularExpression Id. */
   int QMARK = 84;
   /** RegularExpression Id. */
-  int REG_INT = 85;
+  int CARET = 85;
   /** RegularExpression Id. */
-  int REG_DOUBLE = 86;
+  int REG_INT = 86;
   /** RegularExpression Id. */
-  int REG_IDENTPRIME = 87;
+  int REG_DOUBLE = 87;
   /** RegularExpression Id. */
-  int REG_IDENT = 88;
+  int REG_IDENTPRIME = 88;
   /** RegularExpression Id. */
-  int REG_QUOTED_IDENT = 89;
+  int REG_IDENT = 89;
   /** RegularExpression Id. */
-  int REG_QUOTED_STRING = 90;
+  int REG_QUOTED_IDENT = 90;
   /** RegularExpression Id. */
-  int PREPROC = 91;
+  int REG_QUOTED_STRING = 91;
   /** RegularExpression Id. */
-  int LEXICAL_ERROR = 92;
+  int PREPROC = 92;
+  /** RegularExpression Id. */
+  int LEXICAL_ERROR = 93;
 
   /** Lexical state. */
   int DEFAULT = 0;
@@ -285,6 +287,7 @@ public interface PrismParserConstants {
     "\"\\\'\"",
     "\"<-\"",
     "\"?\"",
+    "\"^\"",
     "<REG_INT>",
     "<REG_DOUBLE>",
     "<REG_IDENTPRIME>",

prism/src/parser/PrismParserTokenManager.java

@@ -24,24 +24,24 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
    switch (pos)
    {
       case 0:
+         if ((active0 & 0x387c5fb5ff6f0L) != 0L)
+         {
+            jjmatchedKind = 89;
+            return 31;
+         }
          if ((active0 & 0xc783a04a00908L) != 0L)
             return 31;
          if ((active1 & 0x20000L) != 0L)
             return 1;
          if ((active0 & 0x2000000000000000L) != 0L)
             return 11;
-         if ((active0 & 0x387c5fb5ff6f0L) != 0L)
-         {
-            jjmatchedKind = 88;
-            return 31;
-         }
          return -1;
       case 1:
          if ((active0 & 0x39fddfb5ff6f0L) != 0L)
          {
             if (jjmatchedPos != 1)
             {
-               jjmatchedKind = 88;
+               jjmatchedKind = 89;
                jjmatchedPos = 1;
             }
             return 31;
@@ -52,58 +52,58 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
             return 31;
          if ((active0 & 0x39edd135ff6f0L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 2;
             return 31;
          }
          return -1;
       case 3:
-         if ((active0 & 0x21ad801100490L) != 0L)
-            return 31;
          if ((active0 & 0x18405124ff260L) != 0L)
          {
             if (jjmatchedPos != 3)
             {
-               jjmatchedKind = 88;
+               jjmatchedKind = 89;
                jjmatchedPos = 3;
             }
             return 31;
          }
+         if ((active0 & 0x21ad801100490L) != 0L)
+            return 31;
          return -1;
       case 4:
-         if ((active0 & 0x10020060L) != 0L)
-            return 31;
          if ((active0 & 0x18445024df200L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 4;
             return 31;
          }
+         if ((active0 & 0x10020060L) != 0L)
+            return 31;
          return -1;
       case 5:
          if ((active0 & 0x1000100480200L) != 0L)
             return 31;
          if ((active0 & 0x84440205f000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 5;
             return 31;
          }
          return -1;
       case 6:
-         if ((active0 & 0x40000041000L) != 0L)
-            return 31;
          if ((active0 & 0x80440201e000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 6;
             return 31;
          }
+         if ((active0 & 0x40000041000L) != 0L)
+            return 31;
          return -1;
       case 7:
          if ((active0 & 0x80440201e000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 7;
             return 31;
          }
@@ -113,7 +113,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
             return 31;
          if ((active0 & 0x80440000a000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 8;
             return 31;
          }
@@ -123,7 +123,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
             return 31;
          if ((active0 & 0x4400002000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 9;
             return 31;
          }
@@ -131,7 +131,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
       case 10:
          if ((active0 & 0x4400002000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 10;
             return 31;
          }
@@ -141,7 +141,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
             return 31;
          if ((active0 & 0x4400000000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 11;
             return 31;
          }
@@ -151,7 +151,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
             return 31;
          if ((active0 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 12;
             return 31;
          }
@@ -159,7 +159,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
       case 13:
          if ((active0 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 13;
             return 31;
          }
@@ -167,7 +167,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
       case 14:
          if ((active0 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 89;
             jjmatchedPos = 14;
             return 31;
          }
@@ -259,6 +259,8 @@ static private int jjMoveStringLiteralDfa0_0(){
       case 93:
          jjmatchedKind = 65;
          return jjMoveStringLiteralDfa1_0(0x0L, 0x8L);
+      case 94:
+         return jjStopAtPos(0, 85);
       case 98:
          return jjMoveStringLiteralDfa1_0(0x10L, 0x0L);
       case 99:
@@ -863,14 +865,14 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 31:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 88)
-                        kind = 88;
+                     if (kind > 89)
+                        kind = 89;
                      { jjCheckNAdd(22); }
                   }
                   else if (curChar == 39)
                   {
-                     if (kind > 87)
-                        kind = 87;
+                     if (kind > 88)
+                        kind = 88;
                   }
                   if ((0x3ff000000000000L & l) != 0L)
                      { jjCheckNAddTwoStates(20, 21); }
@@ -878,8 +880,8 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 0:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 86)
-                        kind = 86;
+                     if (kind > 87)
+                        kind = 87;
                      { jjCheckNAddStates(0, 3); }
                   }
                   else if ((0x100002600L & l) != 0L)
@@ -897,14 +899,14 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 1;
                   if ((0x3fe000000000000L & l) != 0L)
                   {
-                     if (kind > 85)
-                        kind = 85;
+                     if (kind > 86)
+                        kind = 86;
                      { jjCheckNAdd(8); }
                   }
                   else if (curChar == 48)
                   {
-                     if (kind > 85)
-                        kind = 85;
+                     if (kind > 86)
+                        kind = 86;
                   }
                   break;
                case 1:
@@ -940,20 +942,20 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 7:
                   if ((0x3fe000000000000L & l) == 0L)
                      break;
-                  if (kind > 85)
-                     kind = 85;
+                  if (kind > 86)
+                     kind = 86;
                   { jjCheckNAdd(8); }
                   break;
                case 8:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 85)
-                     kind = 85;
+                  if (kind > 86)
+                     kind = 86;
                   { jjCheckNAdd(8); }
                   break;
                case 9:
-                  if (curChar == 48 && kind > 85)
-                     kind = 85;
+                  if (curChar == 48 && kind > 86)
+                     kind = 86;
                   break;
                case 10:
                   if (curChar == 46)
@@ -962,8 +964,8 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 11:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 86)
-                     kind = 86;
+                  if (kind > 87)
+                     kind = 87;
                   { jjCheckNAddTwoStates(11, 12); }
                   break;
                case 13:
@@ -973,8 +975,8 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 14:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 86)
-                     kind = 86;
+                  if (kind > 87)
+                     kind = 87;
                   { jjCheckNAdd(14); }
                   break;
                case 15:
@@ -986,14 +988,14 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      { jjCheckNAddTwoStates(16, 17); }
                   break;
                case 17:
-                  if (curChar == 35 && kind > 91)
-                     kind = 91;
+                  if (curChar == 35 && kind > 92)
+                     kind = 92;
                   break;
                case 18:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 86)
-                     kind = 86;
+                  if (kind > 87)
+                     kind = 87;
                   { jjCheckNAddStates(0, 3); }
                   break;
                case 20:
@@ -1001,14 +1003,14 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      { jjCheckNAddTwoStates(20, 21); }
                   break;
                case 21:
-                  if (curChar == 39 && kind > 87)
-                     kind = 87;
+                  if (curChar == 39 && kind > 88)
+                     kind = 88;
                   break;
                case 22:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 89)
+                     kind = 89;
                   { jjCheckNAdd(22); }
                   break;
                case 23:
@@ -1020,8 +1022,8 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      { jjAddStates(11, 12); }
                   break;
                case 26:
-                  if (curChar == 34 && kind > 89)
-                     kind = 89;
+                  if (curChar == 34 && kind > 90)
+                     kind = 90;
                   break;
                case 28:
                   { jjCheckNAddStates(13, 15); }
@@ -1031,8 +1033,8 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      { jjCheckNAddStates(13, 15); }
                   break;
                case 30:
-                  if (curChar == 34 && kind > 90)
-                     kind = 90;
+                  if (curChar == 34 && kind > 91)
+                     kind = 91;
                   break;
                default : break;
             }
@@ -1048,8 +1050,8 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 31:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 88)
-                        kind = 88;
+                     if (kind > 89)
+                        kind = 89;
                      { jjCheckNAdd(22); }
                   }
                   if ((0x7fffffe87fffffeL & l) != 0L)
@@ -1058,8 +1060,8 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 0:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 89)
+                     kind = 89;
                   { jjCheckNAddStates(16, 18); }
                   break;
                case 2:
@@ -1081,8 +1083,8 @@ static private int jjMoveNfa_0(int startState, int curPos)
                case 22:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 88)
-                     kind = 88;
+                  if (kind > 89)
+                     kind = 89;
                   { jjCheckNAdd(22); }
                   break;
                case 24:
@@ -1184,7 +1186,7 @@ public static final String[] jjstrLiteralImages = {
 "\174", "\75\76", "\74\75\76", "\55\76", "\72", "\73", "\54", "\56\56", "\50", "\51", 
 "\133", "\135", "\133\133", "\135\135", "\173", "\175", "\75", "\41\75", "\74", "\76", 
 "\74\74", "\76\76", "\74\75", "\76\75", "\53", "\55", "\52", "\57", "\47", "\74\55", 
-"\77", null, null, null, null, null, null, null, null, };
+"\77", "\136", null, null, null, null, null, null, null, null, };
 static protected Token jjFillToken()
 {
    final Token t;
@@ -1242,9 +1244,9 @@ public static Token getNextToken()
    jjmatchedKind = 0x7fffffff;
    jjmatchedPos = 0;
    curPos = jjMoveStringLiteralDfa0_0();
-   if (jjmatchedPos == 0 && jjmatchedKind > 92)
+   if (jjmatchedPos == 0 && jjmatchedKind > 93)
    {
-      jjmatchedKind = 92;
+      jjmatchedKind = 93;
    }
    if (jjmatchedKind != 0x7fffffff)
    {
@@ -1375,7 +1377,7 @@ public static final String[] lexStateNames = {
    "DEFAULT",
 };
 static final long[] jjtoToken = {
-   0xfffffffffffffff9L, 0x1fffffffL, 
+   0xfffffffffffffff9L, 0x3fffffffL, 
 };
 static final long[] jjtoSkip = {
    0x6L, 0x0L,