Clearer traces.

Signed-off-by: mmazas <[email protected]>

Author: mmazas

issues/bas01/files/clc1.exp_err

@@ -12,7 +12,7 @@ Read 1st char for any kind: `97 / 'a'´, @ 1:1 (tm)
     Cur char: `9 / '\t'´ (tm)
     Looking to move from state: <,>-2, for token: <10 / <Id>> (tm)
     Done with NFA, at pos: 2 (tm)
-Returning token: "aa" (tm)
+Found a MATCH ***; returning token: "aa" (tm)
 Read 1st char for any kind: `9 / '\t'´, @ 1:3 (tm)
 <DEFAULT>-0 Current input char: `9 / '\t'´, @ 1:3 (tm)
   Looking for string literal match of token: <2 / "\t"> (tm)
@@ -238,7 +238,7 @@ Read 1st char for any kind: `116 / 't'´, @ 2:1 (tm)
     Cur char: `32 / ' '´ (tm)
     Looking to move from state: <,>-2, for token: <10 / <Id>> (tm)
     Done with NFA, at pos: 3 (tm)
-Returning token: "ten" (tm)
+Found a MATCH ***; returning token: "ten" (tm)
 Read 1st char for any kind: `32 / ' '´, @ 2:4 (tm)
 <DEFAULT>-0 Current input char: `32 / ' '´, @ 2:4 (tm)
   Looking for string literal match of token: <1 / " "> (tm)
@@ -266,7 +266,7 @@ Read 1st char for any kind: `73 / 'I'´, @ 2:5 (tm)
     Cur char: `32 / ' '´ (tm)
     Looking to move from state: <,>-2, for token: <10 / <Id>> (tm)
     Done with NFA, at pos: 4 (tm)
-Returning token: "Int1" (tm)
+Found a MATCH ***; returning token: "Int1" (tm)
 Read 1st char for any kind: `32 / ' '´, @ 2:9 (tm)
 <DEFAULT>-0 Current input char: `32 / ' '´, @ 2:9 (tm)
   Looking for string literal match of token: <1 / " "> (tm)
@@ -309,7 +309,7 @@ Read 1st char for any kind: `111 / 'o'´, @ 2:10 (tm)
     Cur char: `13 / '\r'´ (tm)
     Looking to move from state: <,>-2, for token: <10 / <Id>> (tm)
     Done with NFA, at pos: 9 (tm)
-Returning token: "other-ten" (tm)
+Found a MATCH ***; returning token: "other-ten" (tm)
 Read 1st char for any kind: `13 / '\r'´, @ 2:19 (tm)
 <DEFAULT>-0 Current input char: `13 / '\r'´, @ 2:19 (tm)
   Looking for string literal match of token: <4 / "\r"> (tm)
@@ -359,7 +359,7 @@ Read 1st char for any kind: `111 / 'o'´, @ 3:1 (tm)
     Cur char: `32 / ' '´ (tm)
     Looking to move from state: <,>-2, for token: <10 / <Id>> (tm)
     Done with NFA, at pos: 9 (tm)
-Returning token: "other-ten" (tm)
+Found a MATCH ***; returning token: "other-ten" (tm)
 Read 1st char for any kind: `32 / ' '´, @ 3:10 (tm)
 <DEFAULT>-0 Current input char: `32 / ' '´, @ 3:10 (tm)
   Looking for string literal match of token: <1 / " "> (tm)
@@ -387,7 +387,7 @@ Read 1st char for any kind: `73 / 'I'´, @ 3:11 (tm)
     Cur char: `13 / '\r'´ (tm)
     Looking to move from state: <,>-2, for token: <10 / <Id>> (tm)
     Done with NFA, at pos: 4 (tm)
-Returning token: "Int2" (tm)
+Found a MATCH ***; returning token: "Int2" (tm)
 Read 1st char for any kind: `13 / '\r'´, @ 3:15 (tm)
 <DEFAULT>-0 Current input char: `13 / '\r'´, @ 3:15 (tm)
   Looking for string literal match of token: <4 / "\r"> (tm)

issues/bas01/files/clc2.exp_err

@@ -12,7 +12,7 @@ Read 1st char for any kind: `97 / 'a'´, @ 1:1 (tm)
     Cur char: `32 / ' '´ (tm)
     Looking to move from state: <,>-2, for token: <10 / <Id>> (tm)
     Done with NFA, at pos: 2 (tm)
-Returning token: "aa" (tm)
+Found a MATCH ***; returning token: "aa" (tm)
 Read 1st char for any kind: `32 / ' '´, @ 1:3 (tm)
 <DEFAULT>-0 Current input char: `32 / ' '´, @ 1:3 (tm)
   Looking for string literal match of token: <1 / " "> (tm)
@@ -96,7 +96,7 @@ Read 1st char for any kind: `98 / 'b'´, @ 1:14 (tm)
     Cur char: `13 / '\r'´ (tm)
     Looking to move from state: <,>-2, for token: <10 / <Id>> (tm)
     Done with NFA, at pos: 2 (tm)
-Returning token: "bb" (tm)
+Found a MATCH ***; returning token: "bb" (tm)
 Read 1st char for any kind: `13 / '\r'´, @ 1:16 (tm)
 <DEFAULT>-0 Current input char: `13 / '\r'´, @ 1:16 (tm)
   Looking for string literal match of token: <4 / "\r"> (tm)
@@ -125,7 +125,7 @@ Read 1st char for any kind: `52 / '4'´, @ 2:1 (tm)
     Cur char: `13 / '\r'´ (tm)
     Looking to move from state: <DEFAULT>-0, for token: <7 / <INTEGER>> (tm)
     Done with NFA, at pos: 2 (tm)
-Returning token: "45" (tm)
+Found a MATCH ***; returning token: "45" (tm)
 ParseException parsing input file
 Encountered: <INTEGER> / "45", at line 2, column 1.
 Was expecting one of these terminals within expansion starting at 147:3:

issues/bas01/files/clc3.exp_err

@@ -12,7 +12,7 @@ Read 1st char for any kind: `97 / 'a'´, @ 1:1 (tm)
     Cur char: `32 / ' '´ (tm)
     Looking to move from state: <,>-2, for token: <10 / <Id>> (tm)
     Done with NFA, at pos: 2 (tm)
-Returning token: "aa" (tm)
+Found a MATCH ***; returning token: "aa" (tm)
 Read 1st char for any kind: `32 / ' '´, @ 1:3 (tm)
 <DEFAULT>-0 Current input char: `32 / ' '´, @ 1:3 (tm)
   Looking for string literal match of token: <1 / " "> (tm)
@@ -96,7 +96,7 @@ Read 1st char for any kind: `98 / 'b'´, @ 1:14 (tm)
     Cur char: `13 / '\r'´ (tm)
     Looking to move from state: <,>-2, for token: <10 / <Id>> (tm)
     Done with NFA, at pos: 2 (tm)
-Returning token: "bb" (tm)
+Found a MATCH ***; returning token: "bb" (tm)
 Read 1st char for any kind: `13 / '\r'´, @ 1:16 (tm)
 <DEFAULT>-0 Current input char: `13 / '\r'´, @ 1:16 (tm)
   Looking for string literal match of token: <4 / "\r"> (tm)

it/pom.xml

@@ -123,7 +123,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
             <library>
               <type>executable</type>
               <!-- just compile, link and package, do not run anything by default; runs will be
-                     through the maven-exec-plugin or this nar plugin (with overriden setting) -->
+                     through the exec-maven-plugin or this nar plugin (with overriden setting) -->
               <run>false</run>
             </library>
           </libraries>

src/main/resources/templates/cpp/TokenManagerDriver.cc.template

@@ -213,7 +213,7 @@ Token * ${parserName}TokenManager::getNextToken() {
 #fi
 #if DEBUG_TOKEN_MANAGER
           if (trace_enabled()) {
-            JJERR << JJWIDE(Returning token:) << JJSPACE
+            JJERR << JJWIDE(Found a MATCH ***; returning token:) << JJSPACE
                   << JJDBQUOTE << addUnicodeEscapes(matchedToken->image()) << JJDBQUOTE
                   << JJSPACE << JJWIDE((tm)) << std::endl;
           }
@@ -479,16 +479,16 @@ int ${parserName}TokenManager::jjMoveNfa(int startState, int curPos) {
     moveIndex = 1;
   }
 
-  // We initialize the kind to MAX value so that when a match is found, we can
-  // simply check if it's less than the current match and store it in that
-  // case. This helps implement the 'first occurring' rule properly.
+    // We initialize the kind to MAX value so that when a match is found, we can
+    // simply check if it's less than the current match and store it in that case.
+    // This helps implement the 'first occurring' rule properly.
   int cnt = 0;
   stateSet[cnt++] = startState;
   moved[startState] = moveIndex;
 
-  // Some NFA states have epsilon transitions (move on empty string). So we
-  // just start with all of them. Note that the nextStates array already adds
-  // the epsilon closure. Only the initial state needs to do this explicitly.
+    // Some NFA states have epsilon transitions (move on empty string).
+    // So we just start with all of them. Note that the nextStates array already adds
+    // the epsilon closure. Only the initial state needs to do this explicitly.
   for (int s : jjcompositeState[startState]) { 
     if (moved[s] != moveIndex) {
       stateSet[cnt++] = s;