Changeset f678663e for src/Parser/parser.h

Timestamp:

Jul 30, 2015, 4:08:34 PM (10 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:

8c84ebd, ae4c85a

Parents:

5aa708c (diff), 093f1a0 (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 /u/cforall/software/cfa/cfa-cc

Conflicts:

src/main.cc

File:

• src/Parser/parser.h (modified) (1 diff)

src/Parser/parser.h

@@ -256 +256 @@
         StatementNode *sn;
         ConstantNode *constant;
+        LabelNode *label;
         InitializerNode *in;
+        bool flag;
 
 
 
 /* Line 2068 of yacc.c  */
-#line 264 "Parser/parser.h"
+#line 266 "Parser/parser.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1