Changes in src/Parser/lex.cc [08061589:c1c1112]

File:

• src/Parser/lex.cc (modified) (12 diffs)

src/Parser/lex.cc

@@ -1468 +1468 @@
  * Author           : Peter A. Buhr
  * Created On       : Sat Sep 22 08:58:10 2001
- * Last Modified By : 
- * Last Modified On : Sun Jul 31 07:19:36 2016
- * Update Count     : 459
+ * Last Modified By : Peter A. Buhr
+ * Last Modified On : Wed Aug 24 13:27:04 2016
+ * Update Count     : 487
  */
 #line 20 "lex.ll"
@@ -1480 +1480 @@
 
 #include <string>
+#include <cstdio>                                                                               // FILENAME_MAX
 
 #include "lex.h"
@@ -1491 +1492 @@
 #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_CHAR(x)          yylval.tok.str = nullptr; RETURN_LOCN( x )
 #define RETURN_STR(x)           yylval.tok.str = strtext; RETURN_LOCN( x )
 
-#define WHITE_RETURN(x)                                                                 // do nothing
+#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 NAMEDOP_RETURN(x)       RETURN_CHAR( 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
@@ -1531 +1532 @@
 
 
-#line 1534 "Parser/lex.cc"
+#line 1535 "Parser/lex.cc"
 
 #define INITIAL 0
@@ -1723 +1724 @@
         register int yy_act;
     
-#line 138 "lex.ll"
+#line 139 "lex.ll"
 
                                    /* line directives */
-#line 1729 "Parser/lex.cc"
+#line 1730 "Parser/lex.cc"
 
         if ( !(yy_init) )
@@ -1823 +1824 @@
 /* rule 1 can match eol */
 YY_RULE_SETUP
-#line 140 "lex.ll"
+#line 141 "lex.ll"
 {
         /* " stop highlighting */
+        static char filename[FILENAME_MAX];                                     // temporarily store current source-file name
         char *end_num;
         char *begin_string, *end_string;
-        char *filename;
         long lineno, length;
         lineno = strtol( yytext + 1, &end_num, 0 );
         begin_string = strchr( end_num, '"' );
-        if ( begin_string ) {
-                end_string = strchr( begin_string + 1, '"' );
-                if ( end_string ) {
-                        length = end_string - begin_string - 1;
-                        filename = new char[ length + 1 ];
-                        memcpy( filename, begin_string + 1, length );
-                        filename[ length ] = '\0';
-                        //std::cout << "file " << filename << " line " << lineno << std::endl;
-                        yylineno = lineno;
-                        yyfilename = filename;
-                } // if
+        if ( begin_string ) {                                                           // file name ?
+                end_string = strchr( begin_string + 1, '"' );   // look for ending delimiter
+                assert( end_string );                                                   // closing quote ?
+                length = end_string - begin_string - 1;                 // file-name length without quotes or sentinel
+                assert( length < FILENAME_MAX );                                // room for sentinel ?
+                memcpy( &filename, begin_string + 1, length );  // copy file name from yytext
+                filename[ length ] = '\0';                                              // terminate string with sentinel
+                //std::cout << "file " << filename << " line " << lineno << std::endl;
+                yylineno = lineno;
+                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 */