Changeset 235b41f for tools/prettyprinter/parser.hh

Timestamp:

Sep 5, 2017, 3:41:04 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

416cc86

Parents:

800d275 (diff), 3f8dd01 (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:

• tools/prettyprinter/parser.hh (modified) (3 diffs)

tools/prettyprinter/parser.hh

@@ -59 +59 @@
     RIGHT = 269,
     NONASSOC = 270,
-    TYPE = 271,
-    PURE_PARSER = 272,
-    SEMANTIC_PARSER = 273,
-    EXPECT = 274,
-    THONG = 275,
-    PREC = 276,
-    END_TERMINALS = 277,
-    _SECTIONS = 278,
-    _DEFSECTION_OPT = 279,
-    _LITERALBLOCK = 280,
-    _DECLARATION = 281,
-    _TAG_OPT = 282,
-    _NAMENOLIST = 283,
-    _NAMENO = 284,
-    _NAMELIST = 285,
-    _RULESECTION = 286,
-    _RULE = 287,
-    _LHS = 288,
-    _RHS = 289,
-    _PREC = 290,
-    _ACTION = 291,
-    _USERSECTION_OPT = 292
+    PRECEDENCE = 271,
+    TYPE = 272,
+    PURE_PARSER = 273,
+    SEMANTIC_PARSER = 274,
+    EXPECT = 275,
+    THONG = 276,
+    PREC = 277,
+    END_TERMINALS = 278,
+    _SECTIONS = 279,
+    _DEFSECTION_OPT = 280,
+    _LITERALBLOCK = 281,
+    _DECLARATION = 282,
+    _TAG_OPT = 283,
+    _NAMENOLIST = 284,
+    _NAMENO = 285,
+    _NAMELIST = 286,
+    _RULESECTION = 287,
+    _RULE = 288,
+    _LHS = 289,
+    _RHS = 290,
+    _PREC = 291,
+    _ACTION = 292,
+    _USERSECTION_OPT = 293
   };
 #endif
@@ -97 +98 @@
 #define RIGHT 269
 #define NONASSOC 270
-#define TYPE 271
-#define PURE_PARSER 272
-#define SEMANTIC_PARSER 273
-#define EXPECT 274
-#define THONG 275
-#define PREC 276
-#define END_TERMINALS 277
-#define _SECTIONS 278
-#define _DEFSECTION_OPT 279
-#define _LITERALBLOCK 280
-#define _DECLARATION 281
-#define _TAG_OPT 282
-#define _NAMENOLIST 283
-#define _NAMENO 284
-#define _NAMELIST 285
-#define _RULESECTION 286
-#define _RULE 287
-#define _LHS 288
-#define _RHS 289
-#define _PREC 290
-#define _ACTION 291
-#define _USERSECTION_OPT 292
+#define PRECEDENCE 271
+#define TYPE 272
+#define PURE_PARSER 273
+#define SEMANTIC_PARSER 274
+#define EXPECT 275
+#define THONG 276
+#define PREC 277
+#define END_TERMINALS 278
+#define _SECTIONS 279
+#define _DEFSECTION_OPT 280
+#define _LITERALBLOCK 281
+#define _DECLARATION 282
+#define _TAG_OPT 283
+#define _NAMENOLIST 284
+#define _NAMENO 285
+#define _NAMELIST 286
+#define _RULESECTION 287
+#define _RULE 288
+#define _LHS 289
+#define _RHS 290
+#define _PREC 291
+#define _ACTION 292
+#define _USERSECTION_OPT 293
 
 /* Value type.  */
@@ -129 +131 @@
         Token *tokenp;
 
-#line 132 "parser.hh" /* yacc.c:1909  */
+#line 134 "parser.hh" /* yacc.c:1909  */
 };