Changeset a5a71d0 for src/Parser/lex.ll

Timestamp:

Apr 6, 2016, 5:11:32 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

eab39cd

Parents:

39786813 (diff), 3aba311 (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 'fix-memory-error' into ctor

Conflicts:

src/CodeGen/CodeGenerator.cc
src/Makefile.in
src/Parser/DeclarationNode.cc
src/Parser/ParseNode.h
src/Parser/TypeData.cc
src/Parser/parser.cc
src/Parser/parser.yy
src/ResolvExpr/Resolver.cc
src/SymTab/Validate.cc
src/SynTree/Declaration.h
src/SynTree/Mutator.cc
src/SynTree/Mutator.h
src/SynTree/SynTree.h
src/SynTree/Visitor.cc
src/SynTree/Visitor.h
src/libcfa/prelude.cf

File:

• src/Parser/lex.ll (modified) (9 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 : Tue Feb  2 15:06:54 2016
- * Update Count     : 426
+ * Last Modified On : Mon Mar 21 23:33:46 2016
+ * Update Count     : 450
  */
 
@@ -27 +27 @@
 
 #include "lex.h"
+#include "parser.h"                                                                             // YACC generated definitions based on C++ grammar
 #include "ParseNode.h"
-#include "parser.h"                                                                             // YACC generated definitions based on C++ grammar
+#include "TypedefTable.h"
 
 char *yyfilename;
@@ -44 +45 @@
 #define NUMERIC_RETURN(x)       rm_underscore(); RETURN_VAL( x ) // numeric constant
 #define KEYWORD_RETURN(x)       RETURN_CHAR( x )                        // keyword
-#define IDENTIFIER_RETURN()     RETURN_VAL( (typedefTable.isIdentifier( yytext ) ? IDENTIFIER : typedefTable.isTypedef( yytext ) ? TYPEDEFname : TYPEGENname ) )
+#define IDENTIFIER_RETURN()     RETURN_VAL( typedefTable.isKind( yytext ) )
 #define ATTRIBUTE_RETURN()      RETURN_VAL( ATTR_IDENTIFIER )
 
@@ -95 +96 @@
 fractional_constant ({decimal_digits}?"."{decimal_digits})|({decimal_digits}".")
 exponent "_"?[eE]"_"?[+-]?{decimal_digits}
-                                // GCC: D (double), LD (long double) and iI (imaginary) suffixes
-floating_suffix "_"?([fFdD]?|([lL]?)|([iI][lLfFdD]?)|([lLfFdD][iI]))
+                                // GCC: D (double), DL (long double) and iI (imaginary) suffixes
+floating_suffix "_"?([fFdDlL][iI]?|"DL"|[iI][lLfFdD]?)
+                                //floating_suffix "_"?([fFdD]|[lL]|[D][L])|([iI][lLfFdD])|([lLfFdD][iI]))
 floating_constant (({fractional_constant}{exponent}?)|({decimal_digits}{exponent})){floating_suffix}?
 
@@ -137 +139 @@
 %%
                                    /* line directives */
-^{h_white}*"#"{h_white}*[0-9]+{h_white}*["][^"\n]+["][^\n]*"\n" {
+^{h_white}*"#"{h_white}*[0-9]+{h_white}*["][^"\n]+["].*"\n" {
         /* " stop highlighting */
         char *end_num;
@@ -201 +203 @@
 __const                 { KEYWORD_RETURN(CONST); }                              // GCC
 __const__               { KEYWORD_RETURN(CONST); }                              // GCC
-context                 { KEYWORD_RETURN(CONTEXT); }                    // CFA
 continue                { KEYWORD_RETURN(CONTINUE); }
 default                 { KEYWORD_RETURN(DEFAULT); }
@@ -237 +238 @@
 _Noreturn               { KEYWORD_RETURN(NORETURN); }                   // C11
 __builtin_offsetof { KEYWORD_RETURN(OFFSETOF); }                // GCC
+otype                   { KEYWORD_RETURN(OTYPE); }                              // CFA
 register                { KEYWORD_RETURN(REGISTER); }
 restrict                { KEYWORD_RETURN(RESTRICT); }                   // C99
@@ -254 +256 @@
 throw                   { KEYWORD_RETURN(THROW); }                              // CFA
 throwResume             { KEYWORD_RETURN(THROWRESUME); }                // CFA
+trait                   { KEYWORD_RETURN(TRAIT); }                              // CFA
 try                             { KEYWORD_RETURN(TRY); }                                // CFA
-type                    { KEYWORD_RETURN(TYPE); }                               // CFA
 typedef                 { KEYWORD_RETURN(TYPEDEF); }
 typeof                  { KEYWORD_RETURN(TYPEOF); }                             // GCC
@@ -262 +264 @@
 union                   { KEYWORD_RETURN(UNION); }
 unsigned                { KEYWORD_RETURN(UNSIGNED); }
+__builtin_va_list { KEYWORD_RETURN(VALIST); }                   // GCC
 void                    { KEYWORD_RETURN(VOID); }
 volatile                { KEYWORD_RETURN(VOLATILE); }