Changeset 2162c2c for src/Parser/parser.h

Timestamp:

Jan 11, 2017, 4:11:02 PM (9 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:

075734f

Parents:

bb82c03 (diff), d3a85240 (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

@@ -73 +73 @@
      FTYPE = 291,
      DTYPE = 292,
-     TRAIT = 293,
-     SIZEOF = 294,
-     OFFSETOF = 295,
-     ATTRIBUTE = 296,
-     EXTENSION = 297,
-     IF = 298,
-     ELSE = 299,
-     SWITCH = 300,
-     CASE = 301,
-     DEFAULT = 302,
-     DO = 303,
-     WHILE = 304,
-     FOR = 305,
-     BREAK = 306,
-     CONTINUE = 307,
-     GOTO = 308,
-     RETURN = 309,
-     CHOOSE = 310,
-     DISABLE = 311,
-     ENABLE = 312,
-     FALLTHRU = 313,
-     TRY = 314,
-     CATCH = 315,
-     CATCHRESUME = 316,
-     FINALLY = 317,
-     THROW = 318,
-     THROWRESUME = 319,
-     AT = 320,
-     ASM = 321,
-     ALIGNAS = 322,
-     ALIGNOF = 323,
-     ATOMIC = 324,
-     GENERIC = 325,
-     NORETURN = 326,
-     STATICASSERT = 327,
-     THREADLOCAL = 328,
-     IDENTIFIER = 329,
-     QUOTED_IDENTIFIER = 330,
-     TYPEDEFname = 331,
-     TYPEGENname = 332,
-     ATTR_IDENTIFIER = 333,
-     ATTR_TYPEDEFname = 334,
-     ATTR_TYPEGENname = 335,
-     INTEGERconstant = 336,
-     CHARACTERconstant = 337,
-     STRINGliteral = 338,
-     REALDECIMALconstant = 339,
-     REALFRACTIONconstant = 340,
-     FLOATINGconstant = 341,
-     ZERO = 342,
-     ONE = 343,
-     ARROW = 344,
-     ICR = 345,
-     DECR = 346,
-     LS = 347,
-     RS = 348,
-     LE = 349,
-     GE = 350,
-     EQ = 351,
-     NE = 352,
-     ANDAND = 353,
-     OROR = 354,
-     ELLIPSIS = 355,
-     MULTassign = 356,
-     DIVassign = 357,
-     MODassign = 358,
-     PLUSassign = 359,
-     MINUSassign = 360,
-     LSassign = 361,
-     RSassign = 362,
-     ANDassign = 363,
-     ERassign = 364,
-     ORassign = 365,
-     ATassign = 366,
-     THEN = 367
+     TTYPE = 293,
+     TRAIT = 294,
+     SIZEOF = 295,
+     OFFSETOF = 296,
+     ATTRIBUTE = 297,
+     EXTENSION = 298,
+     IF = 299,
+     ELSE = 300,
+     SWITCH = 301,
+     CASE = 302,
+     DEFAULT = 303,
+     DO = 304,
+     WHILE = 305,
+     FOR = 306,
+     BREAK = 307,
+     CONTINUE = 308,
+     GOTO = 309,
+     RETURN = 310,
+     CHOOSE = 311,
+     DISABLE = 312,
+     ENABLE = 313,
+     FALLTHRU = 314,
+     TRY = 315,
+     CATCH = 316,
+     CATCHRESUME = 317,
+     FINALLY = 318,
+     THROW = 319,
+     THROWRESUME = 320,
+     AT = 321,
+     ASM = 322,
+     ALIGNAS = 323,
+     ALIGNOF = 324,
+     ATOMIC = 325,
+     GENERIC = 326,
+     NORETURN = 327,
+     STATICASSERT = 328,
+     THREADLOCAL = 329,
+     IDENTIFIER = 330,
+     QUOTED_IDENTIFIER = 331,
+     TYPEDEFname = 332,
+     TYPEGENname = 333,
+     ATTR_IDENTIFIER = 334,
+     ATTR_TYPEDEFname = 335,
+     ATTR_TYPEGENname = 336,
+     INTEGERconstant = 337,
+     CHARACTERconstant = 338,
+     STRINGliteral = 339,
+     REALDECIMALconstant = 340,
+     REALFRACTIONconstant = 341,
+     FLOATINGconstant = 342,
+     ZERO = 343,
+     ONE = 344,
+     ARROW = 345,
+     ICR = 346,
+     DECR = 347,
+     LS = 348,
+     RS = 349,
+     LE = 350,
+     GE = 351,
+     EQ = 352,
+     NE = 353,
+     ANDAND = 354,
+     OROR = 355,
+     ELLIPSIS = 356,
+     MULTassign = 357,
+     DIVassign = 358,
+     MODassign = 359,
+     PLUSassign = 360,
+     MINUSassign = 361,
+     LSassign = 362,
+     RSassign = 363,
+     ANDassign = 364,
+     ERassign = 365,
+     ORassign = 366,
+     ATassign = 367,
+     THEN = 368
    };
 #endif
@@ -186 +187 @@
 #define FTYPE 291
 #define DTYPE 292
-#define TRAIT 293
-#define SIZEOF 294
-#define OFFSETOF 295
-#define ATTRIBUTE 296
-#define EXTENSION 297
-#define IF 298
-#define ELSE 299
-#define SWITCH 300
-#define CASE 301
-#define DEFAULT 302
-#define DO 303
-#define WHILE 304
-#define FOR 305
-#define BREAK 306
-#define CONTINUE 307
-#define GOTO 308
-#define RETURN 309
-#define CHOOSE 310
-#define DISABLE 311
-#define ENABLE 312
-#define FALLTHRU 313
-#define TRY 314
-#define CATCH 315
-#define CATCHRESUME 316
-#define FINALLY 317
-#define THROW 318
-#define THROWRESUME 319
-#define AT 320
-#define ASM 321
-#define ALIGNAS 322
-#define ALIGNOF 323
-#define ATOMIC 324
-#define GENERIC 325
-#define NORETURN 326
-#define STATICASSERT 327
-#define THREADLOCAL 328
-#define IDENTIFIER 329
-#define QUOTED_IDENTIFIER 330
-#define TYPEDEFname 331
-#define TYPEGENname 332
-#define ATTR_IDENTIFIER 333
-#define ATTR_TYPEDEFname 334
-#define ATTR_TYPEGENname 335
-#define INTEGERconstant 336
-#define CHARACTERconstant 337
-#define STRINGliteral 338
-#define REALDECIMALconstant 339
-#define REALFRACTIONconstant 340
-#define FLOATINGconstant 341
-#define ZERO 342
-#define ONE 343
-#define ARROW 344
-#define ICR 345
-#define DECR 346
-#define LS 347
-#define RS 348
-#define LE 349
-#define GE 350
-#define EQ 351
-#define NE 352
-#define ANDAND 353
-#define OROR 354
-#define ELLIPSIS 355
-#define MULTassign 356
-#define DIVassign 357
-#define MODassign 358
-#define PLUSassign 359
-#define MINUSassign 360
-#define LSassign 361
-#define RSassign 362
-#define ANDassign 363
-#define ERassign 364
-#define ORassign 365
-#define ATassign 366
-#define THEN 367
+#define TTYPE 293
+#define TRAIT 294
+#define SIZEOF 295
+#define OFFSETOF 296
+#define ATTRIBUTE 297
+#define EXTENSION 298
+#define IF 299
+#define ELSE 300
+#define SWITCH 301
+#define CASE 302
+#define DEFAULT 303
+#define DO 304
+#define WHILE 305
+#define FOR 306
+#define BREAK 307
+#define CONTINUE 308
+#define GOTO 309
+#define RETURN 310
+#define CHOOSE 311
+#define DISABLE 312
+#define ENABLE 313
+#define FALLTHRU 314
+#define TRY 315
+#define CATCH 316
+#define CATCHRESUME 317
+#define FINALLY 318
+#define THROW 319
+#define THROWRESUME 320
+#define AT 321
+#define ASM 322
+#define ALIGNAS 323
+#define ALIGNOF 324
+#define ATOMIC 325
+#define GENERIC 326
+#define NORETURN 327
+#define STATICASSERT 328
+#define THREADLOCAL 329
+#define IDENTIFIER 330
+#define QUOTED_IDENTIFIER 331
+#define TYPEDEFname 332
+#define TYPEGENname 333
+#define ATTR_IDENTIFIER 334
+#define ATTR_TYPEDEFname 335
+#define ATTR_TYPEGENname 336
+#define INTEGERconstant 337
+#define CHARACTERconstant 338
+#define STRINGliteral 339
+#define REALDECIMALconstant 340
+#define REALFRACTIONconstant 341
+#define FLOATINGconstant 342
+#define ZERO 343
+#define ONE 344
+#define ARROW 345
+#define ICR 346
+#define DECR 347
+#define LS 348
+#define RS 349
+#define LE 350
+#define GE 351
+#define EQ 352
+#define NE 353
+#define ANDAND 354
+#define OROR 355
+#define ELLIPSIS 356
+#define MULTassign 357
+#define DIVassign 358
+#define MODassign 359
+#define PLUSassign 360
+#define MINUSassign 361
+#define LSassign 362
+#define RSassign 363
+#define ANDassign 364
+#define ERassign 365
+#define ORassign 366
+#define ATassign 367
+#define THEN 368
 
 
@@ -290 +292 @@
 
 /* Line 2068 of yacc.c  */
-#line 293 "Parser/parser.h"
+#line 295 "Parser/parser.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1