Changeset a8541d9 for src/Parser

Timestamp:

Jun 11, 2015, 1:31:07 PM (11 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

ea9b9d3

Parents:

bfbf97f (diff), cda48b6 (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 'code-gen' into resolver

Location:

src/Parser

Files:

• parser.cc (modified) (1 diff)
• parser.yy (modified) (2 diffs)

src/Parser/parser.cc

@@ -9272 +9272 @@
             std::cout << "in file " << yyfilename << " ";
         } // if
-//      std::cout << "at line " << yylineno << " reading token \"" << *(yylval.tok.str) << "\"" << std::endl;
-        std::cout << "at line " << yylineno << " reading token \"" << yytext << "\"" << std::endl;
+        std::cout << "at line " << yylineno << " reading token \"" << (yytext[0] == '\0' ? "EOF" : yytext) << "\"" << std::endl;
 }
 

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun 10 14:22:15 2015
-// Update Count     : 1039
+// Last Modified On : Wed Jun 10 20:31:54 2015
+// Update Count     : 1040
 // 
 
@@ -2723 +2723 @@
             std::cout << "in file " << yyfilename << " ";
         } // if
-        std::cout << "at line " << yylineno << " reading token \"" << yytext << "\"" << std::endl;
+        std::cout << "at line " << yylineno << " reading token \"" << (yytext[0] == '\0' ? "EOF" : yytext) << "\"" << std::endl;
 }