Changeset d2ded3e7 for src/Parser/parser.h

Timestamp:

Oct 28, 2015, 3:47:29 PM (10 years ago)

Author:

Aaron Moss <a3moss@…>

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:

37a3b8f9, 4673385, e56cfdb0

Parents:

698664b3 (diff), 097e2b0 (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 changes into current branch

File:

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

src/Parser/parser.h

@@ -87 +87 @@
      RETURN = 305,
      CHOOSE = 306,
-     FALLTHRU = 307,
-     TRY = 308,
-     CATCH = 309,
-     FINALLY = 310,
-     THROW = 311,
-     ASM = 312,
-     ALIGNAS = 313,
-     ALIGNOF = 314,
-     ATOMIC = 315,
-     GENERIC = 316,
-     NORETURN = 317,
-     STATICASSERT = 318,
-     THREADLOCAL = 319,
-     IDENTIFIER = 320,
-     QUOTED_IDENTIFIER = 321,
-     TYPEDEFname = 322,
-     TYPEGENname = 323,
-     ATTR_IDENTIFIER = 324,
-     ATTR_TYPEDEFname = 325,
-     ATTR_TYPEGENname = 326,
-     INTEGERconstant = 327,
-     FLOATINGconstant = 328,
-     CHARACTERconstant = 329,
-     STRINGliteral = 330,
-     ZERO = 331,
-     ONE = 332,
-     ARROW = 333,
-     ICR = 334,
-     DECR = 335,
-     LS = 336,
-     RS = 337,
-     LE = 338,
-     GE = 339,
-     EQ = 340,
-     NE = 341,
-     ANDAND = 342,
-     OROR = 343,
-     ELLIPSIS = 344,
-     MULTassign = 345,
-     DIVassign = 346,
-     MODassign = 347,
-     PLUSassign = 348,
-     MINUSassign = 349,
-     LSassign = 350,
-     RSassign = 351,
-     ANDassign = 352,
-     ERassign = 353,
-     ORassign = 354,
-     THEN = 355
+     DISABLE = 307,
+     ENABLE = 308,
+     FALLTHRU = 309,
+     TRY = 310,
+     CATCH = 311,
+     CATCHRESUME = 312,
+     FINALLY = 313,
+     THROW = 314,
+     THROWRESUME = 315,
+     AT = 316,
+     ASM = 317,
+     ALIGNAS = 318,
+     ALIGNOF = 319,
+     ATOMIC = 320,
+     GENERIC = 321,
+     NORETURN = 322,
+     STATICASSERT = 323,
+     THREADLOCAL = 324,
+     IDENTIFIER = 325,
+     QUOTED_IDENTIFIER = 326,
+     TYPEDEFname = 327,
+     TYPEGENname = 328,
+     ATTR_IDENTIFIER = 329,
+     ATTR_TYPEDEFname = 330,
+     ATTR_TYPEGENname = 331,
+     INTEGERconstant = 332,
+     FLOATINGconstant = 333,
+     CHARACTERconstant = 334,
+     STRINGliteral = 335,
+     ZERO = 336,
+     ONE = 337,
+     ARROW = 338,
+     ICR = 339,
+     DECR = 340,
+     LS = 341,
+     RS = 342,
+     LE = 343,
+     GE = 344,
+     EQ = 345,
+     NE = 346,
+     ANDAND = 347,
+     OROR = 348,
+     ELLIPSIS = 349,
+     MULTassign = 350,
+     DIVassign = 351,
+     MODassign = 352,
+     PLUSassign = 353,
+     MINUSassign = 354,
+     LSassign = 355,
+     RSassign = 356,
+     ANDassign = 357,
+     ERassign = 358,
+     ORassign = 359,
+     ATassign = 360,
+     THEN = 361
    };
 #endif
@@ -188 +194 @@
 #define RETURN 305
 #define CHOOSE 306
-#define FALLTHRU 307
-#define TRY 308
-#define CATCH 309
-#define FINALLY 310
-#define THROW 311
-#define ASM 312
-#define ALIGNAS 313
-#define ALIGNOF 314
-#define ATOMIC 315
-#define GENERIC 316
-#define NORETURN 317
-#define STATICASSERT 318
-#define THREADLOCAL 319
-#define IDENTIFIER 320
-#define QUOTED_IDENTIFIER 321
-#define TYPEDEFname 322
-#define TYPEGENname 323
-#define ATTR_IDENTIFIER 324
-#define ATTR_TYPEDEFname 325
-#define ATTR_TYPEGENname 326
-#define INTEGERconstant 327
-#define FLOATINGconstant 328
-#define CHARACTERconstant 329
-#define STRINGliteral 330
-#define ZERO 331
-#define ONE 332
-#define ARROW 333
-#define ICR 334
-#define DECR 335
-#define LS 336
-#define RS 337
-#define LE 338
-#define GE 339
-#define EQ 340
-#define NE 341
-#define ANDAND 342
-#define OROR 343
-#define ELLIPSIS 344
-#define MULTassign 345
-#define DIVassign 346
-#define MODassign 347
-#define PLUSassign 348
-#define MINUSassign 349
-#define LSassign 350
-#define RSassign 351
-#define ANDassign 352
-#define ERassign 353
-#define ORassign 354
-#define THEN 355
+#define DISABLE 307
+#define ENABLE 308
+#define FALLTHRU 309
+#define TRY 310
+#define CATCH 311
+#define CATCHRESUME 312
+#define FINALLY 313
+#define THROW 314
+#define THROWRESUME 315
+#define AT 316
+#define ASM 317
+#define ALIGNAS 318
+#define ALIGNOF 319
+#define ATOMIC 320
+#define GENERIC 321
+#define NORETURN 322
+#define STATICASSERT 323
+#define THREADLOCAL 324
+#define IDENTIFIER 325
+#define QUOTED_IDENTIFIER 326
+#define TYPEDEFname 327
+#define TYPEGENname 328
+#define ATTR_IDENTIFIER 329
+#define ATTR_TYPEDEFname 330
+#define ATTR_TYPEGENname 331
+#define INTEGERconstant 332
+#define FLOATINGconstant 333
+#define CHARACTERconstant 334
+#define STRINGliteral 335
+#define ZERO 336
+#define ONE 337
+#define ARROW 338
+#define ICR 339
+#define DECR 340
+#define LS 341
+#define RS 342
+#define LE 343
+#define GE 344
+#define EQ 345
+#define NE 346
+#define ANDAND 347
+#define OROR 348
+#define ELLIPSIS 349
+#define MULTassign 350
+#define DIVassign 351
+#define MODassign 352
+#define PLUSassign 353
+#define MINUSassign 354
+#define LSassign 355
+#define RSassign 356
+#define ANDassign 357
+#define ERassign 358
+#define ORassign 359
+#define ATassign 360
+#define THEN 361
 
 
@@ -246 +258 @@
 
 /* Line 2068 of yacc.c  */
-#line 108 "parser.yy"
+#line 110 "parser.yy"
 
         Token tok;
@@ -263 +275 @@
 
 /* Line 2068 of yacc.c  */
-#line 266 "Parser/parser.h"
+#line 278 "Parser/parser.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1