Changeset c1c1112 for src/Parser/lex.ll

Timestamp:

Aug 25, 2016, 9:14:06 PM (8 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, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

4e2b9710

Parents:

2acf5fc

Message:

fix segment fault when printing syntax error, more refactoring of parser code

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 Aug 18 22:17:30 2016
- * Update Count     : 472
+ * Last Modified On : Wed Aug 24 13:27:04 2016
+ * Update Count     : 487
  */
 
@@ -141 +141 @@
 ^{h_white}*"#"{h_white}*[0-9]+{h_white}*["][^"\n]+["].*"\n" {
         /* " stop highlighting */
-        static char *filename[FILENAME_MAX];                            // temporarily store current source-file name
+        static char filename[FILENAME_MAX];                                     // temporarily store current source-file name
         char *end_num;
         char *begin_string, *end_string;
@@ -156 +156 @@
                 //std::cout << "file " << filename << " line " << lineno << std::endl;
                 yylineno = lineno;
-                yyfilename = filename[0];
+                yyfilename = filename;
         } // if
 }
@@ -288 +288 @@
 
                                 /* character constant, allows empty value */
-({cwide_prefix}[_]?)?['] { BEGIN QUOTE; rm_underscore(); strtext = new std::string; *strtext += std::string( yytext ); }
-<QUOTE>[^'\\\n]* { *strtext += std::string( yytext ); }
-<QUOTE>['\n]    { BEGIN 0; *strtext += std::string( yytext); RETURN_STR(CHARACTERconstant); }
+({cwide_prefix}[_]?)?['] { BEGIN QUOTE; rm_underscore(); strtext = new std::string( yytext, yyleng ); }
+<QUOTE>[^'\\\n]* { strtext->append( yytext, yyleng ); }
+<QUOTE>['\n]    { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(CHARACTERconstant); }
                                 /* ' stop highlighting */
 
                                 /* string constant */
-({swide_prefix}[_]?)?["] { BEGIN STRING; rm_underscore(); strtext = new std::string; *strtext += std::string( yytext ); }
-<STRING>[^"\\\n]* { *strtext += std::string( yytext ); }
-<STRING>["\n]   { BEGIN 0; *strtext += std::string( yytext ); RETURN_STR(STRINGliteral); }
+({swide_prefix}[_]?)?["] { BEGIN STRING; rm_underscore(); strtext = new std::string( yytext, yyleng ); }
+<STRING>[^"\\\n]* { strtext->append( yytext, yyleng ); }
+<STRING>["\n]   { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(STRINGliteral); }
                                 /* " stop highlighting */
 
                                 /* common character/string constant */
-<QUOTE,STRING>{escape_seq} { rm_underscore(); *strtext += std::string( yytext ); }
+<QUOTE,STRING>{escape_seq} { rm_underscore(); strtext->append( yytext, yyleng ); }
 <QUOTE,STRING>"\\"{h_white}*"\n" {}                                             // continuation (ALSO HANDLED BY CPP)
-<QUOTE,STRING>"\\" { *strtext += std::string( yytext ); } // unknown escape character
+<QUOTE,STRING>"\\" { strtext->append( yytext, yyleng ); } // unknown escape character
 
                                 /* punctuation */