Changeset fb08280 for src/Parser/parser.h

Timestamp:

Jun 8, 2016, 12:58:01 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, with_gc

Children:

9e5f409

Parents:

efbca69 (diff), ac78e25 (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

@@ -143 +143 @@
      ORassign = 361,
      ATassign = 362,
-     THEN = 363
+     REFassign = 363,
+     THEN = 364
    };
 #endif
@@ -252 +253 @@
 #define ORassign 361
 #define ATassign 362
-#define THEN 363
+#define REFassign 363
+#define THEN 364
 
 
@@ -279 +281 @@
 
 /* Line 2068 of yacc.c  */
-#line 282 "Parser/parser.h"
+#line 284 "Parser/parser.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1