Fixed whitespace issue with kajtez statement

tkohout · May 31, 2016 · 94c15f8 · 94c15f8
1 parent 751cb9a
commit 94c15f8
Show file tree

Hide file tree

Showing 5 changed files with 111 additions and 122 deletions.
diff --git a/src/main/java/cz/cvut/fit/ostrajava/Parser/OSTRAJava.jj b/src/main/java/cz/cvut/fit/ostrajava/Parser/OSTRAJava.jj
@@ -2469,7 +2469,7 @@ void IfStatement() :
 {/*@bgen(jjtree) IfStatement */
   try {
 /*@egen*/
-  "kaj" "(" Expression() ")" Block() ( LOOKAHEAD(2) "kajtez (" Expression() ")" Block() )* [ LOOKAHEAD(1) "boinak" Block() ]/*@bgen(jjtree)*/
+  "kaj" "(" Expression() ")" Block() ( LOOKAHEAD(3) "kajtez" "(" Expression() ")" Block() )* [ LOOKAHEAD(1) "boinak" Block() ]/*@bgen(jjtree)*/
   } catch (Throwable jjte000) {
     if (jjtc000) {
       jjtree.clearNodeScope(jjtn000);

diff --git a/src/main/java/cz/cvut/fit/ostrajava/Parser/OSTRAJava.jjt b/src/main/java/cz/cvut/fit/ostrajava/Parser/OSTRAJava.jjt
@@ -787,7 +787,7 @@ void IfStatement() :
  */
 {}
 {
-  "kaj" "(" Expression() ")" Block() ( LOOKAHEAD(2) "kajtez (" Expression() ")" Block() )* [ LOOKAHEAD(1) "boinak" Block() ]
+  "kaj" "(" Expression() ")" Block() ( LOOKAHEAD(3) "kajtez" "(" Expression() ")" Block() )* [ LOOKAHEAD(1) "boinak" Block() ]
 }
 
 void WhileStatement() :

diff --git a/src/main/java/cz/cvut/fit/ostrajava/Parser/OSTRAJavaParser.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/OSTRAJavaParser.java
@@ -2823,12 +2823,13 @@ final public void IfStatement() throws ParseException {/*@bgen(jjtree) IfStateme
       Block();
       label_22:
       while (true) {
-        if (jj_2_10(2)) {
+        if (jj_2_10(3)) {
           ;
         } else {
           break label_22;
         }
-        jj_consume_token(82);
+        jj_consume_token(ELSEIF);
+        jj_consume_token(LPAREN);
         Expression();
         jj_consume_token(RPAREN);
         Block();
@@ -3679,7 +3680,8 @@ private boolean jj_3R_82()
 
   private boolean jj_3_10()
  {
-    if (jj_scan_token(82)) return true;
+    if (jj_scan_token(ELSEIF)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     if (jj_3R_31()) return true;
     return false;
   }
@@ -4356,7 +4358,7 @@ private void jj_add_error_token(int kind, int pos) {
   /** Generate ParseException. */
   public ParseException generateParseException() {
     jj_expentries.clear();
-    boolean[] la1tokens = new boolean[83];
+    boolean[] la1tokens = new boolean[82];
     if (jj_kind >= 0) {
       la1tokens[jj_kind] = true;
       jj_kind = -1;
@@ -4376,7 +4378,7 @@ public ParseException generateParseException() {
         }
       }
     }
-    for (int i = 0; i < 83; i++) {
+    for (int i = 0; i < 82; i++) {
       if (la1tokens[i]) {
         jj_expentry = new int[1];
         jj_expentry[0] = i;

diff --git a/src/main/java/cz/cvut/fit/ostrajava/Parser/OSTRAJavaParserConstants.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/OSTRAJavaParserConstants.java
@@ -248,7 +248,6 @@ public interface OSTRAJavaParserConstants {
     "<LETTER>",
     "<DIGIT>",
     "\":\"",
-    "\"kajtez (\"",
   };
 
 }