Changeset 0f9e4403 for src/Parser/parser.h

Timestamp:

Apr 15, 2016, 12:03:11 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

29ad0ac

Parents:

c5833e8 (diff), 37f0da8 (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 gc_noraii

File:

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

src/Parser/parser.h

@@ -59 +59 @@
      SIGNED = 277,
      UNSIGNED = 278,
-     BOOL = 279,
-     COMPLEX = 280,
-     IMAGINARY = 281,
-     TYPEOF = 282,
-     LABEL = 283,
-     ENUM = 284,
-     STRUCT = 285,
-     UNION = 286,
-     TYPE = 287,
-     FTYPE = 288,
-     DTYPE = 289,
-     CONTEXT = 290,
-     SIZEOF = 291,
-     OFFSETOF = 292,
-     ATTRIBUTE = 293,
-     EXTENSION = 294,
-     IF = 295,
-     ELSE = 296,
-     SWITCH = 297,
-     CASE = 298,
-     DEFAULT = 299,
-     DO = 300,
-     WHILE = 301,
-     FOR = 302,
-     BREAK = 303,
-     CONTINUE = 304,
-     GOTO = 305,
-     RETURN = 306,
-     CHOOSE = 307,
-     DISABLE = 308,
-     ENABLE = 309,
-     FALLTHRU = 310,
-     TRY = 311,
-     CATCH = 312,
-     CATCHRESUME = 313,
-     FINALLY = 314,
-     THROW = 315,
-     THROWRESUME = 316,
-     AT = 317,
-     ASM = 318,
-     ALIGNAS = 319,
-     ALIGNOF = 320,
-     ATOMIC = 321,
-     GENERIC = 322,
-     NORETURN = 323,
-     STATICASSERT = 324,
-     THREADLOCAL = 325,
-     IDENTIFIER = 326,
-     QUOTED_IDENTIFIER = 327,
-     TYPEDEFname = 328,
-     TYPEGENname = 329,
-     ATTR_IDENTIFIER = 330,
-     ATTR_TYPEDEFname = 331,
-     ATTR_TYPEGENname = 332,
-     INTEGERconstant = 333,
-     FLOATINGconstant = 334,
-     CHARACTERconstant = 335,
-     STRINGliteral = 336,
-     ZERO = 337,
-     ONE = 338,
-     ARROW = 339,
-     ICR = 340,
-     DECR = 341,
-     LS = 342,
-     RS = 343,
-     LE = 344,
-     GE = 345,
-     EQ = 346,
-     NE = 347,
-     ANDAND = 348,
-     OROR = 349,
-     ELLIPSIS = 350,
-     MULTassign = 351,
-     DIVassign = 352,
-     MODassign = 353,
-     PLUSassign = 354,
-     MINUSassign = 355,
-     LSassign = 356,
-     RSassign = 357,
-     ANDassign = 358,
-     ERassign = 359,
-     ORassign = 360,
-     ATassign = 361,
-     THEN = 362
+     VALIST = 279,
+     BOOL = 280,
+     COMPLEX = 281,
+     IMAGINARY = 282,
+     TYPEOF = 283,
+     LABEL = 284,
+     ENUM = 285,
+     STRUCT = 286,
+     UNION = 287,
+     OTYPE = 288,
+     FTYPE = 289,
+     DTYPE = 290,
+     TRAIT = 291,
+     SIZEOF = 292,
+     OFFSETOF = 293,
+     ATTRIBUTE = 294,
+     EXTENSION = 295,
+     IF = 296,
+     ELSE = 297,
+     SWITCH = 298,
+     CASE = 299,
+     DEFAULT = 300,
+     DO = 301,
+     WHILE = 302,
+     FOR = 303,
+     BREAK = 304,
+     CONTINUE = 305,
+     GOTO = 306,
+     RETURN = 307,
+     CHOOSE = 308,
+     DISABLE = 309,
+     ENABLE = 310,
+     FALLTHRU = 311,
+     TRY = 312,
+     CATCH = 313,
+     CATCHRESUME = 314,
+     FINALLY = 315,
+     THROW = 316,
+     THROWRESUME = 317,
+     AT = 318,
+     ASM = 319,
+     ALIGNAS = 320,
+     ALIGNOF = 321,
+     ATOMIC = 322,
+     GENERIC = 323,
+     NORETURN = 324,
+     STATICASSERT = 325,
+     THREADLOCAL = 326,
+     IDENTIFIER = 327,
+     QUOTED_IDENTIFIER = 328,
+     TYPEDEFname = 329,
+     TYPEGENname = 330,
+     ATTR_IDENTIFIER = 331,
+     ATTR_TYPEDEFname = 332,
+     ATTR_TYPEGENname = 333,
+     INTEGERconstant = 334,
+     FLOATINGconstant = 335,
+     CHARACTERconstant = 336,
+     STRINGliteral = 337,
+     ZERO = 338,
+     ONE = 339,
+     ARROW = 340,
+     ICR = 341,
+     DECR = 342,
+     LS = 343,
+     RS = 344,
+     LE = 345,
+     GE = 346,
+     EQ = 347,
+     NE = 348,
+     ANDAND = 349,
+     OROR = 350,
+     ELLIPSIS = 351,
+     MULTassign = 352,
+     DIVassign = 353,
+     MODassign = 354,
+     PLUSassign = 355,
+     MINUSassign = 356,
+     LSassign = 357,
+     RSassign = 358,
+     ANDassign = 359,
+     ERassign = 360,
+     ORassign = 361,
+     ATassign = 362,
+     THEN = 363
    };
 #endif
@@ -167 +168 @@
 #define SIGNED 277
 #define UNSIGNED 278
-#define BOOL 279
-#define COMPLEX 280
-#define IMAGINARY 281
-#define TYPEOF 282
-#define LABEL 283
-#define ENUM 284
-#define STRUCT 285
-#define UNION 286
-#define TYPE 287
-#define FTYPE 288
-#define DTYPE 289
-#define CONTEXT 290
-#define SIZEOF 291
-#define OFFSETOF 292
-#define ATTRIBUTE 293
-#define EXTENSION 294
-#define IF 295
-#define ELSE 296
-#define SWITCH 297
-#define CASE 298
-#define DEFAULT 299
-#define DO 300
-#define WHILE 301
-#define FOR 302
-#define BREAK 303
-#define CONTINUE 304
-#define GOTO 305
-#define RETURN 306
-#define CHOOSE 307
-#define DISABLE 308
-#define ENABLE 309
-#define FALLTHRU 310
-#define TRY 311
-#define CATCH 312
-#define CATCHRESUME 313
-#define FINALLY 314
-#define THROW 315
-#define THROWRESUME 316
-#define AT 317
-#define ASM 318
-#define ALIGNAS 319
-#define ALIGNOF 320
-#define ATOMIC 321
-#define GENERIC 322
-#define NORETURN 323
-#define STATICASSERT 324
-#define THREADLOCAL 325
-#define IDENTIFIER 326
-#define QUOTED_IDENTIFIER 327
-#define TYPEDEFname 328
-#define TYPEGENname 329
-#define ATTR_IDENTIFIER 330
-#define ATTR_TYPEDEFname 331
-#define ATTR_TYPEGENname 332
-#define INTEGERconstant 333
-#define FLOATINGconstant 334
-#define CHARACTERconstant 335
-#define STRINGliteral 336
-#define ZERO 337
-#define ONE 338
-#define ARROW 339
-#define ICR 340
-#define DECR 341
-#define LS 342
-#define RS 343
-#define LE 344
-#define GE 345
-#define EQ 346
-#define NE 347
-#define ANDAND 348
-#define OROR 349
-#define ELLIPSIS 350
-#define MULTassign 351
-#define DIVassign 352
-#define MODassign 353
-#define PLUSassign 354
-#define MINUSassign 355
-#define LSassign 356
-#define RSassign 357
-#define ANDassign 358
-#define ERassign 359
-#define ORassign 360
-#define ATassign 361
-#define THEN 362
+#define VALIST 279
+#define BOOL 280
+#define COMPLEX 281
+#define IMAGINARY 282
+#define TYPEOF 283
+#define LABEL 284
+#define ENUM 285
+#define STRUCT 286
+#define UNION 287
+#define OTYPE 288
+#define FTYPE 289
+#define DTYPE 290
+#define TRAIT 291
+#define SIZEOF 292
+#define OFFSETOF 293
+#define ATTRIBUTE 294
+#define EXTENSION 295
+#define IF 296
+#define ELSE 297
+#define SWITCH 298
+#define CASE 299
+#define DEFAULT 300
+#define DO 301
+#define WHILE 302
+#define FOR 303
+#define BREAK 304
+#define CONTINUE 305
+#define GOTO 306
+#define RETURN 307
+#define CHOOSE 308
+#define DISABLE 309
+#define ENABLE 310
+#define FALLTHRU 311
+#define TRY 312
+#define CATCH 313
+#define CATCHRESUME 314
+#define FINALLY 315
+#define THROW 316
+#define THROWRESUME 317
+#define AT 318
+#define ASM 319
+#define ALIGNAS 320
+#define ALIGNOF 321
+#define ATOMIC 322
+#define GENERIC 323
+#define NORETURN 324
+#define STATICASSERT 325
+#define THREADLOCAL 326
+#define IDENTIFIER 327
+#define QUOTED_IDENTIFIER 328
+#define TYPEDEFname 329
+#define TYPEGENname 330
+#define ATTR_IDENTIFIER 331
+#define ATTR_TYPEDEFname 332
+#define ATTR_TYPEGENname 333
+#define INTEGERconstant 334
+#define FLOATINGconstant 335
+#define CHARACTERconstant 336
+#define STRINGliteral 337
+#define ZERO 338
+#define ONE 339
+#define ARROW 340
+#define ICR 341
+#define DECR 342
+#define LS 343
+#define RS 344
+#define LE 345
+#define GE 346
+#define EQ 347
+#define NE 348
+#define ANDAND 349
+#define OROR 350
+#define ELLIPSIS 351
+#define MULTassign 352
+#define DIVassign 353
+#define MODassign 354
+#define PLUSassign 355
+#define MINUSassign 356
+#define LSassign 357
+#define RSassign 358
+#define ANDassign 359
+#define ERassign 360
+#define ORassign 361
+#define ATassign 362
+#define THEN 363
 
 
@@ -260 +262 @@
 
 /* Line 2068 of yacc.c  */
-#line 110 "parser.yy"
+#line 112 "parser.yy"
 
         Token tok;
@@ -277 +279 @@
 
 /* Line 2068 of yacc.c  */
-#line 280 "Parser/parser.h"
+#line 282 "Parser/parser.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1