Changes in src/Parser/lex.ll [984dce6:4040425]

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 Mar 21 23:33:46 2016
- * Update Count     : 450
+ * Last Modified On : Wed Mar  2 18:07:20 2016
+ * Update Count     : 434
  */
 
@@ -27 +27 @@
 
 #include "lex.h"
+#include "ParseNode.h"
 #include "parser.h"                                                                             // YACC generated definitions based on C++ grammar
-#include "ParseNode.h"
-#include "TypedefTable.h"
 
 char *yyfilename;
@@ -45 +44 @@
 #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.isKind( yytext ) )
+#define IDENTIFIER_RETURN()     RETURN_VAL( (typedefTable.isIdentifier( yytext ) ? IDENTIFIER : typedefTable.isTypedef( yytext ) ? TYPEDEFname : TYPEGENname ) )
 #define ATTRIBUTE_RETURN()      RETURN_VAL( ATTR_IDENTIFIER )
 
@@ -96 +95 @@
 fractional_constant ({decimal_digits}?"."{decimal_digits})|({decimal_digits}".")
 exponent "_"?[eE]"_"?[+-]?{decimal_digits}
-                                // 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]))
+                                // GCC: D (double), LD (long double) and iI (imaginary) suffixes
+floating_suffix "_"?([fFdD]?|([lL]?)|([iI][lLfFdD]?)|([lLfFdD][iI]))
 floating_constant (({fractional_constant}{exponent}?)|({decimal_digits}{exponent})){floating_suffix}?