Changeset 24d6572 for src/Parser/lex.ll

Timestamp:

Jun 12, 2023, 2:45:32 PM (2 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ast-experimental, master

Children:

62d62db

Parents:

34b4268 (diff), 251ce80 (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' into ast-experimental

File:

• src/Parser/lex.ll (modified) (7 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 : Tue May  2 08:45:21 2023
+ * Update Count     : 769
  */
 
@@ -23 +23 @@
 // line-number directives) and C/C++ style comments, which are ignored.
 
-//**************************** Includes and Defines ****************************
+// *************************** Includes and Defines ****************************
 
 #ifdef __clang__
@@ -44 +44 @@
 
 #include "config.h"                                                                             // configure info
+#include "DeclarationNode.h"                            // for DeclarationNode
+#include "ExpressionNode.h"                             // for LabelNode
+#include "InitializerNode.h"                            // for InitializerNode
 #include "ParseNode.h"
+#include "ParserTypes.h"                                // for Token
+#include "StatementNode.h"                              // for CondCtl, ForCtrl
 #include "TypedefTable.h"
+// This (generated) header must come late as it is missing includes.
+#include "parser.hh"                                    // generated info
 
 string * build_postfix_name( string * name );
@@ -214 +221 @@
 __alignof               { KEYWORD_RETURN(ALIGNOF); }                    // GCC
 __alignof__             { KEYWORD_RETURN(ALIGNOF); }                    // GCC
+and                             { QKEYWORD_RETURN(WAND); }                              // CFA
 asm                             { KEYWORD_RETURN(ASM); }
 __asm                   { KEYWORD_RETURN(ASM); }                                // GCC
@@ -250 +258 @@
 enable                  { KEYWORD_RETURN(ENABLE); }                             // CFA
 enum                    { KEYWORD_RETURN(ENUM); }
+exception               { KEYWORD_RETURN(EXCEPTION); }                  // CFA
 __extension__   { KEYWORD_RETURN(EXTENSION); }                  // GCC
-exception               { KEYWORD_RETURN(EXCEPTION); }                  // CFA
 extern                  { KEYWORD_RETURN(EXTERN); }
 fallthrough             { KEYWORD_RETURN(FALLTHROUGH); }                // CFA
@@ -340 +348 @@
 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 +511 @@
         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;
 }