Changeset 3078643 for src/Parser/parser.h

Timestamp:

Aug 10, 2016, 2:29:44 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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:

be0a9d8, ef42e764

Parents:

f18a711 (diff), a563f01 (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:

• src/Parser/parser.h (modified) (3 diffs)

src/Parser/parser.h

@@ -262 +262 @@
 
 /* Line 2068 of yacc.c  */
-#line 110 "parser.yy"
+#line 115 "parser.yy"
 
         Token tok;
@@ -271 +271 @@
         DeclarationNode::TypeClass tclass;
         StatementNode *sn;
-        ConstantNode *constant;
+        ConstantExpr *constant;
+        ForCtl *fctl;
         LabelNode *label;
         InitializerNode *in;
-        OperatorNode::Type op;
+        OperKinds op;
         bool flag;
 
@@ -280 +281 @@
 
 /* Line 2068 of yacc.c  */
-#line 283 "Parser/parser.h"
+#line 284 "Parser/parser.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1