Changeset b110bcc for src/Parser/lex.ll

Timestamp:

Apr 21, 2023, 5:36:12 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, master

Children:

28f8f15, 6e4c44d

Parents:

2ed94a9 (diff), 699a97d (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) (4 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 : Mon Jan 30 19:03:34 2023
- * Update Count     : 767
+ * Last Modified On : Sat Mar 25 08:09:03 2023
+ * Update Count     : 768
  */
 
@@ -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