Migrated some code in pre.l to use STL containers

2 files changed, 246 insertions, 490 deletions

diff --git a/vhdlparser/CharStream.h b/vhdlparser/CharStream.h
index bdfc48c..a955d8e 100644
--- a/vhdlparser/CharStream.h
+++ b/vhdlparser/CharStream.h
@@ -203,7 +203,7 @@ public:
     tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
     available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
     inputStream(nullptr), deleteStream(false) {
-    ReInit(input_stream, startline, startcolumn, INITIAL_BUFFER_SIZE);
+    ReInit(input_stream, startline, startcolumn, buffersize);
   }
 
   CharStream(ReaderStream *input_stream, int startline, int startcolumn) :
@@ -268,4 +268,4 @@ protected:
 }
 
 #endif
-/* JavaCC - OriginalChecksum=c036d83020b072972d6b8ef26a294af9 (do not edit this line) */
+/* JavaCC - OriginalChecksum=c5b4b2e72393f865547f405cc9def169 (do not edit this line) */
diff --git a/vhdlparser/VhdlParser.h b/vhdlparser/VhdlParser.h
index 1809232..24a139a 100644
--- a/vhdlparser/VhdlParser.h
+++ b/vhdlparser/VhdlParser.h
@@ -1331,10 +1331,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_469()) {
+    if (!jj_3R_469()) return false;
     jj_scanpos = xsp;
     if (jj_3R_470()) return true;
-    }
     return false;
   }
 
@@ -1368,16 +1367,13 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(116)) {
+    if (!jj_scan_token(116)) return false;
     jj_scanpos = xsp;
-    if (jj_scan_token(100)) {
+    if (!jj_scan_token(100)) return false;
     jj_scanpos = xsp;
-    if (jj_scan_token(31)) {
+    if (!jj_scan_token(31)) return false;
     jj_scanpos = xsp;
     if (jj_scan_token(101)) return true;
-    }
-    }
-    }
     return false;
   }
 
@@ -1448,10 +1444,9 @@ void parseInline();
     if (jj_scan_token(IS_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_727()) {
+    if (!jj_3R_727()) return false;
     jj_scanpos = xsp;
     if (jj_scan_token(145)) return true;
-    }
     return false;
   }
 
@@ -1496,22 +1491,17 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3_42()) {
+    if (!jj_3_42()) return false;
     jj_scanpos = xsp;
-    if (jj_3_43()) {
+    if (!jj_3_43()) return false;
     jj_scanpos = xsp;
-    if (jj_3_44()) {
+    if (!jj_3_44()) return false;
     jj_scanpos = xsp;
-    if (jj_3_45()) {
+    if (!jj_3_45()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_582()) {
+    if (!jj_3R_582()) return false;
     jj_scanpos = xsp;
     if (jj_3R_583()) return true;
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -1564,13 +1554,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_435()) {
+    if (!jj_3R_435()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_436()) {
+    if (!jj_3R_436()) return false;
     jj_scanpos = xsp;
     if (jj_3R_437()) return true;
-    }
-    }
     return false;
   }
 
@@ -1607,13 +1595,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_343()) {
+    if (!jj_3R_343()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_344()) {
+    if (!jj_3R_344()) return false;
     jj_scanpos = xsp;
     if (jj_3R_345()) return true;
-    }
-    }
     return false;
   }
 
@@ -1662,10 +1648,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_648()) {
+    if (!jj_3R_648()) return false;
     jj_scanpos = xsp;
     if (jj_3R_649()) return true;
-    }
     return false;
   }
 
@@ -1728,10 +1713,9 @@ void parseInline();
     if (jj_3R_90()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(134)) {
+    if (!jj_scan_token(134)) return false;
     jj_scanpos = xsp;
     if (jj_scan_token(137)) return true;
-    }
     return false;
   }
 
@@ -1771,10 +1755,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(84)) {
+    if (!jj_scan_token(84)) return false;
     jj_scanpos = xsp;
     if (jj_scan_token(52)) return true;
-    }
     return false;
   }
 
@@ -1872,10 +1855,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_204()) {
+    if (!jj_3R_204()) return false;
     jj_scanpos = xsp;
     if (jj_3R_205()) return true;
-    }
     return false;
   }
 
@@ -1933,10 +1915,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_170()) {
+    if (!jj_3R_170()) return false;
     jj_scanpos = xsp;
     if (jj_3R_171()) return true;
-    }
     return false;
   }
 
@@ -1953,10 +1934,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(53)) {
+    if (!jj_scan_token(53)) return false;
     jj_scanpos = xsp;
     if (jj_scan_token(75)) return true;
-    }
     return false;
   }
 
@@ -2003,10 +1983,9 @@ void parseInline();
     if (jj_3R_90()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(134)) {
+    if (!jj_scan_token(134)) return false;
     jj_scanpos = xsp;
     if (jj_scan_token(137)) return true;
-    }
     while (true) {
       xsp = jj_scanpos;
       if (jj_3R_406()) { jj_scanpos = xsp; break; }
@@ -2101,10 +2080,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_638()) {
+    if (!jj_3R_638()) return false;
     jj_scanpos = xsp;
     if (jj_3R_639()) return true;
-    }
     return false;
   }
 
@@ -2138,10 +2116,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_720()) {
+    if (!jj_3R_720()) return false;
     jj_scanpos = xsp;
     if (jj_3R_721()) return true;
-    }
     return false;
   }
 
@@ -2258,10 +2235,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_281()) {
+    if (!jj_3R_281()) return false;
     jj_scanpos = xsp;
     if (jj_3R_282()) return true;
-    }
     return false;
   }
 
@@ -2288,10 +2264,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_337()) {
+    if (!jj_3R_337()) return false;
     jj_scanpos = xsp;
     if (jj_3R_338()) return true;
-    }
     return false;
   }
 
@@ -2401,10 +2376,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_279()) {
+    if (!jj_3R_279()) return false;
     jj_scanpos = xsp;
     if (jj_3R_280()) return true;
-    }
     return false;
   }
 
@@ -2593,10 +2567,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_417()) {
+    if (!jj_3R_417()) return false;
     jj_scanpos = xsp;
     if (jj_3R_418()) return true;
-    }
     return false;
   }
 
@@ -2621,10 +2594,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_640()) {
+    if (!jj_3R_640()) return false;
     jj_scanpos = xsp;
     if (jj_3R_641()) return true;
-    }
     return false;
   }
 
@@ -2654,13 +2626,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_519()) {
+    if (!jj_3R_519()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_520()) {
+    if (!jj_3R_520()) return false;
     jj_scanpos = xsp;
     if (jj_3R_521()) return true;
-    }
-    }
     return false;
   }
 
@@ -2714,13 +2684,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_516()) {
+    if (!jj_3R_516()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_517()) {
+    if (!jj_3R_517()) return false;
     jj_scanpos = xsp;
     if (jj_3R_518()) return true;
-    }
-    }
     return false;
   }
 
@@ -2891,19 +2859,15 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_293()) {
+    if (!jj_3R_293()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_294()) {
+    if (!jj_3R_294()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_295()) {
+    if (!jj_3R_295()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_296()) {
+    if (!jj_3R_296()) return false;
     jj_scanpos = xsp;
     if (jj_3R_297()) return true;
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -3049,22 +3013,17 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_409()) {
+    if (!jj_3R_409()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_410()) {
+    if (!jj_3R_410()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_411()) {
+    if (!jj_3R_411()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_412()) {
+    if (!jj_3R_412()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_413()) {
+    if (!jj_3R_413()) return false;
     jj_scanpos = xsp;
     if (jj_3R_414()) return true;
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -3228,10 +3187,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_219()) {
+    if (!jj_3R_219()) return false;
     jj_scanpos = xsp;
     if (jj_3R_220()) return true;
-    }
     return false;
   }
 
@@ -3265,10 +3223,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_716()) {
+    if (!jj_3R_716()) return false;
     jj_scanpos = xsp;
     if (jj_3R_717()) return true;
-    }
     return false;
   }
 
@@ -3397,13 +3354,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_446()) {
+    if (!jj_3R_446()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_447()) {
+    if (!jj_3R_447()) return false;
     jj_scanpos = xsp;
     if (jj_3R_448()) return true;
-    }
-    }
     return false;
   }
 
@@ -3431,13 +3386,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_614()) {
+    if (!jj_3R_614()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_615()) {
+    if (!jj_3R_615()) return false;
     jj_scanpos = xsp;
     if (jj_3R_616()) return true;
-    }
-    }
     return false;
   }
 
@@ -3573,13 +3526,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_752()) {
+    if (!jj_3R_752()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_753()) {
+    if (!jj_3R_753()) return false;
     jj_scanpos = xsp;
     if (jj_3R_754()) return true;
-    }
-    }
     return false;
   }
 
@@ -3758,43 +3709,31 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_740()) {
+    if (!jj_3R_740()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_741()) {
+    if (!jj_3R_741()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_742()) {
+    if (!jj_3R_742()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_743()) {
+    if (!jj_3R_743()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_744()) {
+    if (!jj_3R_744()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_745()) {
+    if (!jj_3R_745()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_746()) {
+    if (!jj_3R_746()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_747()) {
+    if (!jj_3R_747()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_748()) {
+    if (!jj_3R_748()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_749()) {
+    if (!jj_3R_749()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_750()) {
+    if (!jj_3R_750()) return false;
     jj_scanpos = xsp;
-    if (jj_3_113()) {
+    if (!jj_3_113()) return false;
     jj_scanpos = xsp;
     if (jj_3R_751()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -3989,55 +3928,39 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_617()) {
+    if (!jj_3R_617()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_618()) {
+    if (!jj_3R_618()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_619()) {
+    if (!jj_3R_619()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_620()) {
+    if (!jj_3R_620()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_621()) {
+    if (!jj_3R_621()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_622()) {
+    if (!jj_3R_622()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_623()) {
+    if (!jj_3R_623()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_624()) {
+    if (!jj_3R_624()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_625()) {
+    if (!jj_3R_625()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_626()) {
+    if (!jj_3R_626()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_627()) {
+    if (!jj_3R_627()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_628()) {
+    if (!jj_3R_628()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_629()) {
+    if (!jj_3R_629()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_630()) {
+    if (!jj_3R_630()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_631()) {
+    if (!jj_3R_631()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_632()) {
+    if (!jj_3R_632()) return false;
     jj_scanpos = xsp;
     if (jj_3R_633()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -4079,13 +4002,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_593()) {
+    if (!jj_3R_593()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_594()) {
+    if (!jj_3R_594()) return false;
     jj_scanpos = xsp;
     if (jj_3R_595()) return true;
-    }
-    }
     return false;
   }
 
@@ -4094,10 +4015,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_426()) {
+    if (!jj_3R_426()) return false;
     jj_scanpos = xsp;
     if (jj_3R_427()) return true;
-    }
     return false;
   }
 
@@ -4215,10 +4135,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_167()) {
+    if (!jj_3R_167()) return false;
     jj_scanpos = xsp;
     if (jj_3R_168()) return true;
-    }
     return false;
   }
 
@@ -4301,10 +4220,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_466()) {
+    if (!jj_3R_466()) return false;
     jj_scanpos = xsp;
     if (jj_3R_467()) return true;
-    }
     return false;
   }
 
@@ -4341,10 +4259,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_165()) {
+    if (!jj_3R_165()) return false;
     jj_scanpos = xsp;
     if (jj_3R_166()) return true;
-    }
     return false;
   }
 
@@ -4367,10 +4284,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_599()) {
+    if (!jj_3R_599()) return false;
     jj_scanpos = xsp;
     if (jj_3R_600()) return true;
-    }
     return false;
   }
 
@@ -4449,10 +4365,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_526()) {
+    if (!jj_3R_526()) return false;
     jj_scanpos = xsp;
     if (jj_3R_527()) return true;
-    }
     return false;
   }
 
@@ -4552,16 +4467,13 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_186()) {
+    if (!jj_3R_186()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_187()) {
+    if (!jj_3R_187()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_188()) {
+    if (!jj_3R_188()) return false;
     jj_scanpos = xsp;
     if (jj_3R_189()) return true;
-    }
-    }
-    }
     return false;
   }
 
@@ -4577,22 +4489,17 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_660()) {
+    if (!jj_3R_660()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_661()) {
+    if (!jj_3R_661()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_662()) {
+    if (!jj_3R_662()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_663()) {
+    if (!jj_3R_663()) return false;
     jj_scanpos = xsp;
-    if (jj_3_110()) {
+    if (!jj_3_110()) return false;
     jj_scanpos = xsp;
     if (jj_3R_664()) return true;
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -4608,10 +4515,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_287()) {
+    if (!jj_3R_287()) return false;
     jj_scanpos = xsp;
     if (jj_3R_288()) return true;
-    }
     return false;
   }
 
@@ -4648,10 +4554,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3_109()) {
+    if (!jj_3_109()) return false;
     jj_scanpos = xsp;
     if (jj_3R_485()) return true;
-    }
     return false;
   }
 
@@ -4736,10 +4641,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_257()) {
+    if (!jj_3R_257()) return false;
     jj_scanpos = xsp;
     if (jj_3R_258()) return true;
-    }
     return false;
   }
 
@@ -4807,16 +4711,13 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_227()) {
+    if (!jj_3R_227()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_228()) {
+    if (!jj_3R_228()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_229()) {
+    if (!jj_3R_229()) return false;
     jj_scanpos = xsp;
     if (jj_3R_230()) return true;
-    }
-    }
-    }
     return false;
   }
 
@@ -4839,10 +4740,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_597()) {
+    if (!jj_3R_597()) return false;
     jj_scanpos = xsp;
     if (jj_3R_598()) return true;
-    }
     return false;
   }
 
@@ -4981,10 +4881,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(84)) {
+    if (!jj_scan_token(84)) return false;
     jj_scanpos = xsp;
     if (jj_scan_token(52)) return true;
-    }
     return false;
   }
 
@@ -5067,10 +4966,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_459()) {
+    if (!jj_3R_459()) return false;
     jj_scanpos = xsp;
     if (jj_3R_460()) return true;
-    }
     return false;
   }
 
@@ -5122,10 +5020,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(46)) {
+    if (!jj_scan_token(46)) return false;
     jj_scanpos = xsp;
     if (jj_scan_token(80)) return true;
-    }
     return false;
   }
 
@@ -5295,31 +5192,23 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_585()) {
+    if (!jj_3R_585()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_586()) {
+    if (!jj_3R_586()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_587()) {
+    if (!jj_3R_587()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_588()) {
+    if (!jj_3R_588()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_589()) {
+    if (!jj_3R_589()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_590()) {
+    if (!jj_3R_590()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_591()) {
+    if (!jj_3R_591()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_592()) {
+    if (!jj_3R_592()) return false;
     jj_scanpos = xsp;
     if (jj_scan_token(189)) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -5398,43 +5287,31 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_696()) {
+    if (!jj_3R_696()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_697()) {
+    if (!jj_3R_697()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_698()) {
+    if (!jj_3R_698()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_699()) {
+    if (!jj_3R_699()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_700()) {
+    if (!jj_3R_700()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_701()) {
+    if (!jj_3R_701()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_702()) {
+    if (!jj_3R_702()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_703()) {
+    if (!jj_3R_703()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_704()) {
+    if (!jj_3R_704()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_705()) {
+    if (!jj_3R_705()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_706()) {
+    if (!jj_3R_706()) return false;
     jj_scanpos = xsp;
-    if (jj_3_102()) {
+    if (!jj_3_102()) return false;
     jj_scanpos = xsp;
     if (jj_3R_707()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -5470,10 +5347,9 @@ void parseInline();
     xsp = jj_scanpos;
     if (jj_scan_token(79)) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_177()) {
+    if (!jj_3R_177()) return false;
     jj_scanpos = xsp;
     if (jj_3R_178()) return true;
-    }
     return false;
   }
 
@@ -5489,10 +5365,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_461()) {
+    if (!jj_3R_461()) return false;
     jj_scanpos = xsp;
     if (jj_scan_token(137)) return true;
-    }
     return false;
   }
 
@@ -5579,10 +5454,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_210()) {
+    if (!jj_3R_210()) return false;
     jj_scanpos = xsp;
     if (jj_3R_211()) return true;
-    }
     return false;
   }
 
@@ -5613,10 +5487,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_710()) {
+    if (!jj_3R_710()) return false;
     jj_scanpos = xsp;
     if (jj_3R_711()) return true;
-    }
     return false;
   }
 
@@ -5935,13 +5808,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_634()) {
+    if (!jj_3R_634()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_635()) {
+    if (!jj_3R_635()) return false;
     jj_scanpos = xsp;
     if (jj_3R_636()) return true;
-    }
-    }
     return false;
   }
 
@@ -5971,10 +5842,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_608()) {
+    if (!jj_3R_608()) return false;
     jj_scanpos = xsp;
     if (jj_3R_609()) return true;
-    }
     return false;
   }
 
@@ -5990,19 +5860,15 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_355()) {
+    if (!jj_3R_355()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_356()) {
+    if (!jj_3R_356()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_357()) {
+    if (!jj_3R_357()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_358()) {
+    if (!jj_3R_358()) return false;
     jj_scanpos = xsp;
     if (jj_3R_359()) return true;
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -6139,13 +6005,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_463()) {
+    if (!jj_3R_463()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_464()) {
+    if (!jj_3R_464()) return false;
     jj_scanpos = xsp;
     if (jj_3R_465()) return true;
-    }
-    }
     return false;
   }
 
@@ -6208,10 +6072,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_421()) {
+    if (!jj_3R_421()) return false;
     jj_scanpos = xsp;
     if (jj_3R_422()) return true;
-    }
     return false;
   }
 
@@ -6280,22 +6143,17 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_573()) {
+    if (!jj_3R_573()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_574()) {
+    if (!jj_3R_574()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_575()) {
+    if (!jj_3R_575()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_576()) {
+    if (!jj_3R_576()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_577()) {
+    if (!jj_3R_577()) return false;
     jj_scanpos = xsp;
     if (jj_3R_578()) return true;
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -6636,43 +6494,31 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_254()) {
+    if (!jj_3R_254()) return false;
     jj_scanpos = xsp;
-    if (jj_3_85()) {
+    if (!jj_3_85()) return false;
     jj_scanpos = xsp;
-    if (jj_3_86()) {
+    if (!jj_3_86()) return false;
     jj_scanpos = xsp;
-    if (jj_3_87()) {
+    if (!jj_3_87()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_255()) {
+    if (!jj_3R_255()) return false;
     jj_scanpos = xsp;
-    if (jj_3_89()) {
+    if (!jj_3_89()) return false;
     jj_scanpos = xsp;
-    if (jj_3_90()) {
+    if (!jj_3_90()) return false;
     jj_scanpos = xsp;
-    if (jj_3_91()) {
+    if (!jj_3_91()) return false;
     jj_scanpos = xsp;
-    if (jj_3_92()) {
+    if (!jj_3_92()) return false;
     jj_scanpos = xsp;
-    if (jj_3_93()) {
+    if (!jj_3_93()) return false;
     jj_scanpos = xsp;
-    if (jj_3_94()) {
+    if (!jj_3_94()) return false;
     jj_scanpos = xsp;
-    if (jj_3_95()) {
+    if (!jj_3_95()) return false;
     jj_scanpos = xsp;
     if (jj_3R_256()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -6738,52 +6584,37 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_299()) {
+    if (!jj_3R_299()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_300()) {
+    if (!jj_3R_300()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_301()) {
+    if (!jj_3R_301()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_302()) {
+    if (!jj_3R_302()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_303()) {
+    if (!jj_3R_303()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_304()) {
+    if (!jj_3R_304()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_305()) {
+    if (!jj_3R_305()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_306()) {
+    if (!jj_3R_306()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_307()) {
+    if (!jj_3R_307()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_308()) {
+    if (!jj_3R_308()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_309()) {
+    if (!jj_3R_309()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_310()) {
+    if (!jj_3R_310()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_311()) {
+    if (!jj_3R_311()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_312()) {
+    if (!jj_3R_312()) return false;
     jj_scanpos = xsp;
-    if (jj_3_8()) {
+    if (!jj_3_8()) return false;
     jj_scanpos = xsp;
     if (jj_3R_313()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -7000,10 +6831,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_708()) {
+    if (!jj_3R_708()) return false;
     jj_scanpos = xsp;
     if (jj_3R_709()) return true;
-    }
     return false;
   }
 
@@ -7072,10 +6902,9 @@ void parseInline();
     if (jj_scan_token(APOSTROPHE_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(85)) {
+    if (!jj_scan_token(85)) return false;
     jj_scanpos = xsp;
     if (jj_3R_251()) return true;
-    }
     xsp = jj_scanpos;
     if (jj_3R_252()) jj_scanpos = xsp;
     return false;
@@ -7123,10 +6952,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_376()) {
+    if (!jj_3R_376()) return false;
     jj_scanpos = xsp;
     if (jj_3R_377()) return true;
-    }
     return false;
   }
 
@@ -7253,40 +7081,29 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_504()) {
+    if (!jj_3R_504()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_505()) {
+    if (!jj_3R_505()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_506()) {
+    if (!jj_3R_506()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_507()) {
+    if (!jj_3R_507()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_508()) {
+    if (!jj_3R_508()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_509()) {
+    if (!jj_3R_509()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_510()) {
+    if (!jj_3R_510()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_511()) {
+    if (!jj_3R_511()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_512()) {
+    if (!jj_3R_512()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_513()) {
+    if (!jj_3R_513()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_514()) {
+    if (!jj_3R_514()) return false;
     jj_scanpos = xsp;
     if (jj_3R_515()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -7454,10 +7271,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_192()) {
+    if (!jj_3R_192()) return false;
     jj_scanpos = xsp;
     if (jj_3R_193()) return true;
-    }
     return false;
   }
 
@@ -7496,10 +7312,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_729()) {
+    if (!jj_3R_729()) return false;
     jj_scanpos = xsp;
     if (jj_3R_730()) return true;
-    }
     return false;
   }
 
@@ -7510,10 +7325,9 @@ void parseInline();
     if (jj_scan_token(APOSTROPHE_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_239()) {
+    if (!jj_3R_239()) return false;
     jj_scanpos = xsp;
     if (jj_3R_240()) return true;
-    }
     return false;
   }
 
@@ -7578,10 +7392,9 @@ void parseInline();
     if (jj_scan_token(LPAREN_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(15)) {
+    if (!jj_scan_token(15)) return false;
     jj_scanpos = xsp;
     if (jj_3R_362()) return true;
-    }
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
@@ -7591,10 +7404,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3_4()) {
+    if (!jj_3_4()) return false;
     jj_scanpos = xsp;
     if (jj_3R_246()) return true;
-    }
     return false;
   }
 
@@ -7640,13 +7452,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_561()) {
+    if (!jj_3R_561()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_562()) {
+    if (!jj_3R_562()) return false;
     jj_scanpos = xsp;
     if (jj_3R_563()) return true;
-    }
-    }
     return false;
   }
 
@@ -7836,13 +7646,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_283()) {
+    if (!jj_3R_283()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_284()) {
+    if (!jj_3R_284()) return false;
     jj_scanpos = xsp;
     if (jj_3R_285()) return true;
-    }
-    }
     return false;
   }
 
@@ -7865,40 +7673,29 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_537()) {
+    if (!jj_3R_537()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_538()) {
+    if (!jj_3R_538()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_539()) {
+    if (!jj_3R_539()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_540()) {
+    if (!jj_3R_540()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_541()) {
+    if (!jj_3R_541()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_542()) {
+    if (!jj_3R_542()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_543()) {
+    if (!jj_3R_543()) return false;
     jj_scanpos = xsp;
-    if (jj_3_77()) {
+    if (!jj_3_77()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_544()) {
+    if (!jj_3R_544()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_545()) {
+    if (!jj_3R_545()) return false;
     jj_scanpos = xsp;
-    if (jj_3_78()) {
+    if (!jj_3_78()) return false;
     jj_scanpos = xsp;
     if (jj_3R_546()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -7966,13 +7763,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_523()) {
+    if (!jj_3R_523()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_524()) {
+    if (!jj_3R_524()) return false;
     jj_scanpos = xsp;
     if (jj_3R_525()) return true;
-    }
-    }
     return false;
   }
 
@@ -8068,22 +7863,17 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_212()) {
+    if (!jj_3R_212()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_213()) {
+    if (!jj_3R_213()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_214()) {
+    if (!jj_3R_214()) return false;
     jj_scanpos = xsp;
-    if (jj_3_75()) {
+    if (!jj_3_75()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_215()) {
+    if (!jj_3R_215()) return false;
     jj_scanpos = xsp;
     if (jj_3R_216()) return true;
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -8113,13 +7903,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_153()) {
+    if (!jj_3R_153()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_154()) {
+    if (!jj_3R_154()) return false;
     jj_scanpos = xsp;
     if (jj_3R_155()) return true;
-    }
-    }
     return false;
   }
 
@@ -8208,13 +7996,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_235()) {
+    if (!jj_3R_235()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_236()) {
+    if (!jj_3R_236()) return false;
     jj_scanpos = xsp;
     if (jj_3R_237()) return true;
-    }
-    }
     return false;
   }
 
@@ -8267,28 +8053,21 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_477()) {
+    if (!jj_3R_477()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_478()) {
+    if (!jj_3R_478()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_479()) {
+    if (!jj_3R_479()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_480()) {
+    if (!jj_3R_480()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_481()) {
+    if (!jj_3R_481()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_482()) {
+    if (!jj_3R_482()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_483()) {
+    if (!jj_3R_483()) return false;
     jj_scanpos = xsp;
     if (jj_3R_484()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -8509,22 +8288,17 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_670()) {
+    if (!jj_3R_670()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_671()) {
+    if (!jj_3R_671()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_672()) {
+    if (!jj_3R_672()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_673()) {
+    if (!jj_3R_673()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_674()) {
+    if (!jj_3R_674()) return false;
     jj_scanpos = xsp;
     if (jj_3R_675()) return true;
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -8555,10 +8329,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_217()) {
+    if (!jj_3R_217()) return false;
     jj_scanpos = xsp;
     if (jj_3R_218()) return true;
-    }
     return false;
   }
 
@@ -8809,19 +8582,15 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_222()) {
+    if (!jj_3R_222()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_223()) {
+    if (!jj_3R_223()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_224()) {
+    if (!jj_3R_224()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_225()) {
+    if (!jj_3R_225()) return false;
     jj_scanpos = xsp;
     if (jj_3R_226()) return true;
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -8872,13 +8641,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_156()) {
+    if (!jj_3R_156()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_157()) {
+    if (!jj_3R_157()) return false;
     jj_scanpos = xsp;
     if (jj_3R_158()) return true;
-    }
-    }
     return false;
   }
 
@@ -8908,16 +8675,13 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_289()) {
+    if (!jj_3R_289()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_290()) {
+    if (!jj_3R_290()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_291()) {
+    if (!jj_3R_291()) return false;
     jj_scanpos = xsp;
     if (jj_3R_292()) return true;
-    }
-    }
-    }
     return false;
   }
 
@@ -8968,19 +8732,15 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_454()) {
+    if (!jj_3R_454()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_455()) {
+    if (!jj_3R_455()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_456()) {
+    if (!jj_3R_456()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_457()) {
+    if (!jj_3R_457()) return false;
     jj_scanpos = xsp;
     if (jj_3R_458()) return true;
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -9078,19 +8838,15 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_241()) {
+    if (!jj_3R_241()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_242()) {
+    if (!jj_3R_242()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_243()) {
+    if (!jj_3R_243()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_244()) {
+    if (!jj_3R_244()) return false;
     jj_scanpos = xsp;
     if (jj_3R_245()) return true;
-    }
-    }
-    }
-    }
     return false;
   }