Changeset aeec6b7 for src/Parser

Timestamp:

Jul 10, 2018, 8:20:50 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

3d7e53b

Parents:

036dd5f (diff), 97be800 (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 plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

Location:

src/Parser

Files:

• TypedefTable.cc (modified) (1 diff)
• TypedefTable.h (modified) (1 diff)
• lex.ll (modified) (1 diff)

src/Parser/TypedefTable.cc

@@ -91 +91 @@
 
 void TypedefTable::enterScope() {
-        kindTable.beginScope();
+        kindTable.beginScope(0);
         debugPrint( cerr << "Entering scope " << kindTable.currentScope() << endl; print() );
 } // TypedefTable::enterScope

src/Parser/TypedefTable.h

@@ -23 +23 @@
 
 class TypedefTable {
-        typedef ScopedMap< std::string, int > KindTable;
+        typedef ScopedMap< std::string, int, int > KindTable;
         KindTable kindTable;    
-        unsigned int level = 0;
+        unsigned int level;
   public:
+    TypedefTable() : kindTable{0}, level{0} {}
         ~TypedefTable();
 

src/Parser/lex.ll

@@ -464 +464 @@
 void yyerror( const char * errmsg ) {
         SemanticErrorThrow = true;
-        cout << (yyfilename ? yyfilename : "*unknown file*") << ':' << yylineno << ':' << column - yyleng + 1
+        cerr << (yyfilename ? yyfilename : "*unknown file*") << ':' << yylineno << ':' << column - yyleng + 1
                  << ": " << ErrorHelpers::error_str() << errmsg << " at token \"" << (yytext[0] == '\0' ? "EOF" : yytext) << '"' << endl;
 }