Changeset de62360d for src/Parser/lex.ll

Timestamp:

Jun 24, 2015, 4:04:19 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, string, with_gc

Children:

94e0864d

Parents:

a1d5d2a

Message:

fix computed goto, fixed -std=, implicit typedefs for enum and aggregates, add _Noreturn _Thread_local

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 : Thu Jun 11 21:52:35 2015
- * Update Count     : 382
+ * Last Modified On : Fri Jun 19 11:10:14 2015
+ * Update Count     : 392
  */
 
@@ -18 +18 @@
 
 %{
-// This lexer assumes the program has been preprocessed by cpp. Hence, all user level preprocessor directive
-// have been performed and removed from the source. The only exceptions are preprocessor directives passed to
-// the compiler (e.g., line-number directives) and C/C++ style comments, which are ignored.
+// This lexer assumes the program has been preprocessed by cpp. Hence, all user level preprocessor directive have been
+// performed and removed from the source. The only exceptions are preprocessor directives passed to the compiler (e.g.,
+// line-number directives) and C/C++ style comments, which are ignored.
 
 //**************************** Includes and Defines ****************************
@@ -33 +33 @@
 std::string *strtext;                                                                   // accumulate parts of character and string constant value
 
-#define RETURN_LOCN(x)          yylval.tok.loc.file = yyfilename; yylval.tok.loc.line = yylineno; return(x)
-#define RETURN_VAL(x)           yylval.tok.str = new std::string( yytext ); RETURN_LOCN(x)
-#define RETURN_CHAR(x)          yylval.tok.str = NULL; RETURN_LOCN(x)
-#define RETURN_STR(x)           yylval.tok.str = strtext; RETURN_LOCN(x)
+#define RETURN_LOCN(x)          yylval.tok.loc.file = yyfilename; yylval.tok.loc.line = yylineno; return( x )
+#define RETURN_VAL(x)           yylval.tok.str = new std::string( yytext ); RETURN_LOCN( x )
+#define RETURN_CHAR(x)          yylval.tok.str = NULL; RETURN_LOCN( x )
+#define RETURN_STR(x)           yylval.tok.str = strtext; RETURN_LOCN( x )
 
 #define WHITE_RETURN(x)                                                                 // do nothing
-#define NEWLINE_RETURN()        WHITE_RETURN('\n')
-#define ASCIIOP_RETURN()        RETURN_CHAR((int)yytext[0])     // single character operator
-#define NAMEDOP_RETURN(x)       RETURN_VAL(x)                           // multichar operator, with a name
-#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 ATTRIBUTE_RETURN()      RETURN_VAL(ATTR_IDENTIFIER)
+#define NEWLINE_RETURN()        WHITE_RETURN( '\n' )
+#define ASCIIOP_RETURN()        RETURN_CHAR( (int)yytext[0] ) // single character operator
+#define NAMEDOP_RETURN(x)       RETURN_VAL( x )                         // multichar operator, with a name
+#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 ATTRIBUTE_RETURN()      RETURN_VAL( ATTR_IDENTIFIER )
 
 void rm_underscore() {
@@ -398 +398 @@
 
 // Local Variables: //
-// fill-column: 110 //
+// mode: c++ //
 // tab-width: 4 //
-// mode: c++ //
 // compile-command: "make install" //
 // End: //