Changeset 0614d14 for tools/prettyprinter/lex.ll

Timestamp:

Jul 5, 2017, 4:46:58 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

b877fa8

Parents:

67fa9f9 (diff), 1ce2189 (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:software/cfa/cfa-cc

File:

• tools/prettyprinter/lex.ll (modified) (1 diff)

tools/prettyprinter/lex.ll

@@ -23 +23 @@
 #include <iostream>
 using namespace std;
+#include "ParserTypes.h" 
 #include "parser.hh" 
-#include "parser.h" 
 
 #define RETURN_TOKEN( kind ) yylval.tokenp = new Token( yytext, ws_list, kind ); return kind;