Changeset 2ed94a9 for src/Parser/lex.ll

Timestamp:

Feb 8, 2023, 2:27:55 PM (22 months ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, master

Children:

b110bcc

Parents:

997185e (diff), ccb29b4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Parser/lex.ll (modified) (3 diffs)

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Thu Oct 13 20:46:04 2022
- * Update Count     : 764
+ * Last Modified On : Mon Jan 30 19:03:34 2023
+ * Update Count     : 767
  */
 
@@ -340 +340 @@
 vtable                  { KEYWORD_RETURN(VTABLE); }                             // CFA
 waitfor                 { KEYWORD_RETURN(WAITFOR); }                    // CFA
+waituntil               { KEYWORD_RETURN(WAITUNTIL); }                  // CFA
 when                    { KEYWORD_RETURN(WHEN); }                               // CFA
 while                   { KEYWORD_RETURN(WHILE); }
@@ -502 +503 @@
         SemanticErrorThrow = true;
         cerr << (yyfilename ? yyfilename : "*unknown file*") << ':' << yylineno << ':' << column - yyleng + 1
-                 << ": " << ErrorHelpers::error_str() << errmsg << " at token \"" << (yytext[0] == '\0' ? "EOF" : yytext) << '"' << endl;
+                 << ": " << ErrorHelpers::error_str() << errmsg << " before token \"" << (yytext[0] == '\0' ? "EOF" : yytext) << '"' << endl;
 }