Changeset 84b08d4 for src/Parser/parser.h

Timestamp:

Nov 18, 2015, 12:50:56 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, with_gc

Children:

9ed3237

Parents:

0800284 (diff), 50eac1b (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 'override-autogen' into ctor

File:

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

src/Parser/parser.h

@@ -140 +140 @@
      ERassign = 358,
      ORassign = 359,
-     THEN = 360
+     ATassign = 360,
+     THEN = 361
    };
 #endif
@@ -246 +247 @@
 #define ERassign 358
 #define ORassign 359
-#define THEN 360
+#define ATassign 360
+#define THEN 361
 
 
@@ -256 +258 @@
 
 /* Line 2068 of yacc.c  */
-#line 108 "parser.yy"
+#line 110 "parser.yy"
 
         Token tok;
@@ -273 +275 @@
 
 /* Line 2068 of yacc.c  */
-#line 276 "Parser/parser.h"
+#line 278 "Parser/parser.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1