Changeset 4a7d895 for src/Parser/lex.ll

Timestamp:

Aug 20, 2016, 5:33:07 AM (9 years ago)

Author:

Aaron Moss <bruceiv@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

80722d0

Parents:

7b1bfc5 (diff), 2037f82 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2.cs.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Parser/lex.ll (modified) (4 diffs)

src/Parser/lex.ll

@@ -9 +9 @@
  * 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 : Thu Aug 18 22:17:30 2016
+ * Update Count     : 472
  */
 
@@ -25 +25 @@
 
 #include <string>
+#include <cstdio>                                                                               // FILENAME_MAX
 
 #include "lex.h"
@@ -36 +37 @@
 #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
@@ -140 +141 @@
 ^{h_white}*"#"{h_white}*[0-9]+{h_white}*["][^"\n]+["].*"\n" {
         /* " 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[0];
         } // if
 }