Changeset f1ee72e for src/Parser/parser.h

Timestamp:

Jun 23, 2016, 12:23:00 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, 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:

4d3ca1d8

Parents:

c2931ea (diff), d56c05d0 (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

File:

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

src/Parser/parser.h

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