Changeset 66f8528 for src/Parser/parser.h

Timestamp:

Dec 15, 2016, 5:16:42 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

43385ca, f7ff3fb

Parents:

5802a4f (diff), 596f987b (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 tuples

Conflicts:

src/ResolvExpr/CommonType.cc
src/tests/.expect/32/extension.txt
src/tests/.expect/32/gccExtensions.txt
src/tests/.expect/64/declarationSpecifier.txt
src/tests/.expect/64/extension.txt
src/tests/.expect/64/gccExtensions.txt
src/tests/.expect/castError.txt
src/tests/Makefile.am

File:

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

src/Parser/parser.h

@@ -59 +59 @@
      SIGNED = 277,
      UNSIGNED = 278,
-     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,
-     CHARACTERconstant = 335,
-     STRINGliteral = 336,
-     REALDECIMALconstant = 337,
-     REALFRACTIONconstant = 338,
-     FLOATINGconstant = 339,
-     ZERO = 340,
-     ONE = 341,
-     ARROW = 342,
-     ICR = 343,
-     DECR = 344,
-     LS = 345,
-     RS = 346,
-     LE = 347,
-     GE = 348,
-     EQ = 349,
-     NE = 350,
-     ANDAND = 351,
-     OROR = 352,
-     ELLIPSIS = 353,
-     MULTassign = 354,
-     DIVassign = 355,
-     MODassign = 356,
-     PLUSassign = 357,
-     MINUSassign = 358,
-     LSassign = 359,
-     RSassign = 360,
-     ANDassign = 361,
-     ERassign = 362,
-     ORassign = 363,
-     ATassign = 364,
-     THEN = 365
+     ZERO_T = 279,
+     ONE_T = 280,
+     VALIST = 281,
+     BOOL = 282,
+     COMPLEX = 283,
+     IMAGINARY = 284,
+     TYPEOF = 285,
+     LABEL = 286,
+     ENUM = 287,
+     STRUCT = 288,
+     UNION = 289,
+     OTYPE = 290,
+     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
    };
 #endif
@@ -170 +172 @@
 #define SIGNED 277
 #define UNSIGNED 278
-#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 CHARACTERconstant 335
-#define STRINGliteral 336
-#define REALDECIMALconstant 337
-#define REALFRACTIONconstant 338
-#define FLOATINGconstant 339
-#define ZERO 340
-#define ONE 341
-#define ARROW 342
-#define ICR 343
-#define DECR 344
-#define LS 345
-#define RS 346
-#define LE 347
-#define GE 348
-#define EQ 349
-#define NE 350
-#define ANDAND 351
-#define OROR 352
-#define ELLIPSIS 353
-#define MULTassign 354
-#define DIVassign 355
-#define MODassign 356
-#define PLUSassign 357
-#define MINUSassign 358
-#define LSassign 359
-#define RSassign 360
-#define ANDassign 361
-#define ERassign 362
-#define ORassign 363
-#define ATassign 364
-#define THEN 365
+#define ZERO_T 279
+#define ONE_T 280
+#define VALIST 281
+#define BOOL 282
+#define COMPLEX 283
+#define IMAGINARY 284
+#define TYPEOF 285
+#define LABEL 286
+#define ENUM 287
+#define STRUCT 288
+#define UNION 289
+#define OTYPE 290
+#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
 
 
@@ -286 +290 @@
 
 /* Line 2068 of yacc.c  */
-#line 289 "Parser/parser.h"
+#line 293 "Parser/parser.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1