Changeset 04273e9 for src/Parser/parser.h

Timestamp:

Aug 8, 2016, 5:29:03 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, 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:

03da511

Parents:

0853178 (diff), 7bf7fb9 (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' into ctor

Conflicts:

src/SymTab/Autogen.cc

File:

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

src/Parser/parser.h

@@ -262 +262 @@
 
 /* Line 2068 of yacc.c  */
-#line 110 "parser.yy"
+#line 115 "parser.yy"
 
         Token tok;
@@ -274 +274 @@
         LabelNode *label;
         InitializerNode *in;
-        OperatorNode::Type op;
+        OperKinds op;
         bool flag;