Changeset 5f2f2d7 for src/Parser/lex.ll

Timestamp:

Jun 8, 2015, 8:56:35 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:

81419b5

Parents:

cd623a4

Message:

fix constant types, remove unnecessary string copying, work on regression testing, fix several memory leaks

File:

• src/Parser/lex.ll (modified) (2 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 : Sun Jun  7 07:14:16 2015
- * Update Count     : 374
+ * Last Modified On : Mon Jun  8 20:24:15 2015
+ * Update Count     : 381
  */
 
 %option yylineno
+%option nounput
 
 %{
@@ -32 +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 WHITE_RETURN(x)                                                                 // do nothing
 #define NEWLINE_RETURN()        WHITE_RETURN('\n')
-#define RETURN_VAL(x)           yylval.tok.str = new std::string( yytext ); \
-                                        yylval.tok.loc.file = yyfilename; \
-                                        yylval.tok.loc.line = yylineno; \
-                                        return(x)
-#define RETURN_STR(x)           yylval.tok.str = strtext; \
-                                        yylval.tok.loc.file = yyfilename; \
-                                        yylval.tok.loc.line = yylineno; \
-                                        return(x)
-
-#define KEYWORD_RETURN(x)       RETURN_VAL(x)                           // keyword
+#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((typedefTable.isIdentifier(yytext) ? ATTR_IDENTIFIER : typedefTable.isTypedef(yytext) ? ATTR_TYPEDEFname : ATTR_TYPEGENname))
 #define ATTRIBUTE_RETURN()      RETURN_VAL(ATTR_IDENTIFIER)
-
-#define ASCIIOP_RETURN()        RETURN_VAL((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
 
 void rm_underscore() {