Merge lp:~tapaal-contributor/tapaal/signed-integers-fix-1714815 into lp:tapaal

[Mads Johannsen]

Allow signed integers in manual edit (for CTL queries).

[lp:~tapaal-contributor/tapaal/signed-integers-fix-1714815]

942. By Mads Johannsen on 2017-09-05

Allow signed integers in manual edit (for CTL queries)

[Jiri Srba (srba)]

Works nicely.

review: Approve

=== modified file 'src/dk/aau/cs/TCTL/CTLParsing/ParseException.java'
--- src/dk/aau/cs/TCTL/CTLParsing/ParseException.java	2017-05-07 12:44:00 +0000
+++ src/dk/aau/cs/TCTL/CTLParsing/ParseException.java	2017-09-05 21:26:24 +0000
@@ -1,5 +1,5 @@
-/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 7.0 */
-/* JavaCCOptions:KEEP_LINE_COLUMN=true */
+/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 5.0 */
+/* JavaCCOptions:KEEP_LINE_COL=null */
 package dk.aau.cs.TCTL.CTLParsing;
 
 /**
@@ -21,11 +21,6 @@
   private static final long serialVersionUID = 1L;
 
   /**
-   * The end of line string for this machine.
-   */
-  protected static String EOL = System.getProperty("line.separator", "\n");
-
-  /**
    * This constructor is used by the method "generateParseException"
    * in the generated parser.  Calling this constructor generates
    * a new object of this type with the fields "currentToken",
@@ -93,7 +88,7 @@
   private static String initialise(Token currentToken,
                            int[][] expectedTokenSequences,
                            String[] tokenImage) {
-
+    String eol = System.getProperty("line.separator", "\n");
     StringBuffer expected = new StringBuffer();
     int maxSize = 0;
     for (int i = 0; i < expectedTokenSequences.length; i++) {
@@ -106,7 +101,7 @@
       if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
         expected.append("...");
       }
-      expected.append(EOL).append("    ");
+      expected.append(eol).append("    ");
     }
     String retval = "Encountered \"";
     Token tok = currentToken.next;
@@ -123,23 +118,20 @@
       tok = tok.next;
     }
     retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
-    retval += "." + EOL;
-    
-    
-    if (expectedTokenSequences.length == 0) {
-        // Nothing to add here
+    retval += "." + eol;
+    if (expectedTokenSequences.length == 1) {
+      retval += "Was expecting:" + eol + "    ";
     } else {
-	    if (expectedTokenSequences.length == 1) {
-	      retval += "Was expecting:" + EOL + "    ";
-	    } else {
-	      retval += "Was expecting one of:" + EOL + "    ";
-	    }
-	    retval += expected.toString();
+      retval += "Was expecting one of:" + eol + "    ";
     }
-    
+    retval += expected.toString();
     return retval;
   }
 
+  /**
+   * The end of line string for this machine.
+   */
+  protected String eol = System.getProperty("line.separator", "\n");
 
   /**
    * Used to convert raw characters to their escaped version
@@ -152,6 +144,8 @@
       for (int i = 0; i < str.length(); i++) {
         switch (str.charAt(i))
         {
+           case 0 :
+              continue;
            case '\b':
               retval.append("\\b");
               continue;
@@ -190,4 +184,4 @@
    }
 
 }
-/* JavaCC - OriginalChecksum=cecb7af8f6d81d2720805fee8666f83e (do not edit this line) */
+/* JavaCC - OriginalChecksum=e3b16ba93b705462aa836b464f80ade3 (do not edit this line) */
 
=== modified file 'src/dk/aau/cs/TCTL/CTLParsing/SimpleCharStream.java'
--- src/dk/aau/cs/TCTL/CTLParsing/SimpleCharStream.java	2017-05-07 12:44:00 +0000
+++ src/dk/aau/cs/TCTL/CTLParsing/SimpleCharStream.java	2017-09-05 21:26:24 +0000
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 7.0 */
+/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 5.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 package dk.aau.cs.TCTL.CTLParsing;
 
@@ -30,12 +30,10 @@
   protected char[] buffer;
   protected int maxNextCharInd = 0;
   protected int inBuf = 0;
-  protected int tabSize = 1;
-  protected boolean trackLineColumn = true;
-
-  public void setTabSize(int i) { tabSize = i; }
-  public int getTabSize() { return tabSize; }
-
+  protected int tabSize = 8;
+
+  protected void setTabSize(int i) { tabSize = i; }
+  protected int getTabSize(int i) { return tabSize; }
 
 
   protected void ExpandBuff(boolean wrapAround)
@@ -468,7 +466,6 @@
     line = bufline[j];
     column = bufcolumn[j];
   }
-  boolean getTrackLineColumn() { return trackLineColumn; }
-  void setTrackLineColumn(boolean tlc) { trackLineColumn = tlc; }
+
 }
-/* JavaCC - OriginalChecksum=3bfee23fa238f42634d20b3466c7eaef (do not edit this line) */
+/* JavaCC - OriginalChecksum=816436a32bfa27b6bfceb55653f8d63a (do not edit this line) */
 
=== modified file 'src/dk/aau/cs/TCTL/CTLParsing/TAPAALCTLQueryParser.java'
--- src/dk/aau/cs/TCTL/CTLParsing/TAPAALCTLQueryParser.java	2017-05-15 10:38:38 +0000
+++ src/dk/aau/cs/TCTL/CTLParsing/TAPAALCTLQueryParser.java	2017-09-05 21:26:24 +0000
@@ -1,4 +1,3 @@
-/* TAPAALCTLQueryParser.java */
 /* Generated By:JavaCC: Do not edit this line. TAPAALCTLQueryParser.java */
 package dk.aau.cs.TCTL.CTLParsing;
 
@@ -41,164 +40,155 @@
         }
 
 /** Root production. */
-  final public TCTLAbstractPathProperty AbstractPathProperty() throws ParseException {TCTLAbstractStateProperty child = null;
+  final public TCTLAbstractPathProperty AbstractPathProperty() throws ParseException {
+        TCTLAbstractStateProperty child = null;
         TCTLAbstractStateProperty child2 = null;
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case EF:{
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case EF:
       jj_consume_token(EF);
       child = OrExpr();
-{if ("" != null) return new TCTLEFNode(child);}
+                                       {if (true) return new TCTLEFNode(child);}
       break;
-      }
-    case EG:{
+    case EG:
       jj_consume_token(EG);
       child = OrExpr();
-{if ("" != null) return new TCTLEGNode(child);}
+                                         {if (true) return new TCTLEGNode(child);}
       break;
-      }
-    case EX:{
+    case EX:
       jj_consume_token(EX);
       child = OrExpr();
-{if ("" != null) return new TCTLEXNode(child);}
+                                         {if (true) return new TCTLEXNode(child);}
       break;
-      }
-    case E:{
+    case E:
       jj_consume_token(E);
       jj_consume_token(26);
       child = OrExpr();
       jj_consume_token(U);
       child2 = OrExpr();
       jj_consume_token(27);
-{if ("" != null) return new TCTLEUNode(child, child2);}
+                                                               {if (true) return new TCTLEUNode(child, child2);}
       break;
-      }
-    case AF:{
+    case AF:
       jj_consume_token(AF);
       child = OrExpr();
-{if ("" != null) return new TCTLAFNode(child);}
+                                         {if (true) return new TCTLAFNode(child);}
       break;
-      }
-    case AG:{
+    case AG:
       jj_consume_token(AG);
       child = OrExpr();
-{if ("" != null) return new TCTLAGNode(child);}
+                                         {if (true) return new TCTLAGNode(child);}
       break;
-      }
-    case A:{
+    case A:
       jj_consume_token(A);
       jj_consume_token(26);
       child = OrExpr();
       jj_consume_token(U);
       child2 = OrExpr();
       jj_consume_token(27);
-{if ("" != null) return new TCTLAUNode(child, child2);}
+                                                               {if (true) return new TCTLAUNode(child, child2);}
       break;
-      }
-    case AX:{
+    case AX:
       jj_consume_token(AX);
       child = OrExpr();
-{if ("" != null) return new TCTLAXNode(child);}
+                                         {if (true) return new TCTLAXNode(child);}
       break;
-      }
     default:
       jj_la1[0] = jj_gen;
       child = OrExpr();
-{if ("" != null) return new TCTLStateToPathConverter(child);}
+                             {if (true) return new TCTLStateToPathConverter(child);}
     }
     throw new Error("Missing return statement in function");
-}
+  }
 
-  final public TCTLAbstractStateProperty OrExpr() throws ParseException {TCTLAbstractStateProperty currentChild;
+  final public TCTLAbstractStateProperty OrExpr() throws ParseException {
+        TCTLAbstractStateProperty currentChild;
         ArrayList<TCTLAbstractStateProperty> disjunctions = new ArrayList<TCTLAbstractStateProperty>();
     currentChild = AndExpr();
-disjunctions.add(currentChild);
+          disjunctions.add(currentChild);
     label_1:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case OR:{
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case OR:
         ;
         break;
-        }
       default:
         jj_la1[1] = jj_gen;
         break label_1;
       }
       jj_consume_token(OR);
       currentChild = AndExpr();
-disjunctions.add(currentChild);
+                  disjunctions.add(currentChild);
     }
-{if ("" != null) return disjunctions.size() == 1 ? currentChild : new TCTLOrListNode(disjunctions);}
+          {if (true) return disjunctions.size() == 1 ? currentChild : new TCTLOrListNode(disjunctions);}
     throw new Error("Missing return statement in function");
-}
+  }
 
-  final public TCTLAbstractStateProperty AndExpr() throws ParseException {TCTLAbstractStateProperty currentChild;
+  final public TCTLAbstractStateProperty AndExpr() throws ParseException {
+        TCTLAbstractStateProperty currentChild;
         ArrayList<TCTLAbstractStateProperty> conjunctions = new ArrayList<TCTLAbstractStateProperty>();
     currentChild = NotExpr();
-conjunctions.add(currentChild);
+          conjunctions.add(currentChild);
     label_2:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case AND:{
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case AND:
         ;
         break;
-        }
       default:
         jj_la1[2] = jj_gen;
         break label_2;
       }
       jj_consume_token(AND);
       currentChild = NotExpr();
-conjunctions.add(currentChild);
+                  conjunctions.add(currentChild);
     }
-{if ("" != null) return conjunctions.size() == 1 ? currentChild : new TCTLAndListNode(conjunctions);}
+          {if (true) return conjunctions.size() == 1 ? currentChild : new TCTLAndListNode(conjunctions);}
     throw new Error("Missing return statement in function");
-}
+  }
 
-  final public TCTLAbstractStateProperty NotExpr() throws ParseException {TCTLAbstractStateProperty child;
+  final public TCTLAbstractStateProperty NotExpr() throws ParseException {
+        TCTLAbstractStateProperty child;
         TCTLAbstractPathProperty childConverter;
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case NOT:{
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case NOT:
       jj_consume_token(NOT);
       jj_consume_token(26);
       child = OrExpr();
       jj_consume_token(27);
-{if ("" != null) return new TCTLNotNode(child);}
+                                         {if (true) return new TCTLNotNode(child);}
       break;
-      }
     default:
       jj_la1[3] = jj_gen;
       child = Factor();
-{if ("" != null) return child;}
+                             {if (true) return child;}
     }
     throw new Error("Missing return statement in function");
-}
+  }
 
-  final public TCTLAbstractStateProperty Factor() throws ParseException {TCTLAbstractStateProperty thisProp;
+  final public TCTLAbstractStateProperty Factor() throws ParseException {
+        TCTLAbstractStateProperty thisProp;
         Token temp = null;
         Token transition;
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case TRUE:{
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case TRUE:
       jj_consume_token(TRUE);
-thisProp = new TCTLTrueNode();
+                        thisProp = new TCTLTrueNode();
       break;
-      }
-    case FALSE:{
+    case FALSE:
       jj_consume_token(FALSE);
-thisProp = new TCTLFalseNode();
+                           thisProp = new TCTLFalseNode();
       break;
-      }
-    case DEADLOCK:{
+    case DEADLOCK:
       jj_consume_token(DEADLOCK);
-thisProp = new TCTLDeadlockNode();
+                              thisProp = new TCTLDeadlockNode();
       break;
-      }
     default:
       jj_la1[4] = jj_gen;
       if (jj_2_2(2147483647)) {
         thisProp = AtomicProposition();
       } else {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case IDENT:{
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case IDENT:
           if (jj_2_1(2)) {
             temp = jj_consume_token(IDENT);
             jj_consume_token(28);
@@ -206,117 +196,117 @@
             ;
           }
           transition = jj_consume_token(IDENT);
-thisProp = new TCTLTransitionNode(temp == null ? "" : temp.image, transition.image);
+                thisProp = new TCTLTransitionNode(temp == null ? "" : temp.image, transition.image);
           break;
-          }
-        case 26:{
+        case 26:
           jj_consume_token(26);
           thisProp = OrExpr();
           jj_consume_token(27);
           break;
-          }
         default:
           jj_la1[5] = jj_gen;
-thisProp = new TCTLPathToStateConverter(AbstractPathProperty());
+                thisProp = new TCTLPathToStateConverter(AbstractPathProperty());
         }
       }
     }
-{if ("" != null) return thisProp;}
+          {if (true) return thisProp;}
     throw new Error("Missing return statement in function");
-}
+  }
 
-  final public TCTLAbstractStateProperty AtomicProposition() throws ParseException {TCTLAbstractStateProperty left;
+  final public TCTLAbstractStateProperty AtomicProposition() throws ParseException {
+        TCTLAbstractStateProperty left;
         TCTLAbstractStateProperty right;
         Token op;
     left = AritmeticExpr();
     op = jj_consume_token(OP);
     right = AritmeticExpr();
-{if ("" != null) return new TCTLAtomicPropositionNode(left, op.image, right);}
+                {if (true) return new TCTLAtomicPropositionNode(left, op.image, right);}
     throw new Error("Missing return statement in function");
-}
+  }
 
-  final public TCTLAbstractStateProperty AritmeticExpr() throws ParseException {TCTLAbstractStateProperty currentChild;
+  final public TCTLAbstractStateProperty AritmeticExpr() throws ParseException {
+        TCTLAbstractStateProperty currentChild;
         ArrayList<TCTLAbstractStateProperty> terms = new ArrayList<TCTLAbstractStateProperty>();
         Token op;
     currentChild = AritmeticMinusExpr();
-terms.add(currentChild);
+          terms.add(currentChild);
     label_3:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case PLUS:{
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case PLUS:
         ;
         break;
-        }
       default:
         jj_la1[6] = jj_gen;
         break label_3;
       }
       op = jj_consume_token(PLUS);
       currentChild = AritmeticMinusExpr();
-terms.add(new AritmeticOperator(op.image));
+                        terms.add(new AritmeticOperator(op.image));
                         terms.add(currentChild);
     }
-{if ("" != null) return terms.size() == 1 ? currentChild : new TCTLTermListNode(terms);}
+          {if (true) return terms.size() == 1 ? currentChild : new TCTLTermListNode(terms);}
     throw new Error("Missing return statement in function");
-}
+  }
 
-  final public TCTLAbstractStateProperty AritmeticMinusExpr() throws ParseException {TCTLAbstractStateProperty currentChild;
+  final public TCTLAbstractStateProperty AritmeticMinusExpr() throws ParseException {
+        TCTLAbstractStateProperty currentChild;
         ArrayList<TCTLAbstractStateProperty> terms = new ArrayList<TCTLAbstractStateProperty>();
         Token op;
     currentChild = AritmeticTerm();
-terms.add(currentChild);
+          terms.add(currentChild);
     label_4:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case MINUS:{
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case MINUS:
         ;
         break;
-        }
       default:
         jj_la1[7] = jj_gen;
         break label_4;
       }
       op = jj_consume_token(MINUS);
       currentChild = AritmeticTerm();
-terms.add(new AritmeticOperator(op.image));
+                        terms.add(new AritmeticOperator(op.image));
                         terms.add(currentChild);
     }
-{if ("" != null) return terms.size() == 1 ? currentChild : new TCTLTermListNode(terms);}
+          {if (true) return terms.size() == 1 ? currentChild : new TCTLTermListNode(terms);}
     throw new Error("Missing return statement in function");
-}
+  }
 
-  final public TCTLAbstractStateProperty AritmeticTerm() throws ParseException {TCTLAbstractStateProperty currentChild;
+  final public TCTLAbstractStateProperty AritmeticTerm() throws ParseException {
+        TCTLAbstractStateProperty currentChild;
         ArrayList<TCTLAbstractStateProperty> factors = new ArrayList<TCTLAbstractStateProperty>();
         Token op;
     currentChild = AritmeticFactor();
-factors.add(currentChild);
+          factors.add(currentChild);
     label_5:
     while (true) {
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case MULT:{
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case MULT:
         ;
         break;
-        }
       default:
         jj_la1[8] = jj_gen;
         break label_5;
       }
       op = jj_consume_token(MULT);
       currentChild = AritmeticFactor();
-factors.add(new AritmeticOperator(op.image));
+                        factors.add(new AritmeticOperator(op.image));
                         factors.add(currentChild);
     }
-{if ("" != null) return factors.size() == 1 ? currentChild : new TCTLTermListNode(factors);}
+          {if (true) return factors.size() == 1 ? currentChild : new TCTLTermListNode(factors);}
     throw new Error("Missing return statement in function");
-}
+  }
 
-  final public TCTLAbstractStateProperty AritmeticFactor() throws ParseException {TCTLAbstractStateProperty thisProp;
+  final public TCTLAbstractStateProperty AritmeticFactor() throws ParseException {
+        TCTLAbstractStateProperty thisProp;
         Token temp = null;
         Token place;
         Token op;
         Token num;
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case IDENT:{
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case IDENT:
       if (jj_2_3(2)) {
         temp = jj_consume_token(IDENT);
         jj_consume_token(28);
@@ -324,90 +314,78 @@
         ;
       }
       place = jj_consume_token(IDENT);
-thisProp = new TCTLPlaceNode(temp == null ? "" : temp.image, place.image);
+                                                                      thisProp = new TCTLPlaceNode(temp == null ? "" : temp.image, place.image);
       break;
-      }
-    case NUM:{
+    case NUM:
       num = jj_consume_token(NUM);
-thisProp = new TCTLConstNode(Integer.parseInt(num.image));
+                                thisProp = new TCTLConstNode(Integer.parseInt(num.image));
       break;
-      }
-    case 26:{
+    case 26:
       jj_consume_token(26);
       thisProp = AritmeticExpr();
       jj_consume_token(27);
       break;
-      }
     default:
       jj_la1[9] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
-{if ("" != null) return thisProp;}
+          {if (true) return thisProp;}
     throw new Error("Missing return statement in function");
-}
+  }
 
-  private boolean jj_2_1(int xla)
- {
+  private boolean jj_2_1(int xla) {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_1()); }
+    try { return !jj_3_1(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(0, xla); }
   }
 
-  private boolean jj_2_2(int xla)
- {
+  private boolean jj_2_2(int xla) {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_2()); }
+    try { return !jj_3_2(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(1, xla); }
   }
 
-  private boolean jj_2_3(int xla)
- {
+  private boolean jj_2_3(int xla) {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_3()); }
+    try { return !jj_3_3(); }
     catch(LookaheadSuccess ls) { return true; }
     finally { jj_save(2, xla); }
   }
 
-  private boolean jj_3R_16()
- {
+  private boolean jj_3R_16() {
     if (jj_scan_token(26)) return true;
     if (jj_3R_7()) return true;
     if (jj_scan_token(27)) return true;
     return false;
   }
 
-  private boolean jj_3R_13()
- {
+  private boolean jj_3R_13() {
     if (jj_scan_token(MULT)) return true;
     if (jj_3R_12()) return true;
     return false;
   }
 
-  private boolean jj_3_1()
- {
+  private boolean jj_3_1() {
     if (jj_scan_token(IDENT)) return true;
     if (jj_scan_token(28)) return true;
     return false;
   }
 
-  private boolean jj_3R_15()
- {
+  private boolean jj_3R_15() {
     if (jj_scan_token(NUM)) return true;
     return false;
   }
 
-  private boolean jj_3_3()
- {
+  private boolean jj_3_3() {
     if (jj_scan_token(IDENT)) return true;
     if (jj_scan_token(28)) return true;
     return false;
   }
 
-  private boolean jj_3R_7()
- {
+  private boolean jj_3R_7() {
     if (jj_3R_8()) return true;
     Token xsp;
     while (true) {
@@ -417,8 +395,7 @@
     return false;
   }
 
-  private boolean jj_3R_14()
- {
+  private boolean jj_3R_14() {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_3()) jj_scanpos = xsp;
@@ -426,8 +403,7 @@
     return false;
   }
 
-  private boolean jj_3R_8()
- {
+  private boolean jj_3R_8() {
     if (jj_3R_10()) return true;
     Token xsp;
     while (true) {
@@ -437,8 +413,7 @@
     return false;
   }
 
-  private boolean jj_3R_10()
- {
+  private boolean jj_3R_10() {
     if (jj_3R_12()) return true;
     Token xsp;
     while (true) {
@@ -448,8 +423,7 @@
     return false;
   }
 
-  private boolean jj_3R_12()
- {
+  private boolean jj_3R_12() {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_14()) {
@@ -462,29 +436,25 @@
     return false;
   }
 
-  private boolean jj_3R_9()
- {
+  private boolean jj_3R_9() {
     if (jj_scan_token(PLUS)) return true;
     if (jj_3R_8()) return true;
     return false;
   }
 
-  private boolean jj_3_2()
- {
+  private boolean jj_3_2() {
     if (jj_3R_6()) return true;
     return false;
   }
 
-  private boolean jj_3R_6()
- {
+  private boolean jj_3R_6() {
     if (jj_3R_7()) return true;
     if (jj_scan_token(OP)) return true;
     if (jj_3R_7()) return true;
     return false;
   }
 
-  private boolean jj_3R_11()
- {
+  private boolean jj_3R_11() {
     if (jj_scan_token(MINUS)) return true;
     if (jj_3R_10()) return true;
     return false;
@@ -504,168 +474,159 @@
   final private int[] jj_la1 = new int[10];
   static private int[] jj_la1_0;
   static {
-	   jj_la1_init_0();
-	}
-	private static void jj_la1_init_0() {
-	   jj_la1_0 = new int[] {0x1ef0,0x2000,0x4000,0x8000,0xe,0x4100000,0x10000,0x20000,0x40000,0x4180000,};
-	}
+      jj_la1_init_0();
+   }
+   private static void jj_la1_init_0() {
+      jj_la1_0 = new int[] {0x1ef0,0x2000,0x4000,0x8000,0xe,0x4100000,0x10000,0x20000,0x40000,0x4180000,};
+   }
   final private JJCalls[] jj_2_rtns = new JJCalls[3];
   private boolean jj_rescan = false;
   private int jj_gc = 0;
 
   /** Constructor with InputStream. */
   public TAPAALCTLQueryParser(java.io.InputStream stream) {
-	  this(stream, null);
+     this(stream, null);
   }
   /** Constructor with InputStream and supplied encoding */
   public TAPAALCTLQueryParser(java.io.InputStream stream, String encoding) {
-	 try { jj_input_stream = new SimpleCharStream(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
-	 token_source = new TAPAALCTLQueryParserTokenManager(jj_input_stream);
-	 token = new Token();
-	 jj_ntk = -1;
-	 jj_gen = 0;
-	 for (int i = 0; i < 10; i++) jj_la1[i] = -1;
-	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+    try { jj_input_stream = new SimpleCharStream(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
+    token_source = new TAPAALCTLQueryParserTokenManager(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 10; i++) jj_la1[i] = -1;
+    for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
   /** Reinitialise. */
   public void ReInit(java.io.InputStream stream) {
-	  ReInit(stream, null);
+     ReInit(stream, null);
   }
   /** Reinitialise. */
   public void ReInit(java.io.InputStream stream, String encoding) {
-	 try { jj_input_stream.ReInit(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
-	 token_source.ReInit(jj_input_stream);
-	 token = new Token();
-	 jj_ntk = -1;
-	 jj_gen = 0;
-	 for (int i = 0; i < 10; i++) jj_la1[i] = -1;
-	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+    try { jj_input_stream.ReInit(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
+    token_source.ReInit(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 10; i++) jj_la1[i] = -1;
+    for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
   /** Constructor. */
   public TAPAALCTLQueryParser(java.io.Reader stream) {
-	 jj_input_stream = new SimpleCharStream(stream, 1, 1);
-	 token_source = new TAPAALCTLQueryParserTokenManager(jj_input_stream);
-	 token = new Token();
-	 jj_ntk = -1;
-	 jj_gen = 0;
-	 for (int i = 0; i < 10; i++) jj_la1[i] = -1;
-	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+    jj_input_stream = new SimpleCharStream(stream, 1, 1);
+    token_source = new TAPAALCTLQueryParserTokenManager(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 10; i++) jj_la1[i] = -1;
+    for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
   /** Reinitialise. */
   public void ReInit(java.io.Reader stream) {
-	if (jj_input_stream == null) {
-	   jj_input_stream = new SimpleCharStream(stream, 1, 1);
-	} else {
-	   jj_input_stream.ReInit(stream, 1, 1);
-	}
-	if (token_source == null) {
- token_source = new TAPAALCTLQueryParserTokenManager(jj_input_stream);
-	}
-
-	 token_source.ReInit(jj_input_stream);
-	 token = new Token();
-	 jj_ntk = -1;
-	 jj_gen = 0;
-	 for (int i = 0; i < 10; i++) jj_la1[i] = -1;
-	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+    jj_input_stream.ReInit(stream, 1, 1);
+    token_source.ReInit(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 10; i++) jj_la1[i] = -1;
+    for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
   /** Constructor with generated Token Manager. */
   public TAPAALCTLQueryParser(TAPAALCTLQueryParserTokenManager tm) {
-	 token_source = tm;
-	 token = new Token();
-	 jj_ntk = -1;
-	 jj_gen = 0;
-	 for (int i = 0; i < 10; i++) jj_la1[i] = -1;
-	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+    token_source = tm;
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 10; i++) jj_la1[i] = -1;
+    for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
   /** Reinitialise. */
   public void ReInit(TAPAALCTLQueryParserTokenManager tm) {
-	 token_source = tm;
-	 token = new Token();
-	 jj_ntk = -1;
-	 jj_gen = 0;
-	 for (int i = 0; i < 10; i++) jj_la1[i] = -1;
-	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+    token_source = tm;
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 10; i++) jj_la1[i] = -1;
+    for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
   private Token jj_consume_token(int kind) throws ParseException {
-	 Token oldToken;
-	 if ((oldToken = token).next != null) token = token.next;
-	 else token = token.next = token_source.getNextToken();
-	 jj_ntk = -1;
-	 if (token.kind == kind) {
-	   jj_gen++;
-	   if (++jj_gc > 100) {
-		 jj_gc = 0;
-		 for (int i = 0; i < jj_2_rtns.length; i++) {
-		   JJCalls c = jj_2_rtns[i];
-		   while (c != null) {
-			 if (c.gen < jj_gen) c.first = null;
-			 c = c.next;
-		   }
-		 }
-	   }
-	   return token;
-	 }
-	 token = oldToken;
-	 jj_kind = kind;
-	 throw generateParseException();
+    Token oldToken;
+    if ((oldToken = token).next != null) token = token.next;
+    else token = token.next = token_source.getNextToken();
+    jj_ntk = -1;
+    if (token.kind == kind) {
+      jj_gen++;
+      if (++jj_gc > 100) {
+        jj_gc = 0;
+        for (int i = 0; i < jj_2_rtns.length; i++) {
+          JJCalls c = jj_2_rtns[i];
+          while (c != null) {
+            if (c.gen < jj_gen) c.first = null;
+            c = c.next;
+          }
+        }
+      }
+      return token;
+    }
+    token = oldToken;
+    jj_kind = kind;
+    throw generateParseException();
   }
 
-  @SuppressWarnings("serial")
   static private final class LookaheadSuccess extends java.lang.Error { }
   final private LookaheadSuccess jj_ls = new LookaheadSuccess();
   private boolean jj_scan_token(int kind) {
-	 if (jj_scanpos == jj_lastpos) {
-	   jj_la--;
-	   if (jj_scanpos.next == null) {
-		 jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken();
-	   } else {
-		 jj_lastpos = jj_scanpos = jj_scanpos.next;
-	   }
-	 } else {
-	   jj_scanpos = jj_scanpos.next;
-	 }
-	 if (jj_rescan) {
-	   int i = 0; Token tok = token;
-	   while (tok != null && tok != jj_scanpos) { i++; tok = tok.next; }
-	   if (tok != null) jj_add_error_token(kind, i);
-	 }
-	 if (jj_scanpos.kind != kind) return true;
-	 if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;
-	 return false;
+    if (jj_scanpos == jj_lastpos) {
+      jj_la--;
+      if (jj_scanpos.next == null) {
+        jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken();
+      } else {
+        jj_lastpos = jj_scanpos = jj_scanpos.next;
+      }
+    } else {
+      jj_scanpos = jj_scanpos.next;
+    }
+    if (jj_rescan) {
+      int i = 0; Token tok = token;
+      while (tok != null && tok != jj_scanpos) { i++; tok = tok.next; }
+      if (tok != null) jj_add_error_token(kind, i);
+    }
+    if (jj_scanpos.kind != kind) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;
+    return false;
   }
 
 
 /** Get the next Token. */
   final public Token getNextToken() {
-	 if (token.next != null) token = token.next;
-	 else token = token.next = token_source.getNextToken();
-	 jj_ntk = -1;
-	 jj_gen++;
-	 return token;
+    if (token.next != null) token = token.next;
+    else token = token.next = token_source.getNextToken();
+    jj_ntk = -1;
+    jj_gen++;
+    return token;
   }
 
 /** Get the specific Token. */
   final public Token getToken(int index) {
-	 Token t = token;
-	 for (int i = 0; i < index; i++) {
-	   if (t.next != null) t = t.next;
-	   else t = t.next = token_source.getNextToken();
-	 }
-	 return t;
+    Token t = token;
+    for (int i = 0; i < index; i++) {
+      if (t.next != null) t = t.next;
+      else t = t.next = token_source.getNextToken();
+    }
+    return t;
   }
 
-  private int jj_ntk_f() {
-	 if ((jj_nt=token.next) == null)
-	   return (jj_ntk = (token.next=token_source.getNextToken()).kind);
-	 else
-	   return (jj_ntk = jj_nt.kind);
+  private int jj_ntk() {
+    if ((jj_nt=token.next) == null)
+      return (jj_ntk = (token.next=token_source.getNextToken()).kind);
+    else
+      return (jj_ntk = jj_nt.kind);
   }
 
   private java.util.List<int[]> jj_expentries = new java.util.ArrayList<int[]>();
@@ -675,83 +636,65 @@
   private int jj_endpos;
 
   private void jj_add_error_token(int kind, int pos) {
-	 if (pos >= 100) {
-		return;
-	 }
-
-	 if (pos == jj_endpos + 1) {
-	   jj_lasttokens[jj_endpos++] = kind;
-	 } else if (jj_endpos != 0) {
-	   jj_expentry = new int[jj_endpos];
-
-	   for (int i = 0; i < jj_endpos; i++) {
-		 jj_expentry[i] = jj_lasttokens[i];
-	   }
-
-	   for (int[] oldentry : jj_expentries) {
-		 if (oldentry.length == jj_expentry.length) {
-		   boolean isMatched = true;
-
-		   for (int i = 0; i < jj_expentry.length; i++) {
-			 if (oldentry[i] != jj_expentry[i]) {
-			   isMatched = false;
-			   break;
-			 }
-
-		   }
-		   if (isMatched) {
-			 jj_expentries.add(jj_expentry);
-			 break;
-		   }
-		 }
-	   }
-
-	   if (pos != 0) {
-		 jj_lasttokens[(jj_endpos = pos) - 1] = kind;
-	   }
-	 }
+    if (pos >= 100) return;
+    if (pos == jj_endpos + 1) {
+      jj_lasttokens[jj_endpos++] = kind;
+    } else if (jj_endpos != 0) {
+      jj_expentry = new int[jj_endpos];
+      for (int i = 0; i < jj_endpos; i++) {
+        jj_expentry[i] = jj_lasttokens[i];
+      }
+      boolean exists = false;
+      for (java.util.Iterator<?> it = jj_expentries.iterator(); it.hasNext();) {
+        exists = true;
+        int[] oldentry = (int[])(it.next());
+        if (oldentry.length == jj_expentry.length) {
+          for (int i = 0; i < jj_expentry.length; i++) {
+            if (oldentry[i] != jj_expentry[i]) {
+              exists = false;
+              break;
+            }
+          }
+          if (exists) break;
+        }
+      }
+      if (!exists) jj_expentries.add(jj_expentry);
+      if (pos != 0) jj_lasttokens[(jj_endpos = pos) - 1] = kind;
+    }
   }
 
   /** Generate ParseException. */
   public ParseException generateParseException() {
-	 jj_expentries.clear();
-	 boolean[] la1tokens = new boolean[29];
-	 if (jj_kind >= 0) {
-	   la1tokens[jj_kind] = true;
-	   jj_kind = -1;
-	 }
-	 for (int i = 0; i < 10; i++) {
-	   if (jj_la1[i] == jj_gen) {
-		 for (int j = 0; j < 32; j++) {
-		   if ((jj_la1_0[i] & (1<<j)) != 0) {
-			 la1tokens[j] = true;
-		   }
-		 }
-	   }
-	 }
-	 for (int i = 0; i < 29; i++) {
-	   if (la1tokens[i]) {
-		 jj_expentry = new int[1];
-		 jj_expentry[0] = i;
-		 jj_expentries.add(jj_expentry);
-	   }
-	 }
-	 jj_endpos = 0;
-	 jj_rescan_token();
-	 jj_add_error_token(0, 0);
-	 int[][] exptokseq = new int[jj_expentries.size()][];
-	 for (int i = 0; i < jj_expentries.size(); i++) {
-	   exptokseq[i] = jj_expentries.get(i);
-	 }
-	 return new ParseException(token, exptokseq, tokenImage);
-  }
-
-  private int trace_indent = 0;
-  private boolean trace_enabled;
-
-/** Trace enabled. */
-  final public boolean trace_enabled() {
-	 return trace_enabled;
+    jj_expentries.clear();
+    boolean[] la1tokens = new boolean[29];
+    if (jj_kind >= 0) {
+      la1tokens[jj_kind] = true;
+      jj_kind = -1;
+    }
+    for (int i = 0; i < 10; i++) {
+      if (jj_la1[i] == jj_gen) {
+        for (int j = 0; j < 32; j++) {
+          if ((jj_la1_0[i] & (1<<j)) != 0) {
+            la1tokens[j] = true;
+          }
+        }
+      }
+    }
+    for (int i = 0; i < 29; i++) {
+      if (la1tokens[i]) {
+        jj_expentry = new int[1];
+        jj_expentry[0] = i;
+        jj_expentries.add(jj_expentry);
+      }
+    }
+    jj_endpos = 0;
+    jj_rescan_token();
+    jj_add_error_token(0, 0);
+    int[][] exptokseq = new int[jj_expentries.size()][];
+    for (int i = 0; i < jj_expentries.size(); i++) {
+      exptokseq[i] = jj_expentries.get(i);
+    }
+    return new ParseException(token, exptokseq, tokenImage);
   }
 
   /** Enable tracing. */
@@ -763,45 +706,40 @@
   }
 
   private void jj_rescan_token() {
-	 jj_rescan = true;
-	 for (int i = 0; i < 3; i++) {
-	   try {
-		 JJCalls p = jj_2_rtns[i];
-
-		 do {
-		   if (p.gen > jj_gen) {
-			 jj_la = p.arg; jj_lastpos = jj_scanpos = p.first;
-			 switch (i) {
-			   case 0: jj_3_1(); break;
-			   case 1: jj_3_2(); break;
-			   case 2: jj_3_3(); break;
-			 }
-		   }
-		   p = p.next;
-		 } while (p != null);
-
-		 } catch(LookaheadSuccess ls) { }
-	 }
-	 jj_rescan = false;
+    jj_rescan = true;
+    for (int i = 0; i < 3; i++) {
+    try {
+      JJCalls p = jj_2_rtns[i];
+      do {
+        if (p.gen > jj_gen) {
+          jj_la = p.arg; jj_lastpos = jj_scanpos = p.first;
+          switch (i) {
+            case 0: jj_3_1(); break;
+            case 1: jj_3_2(); break;
+            case 2: jj_3_3(); break;
+          }
+        }
+        p = p.next;
+      } while (p != null);
+      } catch(LookaheadSuccess ls) { }
+    }
+    jj_rescan = false;
   }
 
   private void jj_save(int index, int xla) {
-	 JJCalls p = jj_2_rtns[index];
-	 while (p.gen > jj_gen) {
-	   if (p.next == null) { p = p.next = new JJCalls(); break; }
-	   p = p.next;
-	 }
-
-	 p.gen = jj_gen + xla - jj_la; 
-	 p.first = token;
-	 p.arg = xla;
+    JJCalls p = jj_2_rtns[index];
+    while (p.gen > jj_gen) {
+      if (p.next == null) { p = p.next = new JJCalls(); break; }
+      p = p.next;
+    }
+    p.gen = jj_gen + xla - jj_la; p.first = token; p.arg = xla;
   }
 
   static final class JJCalls {
-	 int gen;
-	 Token first;
-	 int arg;
-	 JJCalls next;
+    int gen;
+    Token first;
+    int arg;
+    JJCalls next;
   }
 
 }
 
=== modified file 'src/dk/aau/cs/TCTL/CTLParsing/TAPAALCTLQueryParserTokenManager.java'
--- src/dk/aau/cs/TCTL/CTLParsing/TAPAALCTLQueryParserTokenManager.java	2017-05-14 19:42:09 +0000
+++ src/dk/aau/cs/TCTL/CTLParsing/TAPAALCTLQueryParserTokenManager.java	2017-09-05 21:26:24 +0000
@@ -1,4 +1,3 @@
-/* TAPAALCTLQueryParserTokenManager.java */
 /* Generated By:JavaCC: Do not edit this line. TAPAALCTLQueryParserTokenManager.java */
 package dk.aau.cs.TCTL.CTLParsing;
 import java.io.StringReader;
@@ -30,28 +29,33 @@
 import dk.aau.cs.TCTL.TCTLStateToPathConverter;
 
 /** Token Manager. */
-public class TAPAALCTLQueryParserTokenManager implements TAPAALCTLQueryParserConstants {
+public class TAPAALCTLQueryParserTokenManager implements TAPAALCTLQueryParserConstants
+{
 
   /** Debug output. */
   public  java.io.PrintStream debugStream = System.out;
   /** Set debug output. */
   public  void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
-private final int jjStopStringLiteralDfa_0(int pos, long active0){
+private final int jjStopStringLiteralDfa_0(int pos, long active0)
+{
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x100L) != 0L)
-            return 49;
+         if ((active0 & 0x20000L) != 0L)
+            return 48;
          if ((active0 & 0x240L) != 0L)
-            return 64;
+            return 65;
          if ((active0 & 0x1080L) != 0L)
-            return 57;
+            return 58;
+         if ((active0 & 0x100L) != 0L)
+            return 50;
          return -1;
       default :
          return -1;
    }
 }
-private final int jjStartNfa_0(int pos, long active0){
+private final int jjStartNfa_0(int pos, long active0)
+{
    return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1);
 }
 private int jjStopAtPos(int pos, int kind)
@@ -60,7 +64,8 @@
    jjmatchedPos = pos;
    return pos + 1;
 }
-private int jjMoveStringLiteralDfa0_0(){
+private int jjMoveStringLiteralDfa0_0()
+{
    switch(curChar)
    {
       case 40:
@@ -72,7 +77,7 @@
       case 43:
          return jjStopAtPos(0, 16);
       case 45:
-         return jjStopAtPos(0, 17);
+         return jjStartNfaWithStates_0(0, 17, 48);
       case 46:
          return jjStopAtPos(0, 28);
       case 65:
@@ -82,12 +87,13 @@
          jjmatchedKind = 6;
          return jjMoveStringLiteralDfa1_0(0x200L);
       case 85:
-         return jjStartNfaWithStates_0(0, 8, 49);
+         return jjStartNfaWithStates_0(0, 8, 50);
       default :
          return jjMoveNfa_0(3, 0);
    }
 }
-private int jjMoveStringLiteralDfa1_0(long active0){
+private int jjMoveStringLiteralDfa1_0(long active0)
+{
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_0(0, active0);
@@ -97,9 +103,9 @@
    {
       case 88:
          if ((active0 & 0x200L) != 0L)
-            return jjStartNfaWithStates_0(1, 9, 49);
+            return jjStartNfaWithStates_0(1, 9, 50);
          else if ((active0 & 0x1000L) != 0L)
-            return jjStartNfaWithStates_0(1, 12, 49);
+            return jjStartNfaWithStates_0(1, 12, 50);
          break;
       default :
          break;
@@ -117,7 +123,7 @@
 private int jjMoveNfa_0(int startState, int curPos)
 {
    int startsAt = 0;
-   jjnewStateCnt = 70;
+   jjnewStateCnt = 71;
    int i = 1;
    jjstateSet[0] = startState;
    int kind = 0x7fffffff;
@@ -137,7 +143,7 @@
                   {
                      if (kind > 19)
                         kind = 19;
-                     { jjCheckNAdd(47); }
+                     jjCheckNAdd(48);
                   }
                   else if ((0x7000000000000000L & l) != 0L)
                   {
@@ -145,40 +151,42 @@
                         kind = 21;
                   }
                   else if (curChar == 33)
-                     { jjCheckNAdd(51); }
+                     jjCheckNAdd(52);
+                  else if (curChar == 45)
+                     jjCheckNAdd(48);
                   else if (curChar == 38)
                      jjstateSet[jjnewStateCnt++] = 41;
                   if (curChar == 62)
-                     { jjCheckNAdd(51); }
+                     jjCheckNAdd(52);
                   else if (curChar == 61)
-                     { jjCheckNAdd(51); }
+                     jjCheckNAdd(52);
                   else if (curChar == 60)
-                     { jjCheckNAdd(51); }
+                     jjCheckNAdd(52);
                   else if (curChar == 33)
                   {
                      if (kind > 15)
                         kind = 15;
                   }
                   break;
-               case 64:
+               case 65:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
                      if (kind > 20)
                         kind = 20;
-                     { jjCheckNAdd(49); }
+                     jjCheckNAdd(50);
                   }
                   else if (curChar == 60)
-                     jjstateSet[jjnewStateCnt++] = 65;
+                     jjstateSet[jjnewStateCnt++] = 66;
                   break;
-               case 57:
+               case 58:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
                      if (kind > 20)
                         kind = 20;
-                     { jjCheckNAdd(49); }
+                     jjCheckNAdd(50);
                   }
                   else if (curChar == 60)
-                     jjstateSet[jjnewStateCnt++] = 58;
+                     jjstateSet[jjnewStateCnt++] = 59;
                   break;
                case 41:
                   if (curChar == 38 && kind > 14)
@@ -193,58 +201,62 @@
                      kind = 15;
                   break;
                case 47:
+                  if (curChar == 45)
+                     jjCheckNAdd(48);
+                  break;
+               case 48:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 19)
                      kind = 19;
-                  { jjCheckNAdd(47); }
+                  jjCheckNAdd(48);
                   break;
-               case 49:
+               case 50:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 20)
                      kind = 20;
-                  { jjCheckNAdd(49); }
+                  jjCheckNAdd(50);
                   break;
-               case 50:
+               case 51:
                   if ((0x7000000000000000L & l) != 0L && kind > 21)
                      kind = 21;
                   break;
-               case 51:
+               case 52:
                   if (curChar == 61 && kind > 21)
                      kind = 21;
                   break;
-               case 52:
+               case 53:
                   if (curChar == 33)
-                     { jjCheckNAdd(51); }
-                  break;
-               case 53:
-                  if (curChar == 60)
-                     { jjCheckNAdd(51); }
+                     jjCheckNAdd(52);
                   break;
                case 54:
+                  if (curChar == 60)
+                     jjCheckNAdd(52);
+                  break;
+               case 55:
                   if (curChar == 61)
-                     { jjCheckNAdd(51); }
+                     jjCheckNAdd(52);
                   break;
-               case 55:
+               case 56:
                   if (curChar == 62)
-                     { jjCheckNAdd(51); }
+                     jjCheckNAdd(52);
                   break;
-               case 58:
+               case 59:
                   if (curChar == 62 && kind > 10)
                      kind = 10;
                   break;
-               case 59:
+               case 60:
                   if (curChar == 60)
-                     jjstateSet[jjnewStateCnt++] = 58;
+                     jjstateSet[jjnewStateCnt++] = 59;
                   break;
-               case 65:
+               case 66:
                   if (curChar == 62 && kind > 4)
                      kind = 4;
                   break;
-               case 66:
+               case 67:
                   if (curChar == 60)
-                     jjstateSet[jjnewStateCnt++] = 65;
+                     jjstateSet[jjnewStateCnt++] = 66;
                   break;
                default : break;
             }
@@ -262,14 +274,14 @@
                   {
                      if (kind > 20)
                         kind = 20;
-                     { jjCheckNAdd(49); }
+                     jjCheckNAdd(50);
                   }
                   else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 36;
                   if (curChar == 69)
-                     { jjAddStates(0, 3); }
+                     jjAddStates(0, 3);
                   else if (curChar == 65)
-                     { jjAddStates(4, 7); }
+                     jjAddStates(4, 7);
                   else if (curChar == 110)
                      jjstateSet[jjnewStateCnt++] = 44;
                   else if (curChar == 97)
@@ -289,15 +301,15 @@
                   else if (curChar == 116)
                      jjstateSet[jjnewStateCnt++] = 2;
                   break;
-               case 64:
+               case 65:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
                      if (kind > 20)
                         kind = 20;
-                     { jjCheckNAdd(49); }
+                     jjCheckNAdd(50);
                   }
                   else if (curChar == 91)
-                     jjstateSet[jjnewStateCnt++] = 68;
+                     jjstateSet[jjnewStateCnt++] = 69;
                   if (curChar == 71)
                   {
                      if (kind > 5)
@@ -309,15 +321,15 @@
                         kind = 4;
                   }
                   break;
-               case 57:
+               case 58:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
                      if (kind > 20)
                         kind = 20;
-                     { jjCheckNAdd(49); }
+                     jjCheckNAdd(50);
                   }
                   else if (curChar == 91)
-                     jjstateSet[jjnewStateCnt++] = 61;
+                     jjstateSet[jjnewStateCnt++] = 62;
                   if (curChar == 71)
                   {
                      if (kind > 11)
@@ -501,51 +513,51 @@
                   if (curChar == 110)
                      jjstateSet[jjnewStateCnt++] = 44;
                   break;
-               case 48:
-                  if ((0x7fffffe87fffffeL & l) == 0L)
-                     break;
-                  if (kind > 20)
-                     kind = 20;
-                  { jjCheckNAdd(49); }
-                  break;
                case 49:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
                   if (kind > 20)
                      kind = 20;
-                  { jjCheckNAdd(49); }
-                  break;
-               case 56:
+                  jjCheckNAdd(50);
+                  break;
+               case 50:
+                  if ((0x7fffffe87fffffeL & l) == 0L)
+                     break;
+                  if (kind > 20)
+                     kind = 20;
+                  jjCheckNAdd(50);
+                  break;
+               case 57:
                   if (curChar == 65)
-                     { jjAddStates(4, 7); }
+                     jjAddStates(4, 7);
                   break;
-               case 60:
+               case 61:
                   if (curChar == 71 && kind > 11)
                      kind = 11;
                   break;
-               case 61:
+               case 62:
                   if (curChar == 93 && kind > 11)
                      kind = 11;
                   break;
-               case 62:
-                  if (curChar == 91)
-                     jjstateSet[jjnewStateCnt++] = 61;
-                  break;
                case 63:
+                  if (curChar == 91)
+                     jjstateSet[jjnewStateCnt++] = 62;
+                  break;
+               case 64:
                   if (curChar == 69)
-                     { jjAddStates(0, 3); }
+                     jjAddStates(0, 3);
                   break;
-               case 67:
+               case 68:
                   if (curChar == 71 && kind > 5)
                      kind = 5;
                   break;
-               case 68:
+               case 69:
                   if (curChar == 93 && kind > 5)
                      kind = 5;
                   break;
-               case 69:
+               case 70:
                   if (curChar == 91)
-                     jjstateSet[jjnewStateCnt++] = 68;
+                     jjstateSet[jjnewStateCnt++] = 69;
                   break;
                default : break;
             }
@@ -570,18 +582,81 @@
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 70 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 71 - (jjnewStateCnt = startsAt)))
          return curPos;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { return curPos; }
    }
 }
+static final int[] jjnextStates = {
+   65, 67, 68, 70, 58, 60, 61, 63, 
+};
 
 /** Token literal values. */
 public static final String[] jjstrLiteralImages = {
 "", null, null, null, null, null, "\105", "\101", "\125", "\105\130", null, 
 null, "\101\130", null, null, null, "\53", "\55", "\52", null, null, null, null, 
 null, null, null, "\50", "\51", "\56", };
+
+/** Lexer state names. */
+public static final String[] lexStateNames = {
+   "DEFAULT",
+};
+static final long[] jjtoToken = {
+   0x1c3fffffL, 
+};
+static final long[] jjtoSkip = {
+   0x3c00000L, 
+};
+protected SimpleCharStream input_stream;
+private final int[] jjrounds = new int[71];
+private final int[] jjstateSet = new int[142];
+protected char curChar;
+/** Constructor. */
+public TAPAALCTLQueryParserTokenManager(SimpleCharStream stream){
+   if (SimpleCharStream.staticFlag)
+      throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
+   input_stream = stream;
+}
+
+/** Constructor. */
+public TAPAALCTLQueryParserTokenManager(SimpleCharStream stream, int lexState){
+   this(stream);
+   SwitchTo(lexState);
+}
+
+/** Reinitialise parser. */
+public void ReInit(SimpleCharStream stream)
+{
+   jjmatchedPos = jjnewStateCnt = 0;
+   curLexState = defaultLexState;
+   input_stream = stream;
+   ReInitRounds();
+}
+private void ReInitRounds()
+{
+   int i;
+   jjround = 0x80000001;
+   for (i = 71; i-- > 0;)
+      jjrounds[i] = 0x80000000;
+}
+
+/** Reinitialise parser. */
+public void ReInit(SimpleCharStream stream, int lexState)
+{
+   ReInit(stream);
+   SwitchTo(lexState);
+}
+
+/** Switch to specified lex state. */
+public void SwitchTo(int lexState)
+{
+   if (lexState >= 1 || lexState < 0)
+      throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
+   else
+      curLexState = lexState;
+}
+
 protected Token jjFillToken()
 {
    final Token t;
@@ -596,9 +671,7 @@
    beginColumn = input_stream.getBeginColumn();
    endLine = input_stream.getEndLine();
    endColumn = input_stream.getEndColumn();
-   t = Token.newToken(jjmatchedKind);
-   t.kind = jjmatchedKind;
-   t.image = curTokenImage;
+   t = Token.newToken(jjmatchedKind, curTokenImage);
 
    t.beginLine = beginLine;
    t.endLine = endLine;
@@ -607,9 +680,6 @@
 
    return t;
 }
-static final int[] jjnextStates = {
-   64, 66, 67, 69, 57, 59, 60, 62, 
-};
 
 int curLexState = 0;
 int defaultLexState = 0;
@@ -631,10 +701,9 @@
    {
       curChar = input_stream.BeginToken();
    }
-   catch(Exception e)
+   catch(java.io.IOException e)
    {
       jjmatchedKind = 0;
-      jjmatchedPos = -1;
       matchedToken = jjFillToken();
       return matchedToken;
    }
@@ -684,31 +753,6 @@
   }
 }
 
-void SkipLexicalActions(Token matchedToken)
-{
-   switch(jjmatchedKind)
-   {
-      default :
-         break;
-   }
-}
-void MoreLexicalActions()
-{
-   jjimageLen += (lengthOfMatch = jjmatchedPos + 1);
-   switch(jjmatchedKind)
-   {
-      default :
-         break;
-   }
-}
-void TokenLexicalActions(Token matchedToken)
-{
-   switch(jjmatchedKind)
-   {
-      default :
-         break;
-   }
-}
 private void jjCheckNAdd(int state)
 {
    if (jjrounds[state] != jjround)
@@ -729,90 +773,4 @@
    jjCheckNAdd(state2);
 }
 
-    /** Constructor. */
-    public TAPAALCTLQueryParserTokenManager(SimpleCharStream stream){
-
-      if (SimpleCharStream.staticFlag)
-            throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
-
-    input_stream = stream;
-  }
-
-  /** Constructor. */
-  public TAPAALCTLQueryParserTokenManager (SimpleCharStream stream, int lexState){
-    ReInit(stream);
-    SwitchTo(lexState);
-  }
-
-  /** Reinitialise parser. */
-  
-  public void ReInit(SimpleCharStream stream)
-  {
-
-
-    jjmatchedPos =
-    jjnewStateCnt =
-    0;
-    curLexState = defaultLexState;
-    input_stream = stream;
-    ReInitRounds();
-  }
-
-  private void ReInitRounds()
-  {
-    int i;
-    jjround = 0x80000001;
-    for (i = 70; i-- > 0;)
-      jjrounds[i] = 0x80000000;
-  }
-
-  /** Reinitialise parser. */
-  public void ReInit(SimpleCharStream stream, int lexState)
-  
-  {
-    ReInit(stream);
-    SwitchTo(lexState);
-  }
-
-  /** Switch to specified lex state. */
-  public void SwitchTo(int lexState)
-  {
-    if (lexState >= 1 || lexState < 0)
-      throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
-    else
-      curLexState = lexState;
-  }
-
-
-/** Lexer state names. */
-public static final String[] lexStateNames = {
-   "DEFAULT",
-};
-
-/** Lex State array. */
-public static final int[] jjnewLexState = {
-   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-   -1, -1, -1, -1, 
-};
-static final long[] jjtoToken = {
-   0x1c3fffffL, 
-};
-static final long[] jjtoSkip = {
-   0x3c00000L, 
-};
-static final long[] jjtoSpecial = {
-   0x0L, 
-};
-static final long[] jjtoMore = {
-   0x0L, 
-};
-    protected SimpleCharStream  input_stream;
-
-    private final int[] jjrounds = new int[70];
-    private final int[] jjstateSet = new int[2 * 70];
-    private final StringBuilder jjimage = new StringBuilder();
-    private StringBuilder image = jjimage;
-    private int jjimageLen;
-    private int lengthOfMatch;
-    protected int curChar;
 }
 
=== modified file 'src/dk/aau/cs/TCTL/CTLParsing/Token.java'
--- src/dk/aau/cs/TCTL/CTLParsing/Token.java	2017-05-07 12:44:00 +0000
+++ src/dk/aau/cs/TCTL/CTLParsing/Token.java	2017-09-05 21:26:24 +0000
@@ -1,5 +1,5 @@
-/* Generated By:JavaCC: Do not edit this line. Token.java Version 7.0 */
-/* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COLUMN=true,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
+/* Generated By:JavaCC: Do not edit this line. Token.java Version 5.0 */
+/* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 package dk.aau.cs.TCTL.CTLParsing;
 
 /**
@@ -128,4 +128,4 @@
   }
 
 }
-/* JavaCC - OriginalChecksum=8ee1473b89874b09d6c560395ea72ef9 (do not edit this line) */
+/* JavaCC - OriginalChecksum=c3a33ef5a2c7f5ec67f13491eacfbc58 (do not edit this line) */
 
=== modified file 'src/dk/aau/cs/TCTL/CTLParsing/TokenMgrError.java'
--- src/dk/aau/cs/TCTL/CTLParsing/TokenMgrError.java	2017-05-07 12:44:00 +0000
+++ src/dk/aau/cs/TCTL/CTLParsing/TokenMgrError.java	2017-09-05 21:26:24 +0000
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 7.0 */
+/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 5.0 */
 /* JavaCCOptions: */
 package dk.aau.cs.TCTL.CTLParsing;
 
@@ -20,22 +20,22 @@
   /**
    * Lexical error occurred.
    */
-  public static final int LEXICAL_ERROR = 0;
+  static final int LEXICAL_ERROR = 0;
 
   /**
    * An attempt was made to create a second instance of a static token manager.
    */
-  public static final int STATIC_LEXER_ERROR = 1;
+  static final int STATIC_LEXER_ERROR = 1;
 
   /**
    * Tried to change to an invalid lexical state.
    */
-  public static final int INVALID_LEXICAL_STATE = 2;
+  static final int INVALID_LEXICAL_STATE = 2;
 
   /**
    * Detected (and bailed out of) an infinite loop in the token manager.
    */
-  public static final int LOOP_DETECTED = 3;
+  static final int LOOP_DETECTED = 3;
 
   /**
    * Indicates the reason why the exception is thrown. It will have
@@ -53,6 +53,8 @@
     for (int i = 0; i < str.length(); i++) {
       switch (str.charAt(i))
       {
+        case 0 :
+          continue;
         case '\b':
           retval.append("\\b");
           continue;
@@ -102,12 +104,11 @@
    *    curchar     : the offending character
    * Note: You can customize the lexical error message by modifying this method.
    */
-  protected static String LexicalErr(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar) {
-    char curChar1 = (char)curChar;
+  protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) {
     return("Lexical error at line " +
           errorLine + ", column " +
           errorColumn + ".  Encountered: " +
-          (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar1)) + "\"") + " (" + (int)curChar + "), ") +
+          (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + (int)curChar + "), ") +
           "after : \"" + addEscapes(errorAfter) + "\"");
   }
 
@@ -139,8 +140,8 @@
   }
 
   /** Full Constructor. */
-  public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar, int reason) {
-    this(LexicalErr(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
+  public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) {
+    this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
   }
 }
-/* JavaCC - OriginalChecksum=e4cccd65824e0c3a5184be2779230da1 (do not edit this line) */
+/* JavaCC - OriginalChecksum=859f023f3abe7d4b866c6b4b7c693934 (do not edit this line) */
 
=== modified file 'src/resources/TCTLParser/TAPAALCTLQueryParser.jj'
--- src/resources/TCTLParser/TAPAALCTLQueryParser.jj	2017-05-15 10:38:38 +0000
+++ src/resources/TCTLParser/TAPAALCTLQueryParser.jj	2017-09-05 21:26:24 +0000
@@ -112,7 +112,7 @@
 
 TOKEN :
 {
-	< NUM: ( ["0"-"9"] )+ >
+	< NUM: ("-")? ( ["0"-"9"] )+ >
 	|
 	<IDENT: ["a"-"z","A"-"Z","_"] ( ["a"-"z","A"-"Z","_","0"-"9"] )* > 
 }