Changeset c1c1112 for src/Parser/lex.cc

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.cc (modified) (9 diffs)

src/Parser/lex.cc

@@ -1469 +1469 @@
  * 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
  */
 #line 20 "lex.ll"
@@ -1827 +1827 @@
 {
         /* " 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;
@@ -1842 +1842 @@
                 //std::cout << "file " << filename << " line " << lineno << std::endl;
                 yylineno = lineno;
-                yyfilename = filename[0];
+                yyfilename = filename;
         } // if
 }
@@ -2426 +2426 @@
 YY_RULE_SETUP
 #line 290 "lex.ll"
-{ BEGIN QUOTE; rm_underscore(); strtext = new std::string; *strtext += std::string( yytext ); }
+{ BEGIN QUOTE; rm_underscore(); strtext = new std::string( yytext, yyleng ); }
         YY_BREAK
 case 116:
 YY_RULE_SETUP
 #line 291 "lex.ll"
-{ *strtext += std::string( yytext ); }
+{ strtext->append( yytext, yyleng ); }
         YY_BREAK
 case 117:
@@ -2437 +2437 @@
 YY_RULE_SETUP
 #line 292 "lex.ll"
-{ BEGIN 0; *strtext += std::string( yytext); RETURN_STR(CHARACTERconstant); }
+{ BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(CHARACTERconstant); }
         YY_BREAK
 /* ' stop highlighting */
@@ -2444 +2444 @@
 YY_RULE_SETUP
 #line 296 "lex.ll"
-{ BEGIN STRING; rm_underscore(); strtext = new std::string; *strtext += std::string( yytext ); }
+{ BEGIN STRING; rm_underscore(); strtext = new std::string( yytext, yyleng ); }
         YY_BREAK
 case 119:
 YY_RULE_SETUP
 #line 297 "lex.ll"
-{ *strtext += std::string( yytext ); }
+{ strtext->append( yytext, yyleng ); }
         YY_BREAK
 case 120:
@@ -2455 +2455 @@
 YY_RULE_SETUP
 #line 298 "lex.ll"
-{ BEGIN 0; *strtext += std::string( yytext ); RETURN_STR(STRINGliteral); }
+{ BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(STRINGliteral); }
         YY_BREAK
 /* " stop highlighting */
@@ -2462 +2462 @@
 YY_RULE_SETUP
 #line 302 "lex.ll"
-{ rm_underscore(); *strtext += std::string( yytext ); }
+{ rm_underscore(); strtext->append( yytext, yyleng ); }
         YY_BREAK
 case 122:
@@ -2473 +2473 @@
 YY_RULE_SETUP
 #line 304 "lex.ll"
-{ *strtext += std::string( yytext ); } // unknown escape character
+{ strtext->append( yytext, yyleng ); } // unknown escape character
         YY_BREAK
 /* punctuation */