Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gdb/c-exp.c

Issue 11969036: Merge GDB 7.5.1 (Closed) Base URL: http://git.chromium.org/native_client/nacl-gdb.git@master
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gdb/buildsym.c ('k') | gdb/c-exp.y » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gdb/c-exp.c
diff --git a/gdb/c-exp.c b/gdb/c-exp.c
index d3657f9af4fde490721e0ef0576b2adcf566d3ca..7595990da73be0a48375407e9aebca216ea89889 100644
--- a/gdb/c-exp.c
+++ b/gdb/c-exp.c
@@ -107,7 +107,8 @@
ARROW_STAR = 309,
ARROW = 310,
BLOCKNAME = 311,
- FILENAME = 312
+ FILENAME = 312,
+ DOTDOTDOT = 313
};
#endif
#define INT 258
@@ -165,6 +166,7 @@
#define ARROW 310
#define BLOCKNAME 311
#define FILENAME 312
+#define DOTDOTDOT 313
@@ -240,6 +242,12 @@
#define yygindex c_yygindex
#define yytable c_yytable
#define yycheck c_yycheck
+#define yyss c_yyss
+#define yysslim c_yysslim
+#define yyssp c_yyssp
+#define yystacksize c_yystacksize
+#define yyvs c_yyvs
+#define yyvsp c_yyvsp
#ifndef YYDEBUG
#define YYDEBUG 1 /* Default to yydebug support */
@@ -269,7 +277,7 @@ void yyerror (char *);
#endif
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 126 "c-exp.y"
+#line 132 "c-exp.y"
typedef union YYSTYPE {
LONGEST lval;
struct {
@@ -296,11 +304,13 @@ typedef union YYSTYPE {
struct internalvar *ivar;
struct stoken_vector svec;
- struct type **tvec;
+ VEC (type_ptr) *tvec;
int *ivec;
+
+ struct type_stack *type_stack;
} YYSTYPE;
/* Line 191 of yacc.c. */
-#line 304 "c-exp.c"
+#line 314 "c-exp.c"
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
@@ -309,15 +319,16 @@ typedef union YYSTYPE {
/* Copy the second part of user declarations. */
-#line 156 "c-exp.y"
+#line 164 "c-exp.y"
/* YYSTYPE gets defined by %union */
static int parse_number (char *, int, int, YYSTYPE *);
static struct stoken operator_stoken (const char *);
+static void check_parameter_typelist (VEC (type_ptr) *);
/* Line 214 of yacc.c. */
-#line 321 "c-exp.c"
+#line 332 "c-exp.c"
#if ! defined (yyoverflow) || YYERROR_VERBOSE
@@ -421,22 +432,22 @@ union yyalloc
#endif
/* YYFINAL -- State number of the termination state. */
-#define YYFINAL 148
+#define YYFINAL 149
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1137
+#define YYLAST 1237
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 82
+#define YYNTOKENS 83
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 33
+#define YYNNTS 40
/* YYNRULES -- Number of rules. */
-#define YYNRULES 212
+#define YYNRULES 222
/* YYNRULES -- Number of states. */
-#define YYNSTATES 329
+#define YYNSTATES 341
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
-#define YYMAXUTOK 312
+#define YYMAXUTOK 313
#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -447,16 +458,16 @@ static const unsigned char yytranslate[] =
0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 75, 2, 2, 2, 63, 49, 2,
- 69, 78, 61, 59, 41, 60, 67, 62, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 81, 2,
+ 2, 2, 2, 76, 2, 2, 2, 63, 49, 2,
+ 69, 79, 61, 59, 41, 60, 67, 62, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 82, 2,
52, 43, 53, 44, 58, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 68, 2, 77, 48, 2, 2, 2, 2, 2,
+ 2, 68, 2, 78, 48, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 79, 47, 80, 76, 2, 2, 2,
+ 2, 2, 2, 80, 47, 81, 77, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -475,7 +486,7 @@ static const unsigned char yytranslate[] =
25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
35, 36, 37, 38, 39, 40, 42, 45, 46, 50,
51, 54, 55, 56, 57, 64, 65, 66, 70, 71,
- 72, 73, 74
+ 72, 73, 74, 75
};
#if YYDEBUG
@@ -493,119 +504,124 @@ static const unsigned short yyprhs[] =
244, 246, 248, 253, 261, 269, 277, 285, 287, 290,
292, 294, 296, 298, 300, 304, 307, 311, 315, 320,
326, 328, 331, 333, 336, 338, 339, 343, 345, 347,
- 349, 350, 352, 355, 357, 360, 362, 366, 369, 371,
- 374, 376, 379, 383, 386, 390, 392, 394, 396, 398,
- 400, 403, 407, 410, 414, 418, 422, 425, 428, 432,
- 437, 441, 445, 450, 454, 459, 463, 468, 471, 475,
- 478, 482, 485, 489, 491, 494, 497, 500, 503, 506,
- 509, 511, 514, 516, 522, 525, 528, 530, 532, 534,
- 536, 538, 542, 544, 549, 552, 555, 557, 559, 561,
- 564, 567, 572, 577, 580, 583, 586, 589, 592, 595,
- 598, 601, 604, 607, 610, 613, 616, 619, 622, 625,
- 628, 631, 634, 637, 640, 643, 646, 649, 652, 655,
- 658, 662, 666, 669, 671, 673, 675, 677, 679, 681,
- 683, 685, 687
+ 349, 350, 351, 356, 357, 361, 363, 366, 368, 371,
+ 373, 375, 379, 382, 384, 387, 389, 392, 396, 399,
+ 403, 405, 407, 409, 411, 413, 416, 420, 423, 427,
+ 431, 435, 438, 441, 445, 450, 454, 458, 463, 467,
+ 472, 476, 481, 484, 488, 491, 495, 498, 502, 504,
+ 507, 510, 513, 516, 519, 522, 524, 527, 529, 535,
+ 538, 541, 543, 545, 547, 549, 551, 555, 557, 561,
+ 563, 566, 569, 570, 573, 576, 579, 581, 583, 585,
+ 588, 591, 596, 601, 604, 607, 610, 613, 616, 619,
+ 622, 625, 628, 631, 634, 637, 640, 643, 646, 649,
+ 652, 655, 658, 661, 664, 667, 670, 673, 676, 679,
+ 682, 686, 690, 693, 695, 697, 699, 701, 703, 705,
+ 707, 709, 711
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yysigned_char yyrhs[] =
{
- 83, 0, -1, 85, -1, 84, -1, 105, -1, 86,
- -1, 85, 41, 86, -1, 61, 86, -1, 49, 86,
- -1, 60, 86, -1, 59, 86, -1, 75, 86, -1,
- 76, 86, -1, 65, 86, -1, 64, 86, -1, 86,
- 65, -1, 86, 64, -1, 18, 86, -1, 86, 72,
- 113, -1, 86, 72, 113, 10, -1, 86, 72, 10,
- -1, 86, 72, 95, -1, 86, 71, 86, -1, 86,
- 67, 113, -1, 86, 67, 113, 10, -1, 86, 67,
- 10, -1, 86, 67, 95, -1, 86, 70, 86, -1,
- 86, 68, 85, 77, -1, -1, 86, 69, 87, 90,
- 78, -1, -1, 9, 69, 88, 90, 78, -1, 79,
- -1, -1, 86, -1, 90, 41, 86, -1, 86, 69,
- 108, 78, 97, -1, 80, -1, 89, 90, 91, -1,
- 89, 105, 91, 86, -1, 69, 105, 78, 86, -1,
- 69, 85, 78, -1, 86, 58, 86, -1, 86, 61,
- 86, -1, 86, 62, 86, -1, 86, 63, 86, -1,
- 86, 59, 86, -1, 86, 60, 86, -1, 86, 57,
- 86, -1, 86, 56, 86, -1, 86, 51, 86, -1,
- 86, 50, 86, -1, 86, 55, 86, -1, 86, 54,
- 86, -1, 86, 52, 86, -1, 86, 53, 86, -1,
- 86, 49, 86, -1, 86, 48, 86, -1, 86, 47,
- 86, -1, 86, 46, 86, -1, 86, 45, 86, -1,
- 86, 44, 86, 81, 86, -1, 86, 43, 86, -1,
- 86, 38, 86, -1, 3, -1, 7, -1, 12, -1,
- 4, -1, 5, -1, 94, -1, 37, -1, 18, 69,
- 105, 78, -1, 25, 52, 105, 53, 69, 86, 78,
- -1, 27, 52, 105, 53, 69, 86, 78, -1, 26,
- 52, 105, 53, 69, 86, 78, -1, 28, 52, 105,
- 53, 69, 86, 78, -1, 6, -1, 92, 6, -1,
- 92, -1, 39, -1, 40, -1, 73, -1, 74, -1,
- 93, 20, 113, -1, 114, 29, -1, 93, 20, 113,
- -1, 11, 20, 113, -1, 11, 20, 76, 113, -1,
- 11, 20, 113, 20, 113, -1, 95, -1, 20, 114,
- -1, 114, -1, 58, 8, -1, 111, -1, -1, 97,
- 96, 97, -1, 98, -1, 111, -1, 99, -1, -1,
- 61, -1, 61, 101, -1, 49, -1, 49, 101, -1,
- 102, -1, 69, 101, 78, -1, 102, 103, -1, 103,
- -1, 102, 104, -1, 104, -1, 68, 77, -1, 68,
- 3, 77, -1, 69, 78, -1, 69, 108, 78, -1,
- 109, -1, 11, -1, 33, -1, 31, -1, 32, -1,
- 31, 33, -1, 31, 30, 33, -1, 31, 30, -1,
- 30, 31, 33, -1, 19, 31, 33, -1, 31, 19,
- 33, -1, 31, 19, -1, 31, 31, -1, 31, 31,
- 33, -1, 31, 31, 30, 33, -1, 31, 31, 30,
- -1, 30, 31, 31, -1, 30, 31, 31, 33, -1,
- 19, 31, 31, -1, 19, 31, 31, 33, -1, 31,
- 31, 19, -1, 31, 31, 19, 33, -1, 32, 33,
- -1, 32, 30, 33, -1, 32, 30, -1, 19, 32,
- 33, -1, 32, 19, -1, 32, 19, 33, -1, 36,
- -1, 31, 36, -1, 14, 113, -1, 15, 113, -1,
- 16, 113, -1, 17, 113, -1, 19, 107, -1, 19,
- -1, 30, 107, -1, 30, -1, 21, 113, 52, 105,
- 53, -1, 99, 106, -1, 106, 99, -1, 11, -1,
- 33, -1, 31, -1, 32, -1, 105, -1, 108, 41,
- 105, -1, 106, -1, 109, 100, 101, 100, -1, 34,
- 35, -1, 35, 34, -1, 110, -1, 34, -1, 35,
- -1, 13, 23, -1, 13, 24, -1, 13, 23, 68,
- 77, -1, 13, 24, 68, 77, -1, 13, 59, -1,
- 13, 60, -1, 13, 61, -1, 13, 62, -1, 13,
- 63, -1, 13, 48, -1, 13, 49, -1, 13, 47,
- -1, 13, 76, -1, 13, 75, -1, 13, 43, -1,
- 13, 52, -1, 13, 53, -1, 13, 38, -1, 13,
- 57, -1, 13, 56, -1, 13, 51, -1, 13, 50,
- -1, 13, 55, -1, 13, 54, -1, 13, 46, -1,
- 13, 45, -1, 13, 65, -1, 13, 64, -1, 13,
- 41, -1, 13, 71, -1, 13, 72, -1, 13, 69,
- 78, -1, 13, 68, 77, -1, 13, 109, -1, 8,
- -1, 73, -1, 11, -1, 12, -1, 9, -1, 112,
- -1, 8, -1, 73, -1, 112, -1, 9, -1
+ 84, 0, -1, 86, -1, 85, -1, 110, -1, 87,
+ -1, 86, 41, 87, -1, 61, 87, -1, 49, 87,
+ -1, 60, 87, -1, 59, 87, -1, 76, 87, -1,
+ 77, 87, -1, 65, 87, -1, 64, 87, -1, 87,
+ 65, -1, 87, 64, -1, 18, 87, -1, 87, 72,
+ 121, -1, 87, 72, 121, 10, -1, 87, 72, 10,
+ -1, 87, 72, 96, -1, 87, 71, 87, -1, 87,
+ 67, 121, -1, 87, 67, 121, 10, -1, 87, 67,
+ 10, -1, 87, 67, 96, -1, 87, 70, 87, -1,
+ 87, 68, 86, 78, -1, -1, 87, 69, 88, 91,
+ 79, -1, -1, 9, 69, 89, 91, 79, -1, 80,
+ -1, -1, 87, -1, 91, 41, 87, -1, 87, 69,
+ 113, 79, 98, -1, 81, -1, 90, 91, 92, -1,
+ 90, 110, 92, 87, -1, 69, 110, 79, 87, -1,
+ 69, 86, 79, -1, 87, 58, 87, -1, 87, 61,
+ 87, -1, 87, 62, 87, -1, 87, 63, 87, -1,
+ 87, 59, 87, -1, 87, 60, 87, -1, 87, 57,
+ 87, -1, 87, 56, 87, -1, 87, 51, 87, -1,
+ 87, 50, 87, -1, 87, 55, 87, -1, 87, 54,
+ 87, -1, 87, 52, 87, -1, 87, 53, 87, -1,
+ 87, 49, 87, -1, 87, 48, 87, -1, 87, 47,
+ 87, -1, 87, 46, 87, -1, 87, 45, 87, -1,
+ 87, 44, 87, 82, 87, -1, 87, 43, 87, -1,
+ 87, 38, 87, -1, 3, -1, 7, -1, 12, -1,
+ 4, -1, 5, -1, 95, -1, 37, -1, 18, 69,
+ 110, 79, -1, 25, 52, 110, 53, 69, 87, 79,
+ -1, 27, 52, 110, 53, 69, 87, 79, -1, 26,
+ 52, 110, 53, 69, 87, 79, -1, 28, 52, 110,
+ 53, 69, 87, 79, -1, 6, -1, 93, 6, -1,
+ 93, -1, 39, -1, 40, -1, 73, -1, 74, -1,
+ 94, 20, 121, -1, 122, 29, -1, 94, 20, 121,
+ -1, 11, 20, 121, -1, 11, 20, 77, 121, -1,
+ 11, 20, 121, 20, 121, -1, 96, -1, 20, 122,
+ -1, 122, -1, 58, 8, -1, 119, -1, -1, 98,
+ 97, 98, -1, 99, -1, 119, -1, 100, -1, -1,
+ -1, 102, 61, 103, 101, -1, -1, 61, 104, 101,
+ -1, 49, -1, 49, 102, -1, 102, -1, 105, 107,
+ -1, 105, -1, 107, -1, 69, 106, 79, -1, 107,
+ 108, -1, 108, -1, 107, 109, -1, 109, -1, 68,
+ 78, -1, 68, 3, 78, -1, 69, 79, -1, 69,
+ 113, 79, -1, 115, -1, 11, -1, 33, -1, 31,
+ -1, 32, -1, 31, 33, -1, 31, 30, 33, -1,
+ 31, 30, -1, 30, 31, 33, -1, 19, 31, 33,
+ -1, 31, 19, 33, -1, 31, 19, -1, 31, 31,
+ -1, 31, 31, 33, -1, 31, 31, 30, 33, -1,
+ 31, 31, 30, -1, 30, 31, 31, -1, 30, 31,
+ 31, 33, -1, 19, 31, 31, -1, 19, 31, 31,
+ 33, -1, 31, 31, 19, -1, 31, 31, 19, 33,
+ -1, 32, 33, -1, 32, 30, 33, -1, 32, 30,
+ -1, 19, 32, 33, -1, 32, 19, -1, 32, 19,
+ 33, -1, 36, -1, 31, 36, -1, 14, 121, -1,
+ 15, 121, -1, 16, 121, -1, 17, 121, -1, 19,
+ 112, -1, 19, -1, 30, 112, -1, 30, -1, 21,
+ 121, 52, 110, 53, -1, 100, 111, -1, 111, 100,
+ -1, 11, -1, 33, -1, 31, -1, 32, -1, 114,
+ -1, 114, 41, 75, -1, 110, -1, 114, 41, 110,
+ -1, 111, -1, 115, 106, -1, 111, 117, -1, -1,
+ 102, 117, -1, 34, 35, -1, 35, 34, -1, 118,
+ -1, 34, -1, 35, -1, 13, 23, -1, 13, 24,
+ -1, 13, 23, 68, 78, -1, 13, 24, 68, 78,
+ -1, 13, 59, -1, 13, 60, -1, 13, 61, -1,
+ 13, 62, -1, 13, 63, -1, 13, 48, -1, 13,
+ 49, -1, 13, 47, -1, 13, 77, -1, 13, 76,
+ -1, 13, 43, -1, 13, 52, -1, 13, 53, -1,
+ 13, 38, -1, 13, 57, -1, 13, 56, -1, 13,
+ 51, -1, 13, 50, -1, 13, 55, -1, 13, 54,
+ -1, 13, 46, -1, 13, 45, -1, 13, 65, -1,
+ 13, 64, -1, 13, 41, -1, 13, 71, -1, 13,
+ 72, -1, 13, 69, 79, -1, 13, 68, 78, -1,
+ 13, 116, -1, 8, -1, 73, -1, 11, -1, 12,
+ -1, 9, -1, 120, -1, 8, -1, 73, -1, 120,
+ -1, 9, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const unsigned short yyrline[] =
{
- 0, 250, 250, 251, 254, 261, 262, 267, 271, 275,
- 279, 283, 287, 291, 295, 299, 303, 307, 311, 317,
- 324, 334, 342, 346, 352, 359, 369, 377, 381, 388,
- 385, 396, 395, 418, 422, 425, 429, 433, 445, 448,
- 455, 461, 467, 473, 477, 481, 485, 489, 493, 497,
- 501, 505, 509, 513, 517, 521, 525, 529, 533, 537,
- 541, 545, 549, 553, 557, 563, 570, 579, 590, 597,
- 604, 607, 613, 623, 629, 635, 641, 650, 667, 685,
- 719, 726, 735, 743, 749, 759, 774, 789, 804, 828,
- 837, 838, 866, 920, 926, 927, 930, 933, 934, 938,
- 939, 942, 944, 946, 948, 950, 953, 955, 960, 967,
- 969, 973, 975, 979, 981, 993, 997, 999, 1003, 1007,
- 1011, 1015, 1019, 1023, 1027, 1031, 1035, 1039, 1043, 1047,
- 1051, 1055, 1059, 1063, 1067, 1071, 1075, 1079, 1083, 1087,
- 1091, 1095, 1099, 1103, 1107, 1111, 1114, 1117, 1120, 1123,
- 1127, 1131, 1135, 1142, 1146, 1148, 1152, 1153, 1161, 1169,
- 1180, 1185, 1192, 1193, 1197, 1198, 1201, 1205, 1207, 1211,
- 1213, 1215, 1217, 1219, 1221, 1223, 1225, 1227, 1229, 1231,
- 1233, 1235, 1237, 1239, 1241, 1243, 1245, 1285, 1287, 1289,
- 1291, 1293, 1295, 1297, 1299, 1301, 1303, 1305, 1307, 1309,
- 1311, 1313, 1315, 1330, 1331, 1332, 1333, 1334, 1335, 1338,
- 1339, 1347, 1355
+ 0, 263, 263, 264, 267, 274, 275, 280, 284, 288,
+ 292, 296, 300, 304, 308, 312, 316, 320, 324, 330,
+ 337, 347, 355, 359, 365, 372, 382, 390, 394, 401,
+ 398, 409, 408, 431, 435, 438, 442, 446, 464, 467,
+ 474, 480, 486, 492, 496, 500, 504, 508, 512, 516,
+ 520, 524, 528, 532, 536, 540, 544, 548, 552, 556,
+ 560, 564, 568, 572, 576, 582, 589, 598, 609, 616,
+ 623, 626, 632, 642, 648, 654, 660, 669, 686, 704,
+ 738, 745, 754, 762, 768, 778, 793, 815, 830, 854,
+ 863, 864, 892, 946, 950, 951, 954, 957, 958, 962,
+ 963, 968, 967, 971, 970, 973, 975, 979, 988, 990,
+ 991, 994, 996, 1003, 1010, 1016, 1023, 1025, 1029, 1031,
+ 1043, 1047, 1049, 1053, 1057, 1061, 1065, 1069, 1073, 1077,
+ 1081, 1085, 1089, 1093, 1097, 1101, 1105, 1109, 1113, 1117,
+ 1121, 1125, 1129, 1133, 1137, 1141, 1145, 1149, 1153, 1157,
+ 1161, 1164, 1167, 1170, 1173, 1177, 1181, 1185, 1192, 1196,
+ 1198, 1202, 1203, 1211, 1219, 1230, 1232, 1241, 1247, 1254,
+ 1255, 1262, 1266, 1267, 1270, 1271, 1274, 1278, 1280, 1284,
+ 1286, 1288, 1290, 1292, 1294, 1296, 1298, 1300, 1302, 1304,
+ 1306, 1308, 1310, 1312, 1314, 1316, 1318, 1358, 1360, 1362,
+ 1364, 1366, 1368, 1370, 1372, 1374, 1376, 1378, 1380, 1382,
+ 1384, 1386, 1388, 1403, 1404, 1405, 1406, 1407, 1408, 1411,
+ 1412, 1420, 1428
};
#endif
@@ -625,15 +641,18 @@ static const char *const yytname[] =
"OROR", "ANDAND", "'|'", "'^'", "'&'", "NOTEQUAL", "EQUAL", "'<'", "'>'",
"GEQ", "LEQ", "RSH", "LSH", "'@'", "'+'", "'-'", "'*'", "'/'", "'%'",
"DECREMENT", "INCREMENT", "UNARY", "'.'", "'['", "'('", "DOT_STAR",
- "ARROW_STAR", "ARROW", "BLOCKNAME", "FILENAME", "'!'", "'~'", "']'",
- "')'", "'{'", "'}'", "':'", "$accept", "start", "type_exp", "exp1",
- "exp", "@1", "@2", "lcurly", "arglist", "rcurly", "string_exp", "block",
- "variable", "qualified_name", "space_identifier", "const_or_volatile",
- "cv_with_space_id", "const_or_volatile_or_space_identifier_noopt",
- "const_or_volatile_or_space_identifier", "abs_decl", "direct_abs_decl",
- "array_mod", "func_mod", "type", "typebase", "typename",
- "nonempty_typelist", "ptype", "const_and_volatile",
- "const_or_volatile_noopt", "operator", "name", "name_not_typename", 0
+ "ARROW_STAR", "ARROW", "BLOCKNAME", "FILENAME", "DOTDOTDOT", "'!'",
+ "'~'", "']'", "')'", "'{'", "'}'", "':'", "$accept", "start", "type_exp",
+ "exp1", "exp", "@1", "@2", "lcurly", "arglist", "rcurly", "string_exp",
+ "block", "variable", "qualified_name", "space_identifier",
+ "const_or_volatile", "cv_with_space_id",
+ "const_or_volatile_or_space_identifier_noopt",
+ "const_or_volatile_or_space_identifier", "ptr_operator", "@3", "@4",
+ "ptr_operator_ts", "abs_decl", "direct_abs_decl", "array_mod",
+ "func_mod", "type", "typebase", "typename", "parameter_typelist",
+ "nonempty_typelist", "ptype", "conversion_type_id",
+ "conversion_declarator", "const_and_volatile", "const_or_volatile_noopt",
+ "operator", "name", "name_not_typename", 0
};
#endif
@@ -649,36 +668,37 @@ static const unsigned short yytoknum[] =
295, 44, 296, 61, 63, 297, 298, 124, 94, 38,
299, 300, 60, 62, 301, 302, 303, 304, 64, 43,
45, 42, 47, 37, 305, 306, 307, 46, 91, 40,
- 308, 309, 310, 311, 312, 33, 126, 93, 41, 123,
- 125, 58
+ 308, 309, 310, 311, 312, 313, 33, 126, 93, 41,
+ 123, 125, 58
};
# endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const unsigned char yyr1[] =
{
- 0, 82, 83, 83, 84, 85, 85, 86, 86, 86,
- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
- 86, 86, 86, 86, 86, 86, 86, 86, 86, 87,
- 86, 88, 86, 89, 90, 90, 90, 86, 91, 86,
- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
- 86, 86, 86, 86, 86, 86, 86, 92, 92, 86,
- 86, 86, 93, 93, 93, 94, 94, 95, 95, 95,
- 94, 94, 94, 96, 97, 97, 98, 99, 99, 100,
- 100, 101, 101, 101, 101, 101, 102, 102, 102, 102,
- 102, 103, 103, 104, 104, 105, 106, 106, 106, 106,
- 106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
- 106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
- 106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
- 106, 106, 106, 106, 106, 106, 107, 107, 107, 107,
- 108, 108, 109, 109, 110, 110, 111, 111, 111, 112,
- 112, 112, 112, 112, 112, 112, 112, 112, 112, 112,
- 112, 112, 112, 112, 112, 112, 112, 112, 112, 112,
- 112, 112, 112, 112, 112, 112, 112, 112, 112, 112,
- 112, 112, 112, 113, 113, 113, 113, 113, 113, 114,
- 114, 114, 114
+ 0, 83, 84, 84, 85, 86, 86, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 88,
+ 87, 89, 87, 90, 91, 91, 91, 87, 92, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 93, 93, 87,
+ 87, 87, 94, 94, 94, 95, 95, 96, 96, 96,
+ 95, 95, 95, 97, 98, 98, 99, 100, 100, 101,
+ 101, 103, 102, 104, 102, 102, 102, 105, 106, 106,
+ 106, 107, 107, 107, 107, 107, 108, 108, 109, 109,
+ 110, 111, 111, 111, 111, 111, 111, 111, 111, 111,
+ 111, 111, 111, 111, 111, 111, 111, 111, 111, 111,
+ 111, 111, 111, 111, 111, 111, 111, 111, 111, 111,
+ 111, 111, 111, 111, 111, 111, 111, 111, 111, 111,
+ 111, 112, 112, 112, 112, 113, 113, 114, 114, 115,
+ 115, 116, 117, 117, 118, 118, 119, 119, 119, 120,
+ 120, 120, 120, 120, 120, 120, 120, 120, 120, 120,
+ 120, 120, 120, 120, 120, 120, 120, 120, 120, 120,
+ 120, 120, 120, 120, 120, 120, 120, 120, 120, 120,
+ 120, 120, 120, 121, 121, 121, 121, 121, 121, 122,
+ 122, 122, 122
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -694,13 +714,14 @@ static const unsigned char yyr2[] =
1, 1, 4, 7, 7, 7, 7, 1, 2, 1,
1, 1, 1, 1, 3, 2, 3, 3, 4, 5,
1, 2, 1, 2, 1, 0, 3, 1, 1, 1,
- 0, 1, 2, 1, 2, 1, 3, 2, 1, 2,
- 1, 2, 3, 2, 3, 1, 1, 1, 1, 1,
- 2, 3, 2, 3, 3, 3, 2, 2, 3, 4,
- 3, 3, 4, 3, 4, 3, 4, 2, 3, 2,
- 3, 2, 3, 1, 2, 2, 2, 2, 2, 2,
- 1, 2, 1, 5, 2, 2, 1, 1, 1, 1,
- 1, 3, 1, 4, 2, 2, 1, 1, 1, 2,
+ 0, 0, 4, 0, 3, 1, 2, 1, 2, 1,
+ 1, 3, 2, 1, 2, 1, 2, 3, 2, 3,
+ 1, 1, 1, 1, 1, 2, 3, 2, 3, 3,
+ 3, 2, 2, 3, 4, 3, 3, 4, 3, 4,
+ 3, 4, 2, 3, 2, 3, 2, 3, 1, 2,
+ 2, 2, 2, 2, 2, 1, 2, 1, 5, 2,
+ 2, 1, 1, 1, 1, 1, 3, 1, 3, 1,
+ 2, 2, 0, 2, 2, 2, 1, 1, 1, 2,
2, 4, 4, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -713,337 +734,361 @@ static const unsigned char yyr2[] =
means the default is an error. */
static const unsigned char yydefact[] =
{
- 95, 65, 68, 69, 77, 66, 209, 212, 116, 67,
- 95, 0, 0, 0, 0, 0, 150, 0, 0, 0,
- 0, 0, 0, 152, 118, 119, 117, 167, 168, 143,
+ 95, 65, 68, 69, 77, 66, 219, 222, 121, 67,
+ 95, 0, 0, 0, 0, 0, 155, 0, 0, 0,
+ 0, 0, 0, 157, 123, 124, 122, 177, 178, 148,
71, 80, 81, 0, 0, 0, 0, 0, 0, 95,
- 210, 83, 0, 0, 33, 0, 3, 2, 5, 34,
- 79, 0, 70, 90, 0, 97, 95, 4, 162, 115,
- 166, 98, 211, 92, 31, 0, 116, 169, 170, 186,
- 197, 183, 194, 193, 180, 178, 179, 190, 189, 184,
- 185, 192, 191, 188, 187, 173, 174, 175, 176, 177,
- 196, 195, 0, 0, 198, 199, 182, 181, 202, 203,
- 207, 205, 206, 204, 208, 145, 146, 147, 148, 0,
- 95, 17, 156, 158, 159, 157, 149, 212, 210, 91,
- 0, 95, 95, 95, 95, 158, 159, 151, 126, 122,
- 127, 120, 144, 141, 139, 137, 164, 165, 8, 10,
- 9, 7, 14, 13, 0, 0, 11, 12, 1, 0,
+ 220, 83, 0, 0, 33, 0, 3, 2, 5, 34,
+ 79, 0, 70, 90, 0, 97, 95, 4, 169, 120,
+ 176, 98, 221, 92, 31, 0, 121, 179, 180, 196,
+ 207, 193, 204, 203, 190, 188, 189, 200, 199, 194,
+ 195, 202, 201, 198, 197, 183, 184, 185, 186, 187,
+ 206, 205, 0, 0, 208, 209, 192, 191, 172, 212,
+ 213, 217, 215, 216, 214, 218, 150, 151, 152, 153,
+ 0, 95, 17, 161, 163, 164, 162, 154, 222, 220,
+ 91, 0, 95, 95, 95, 95, 163, 164, 156, 131,
+ 127, 132, 125, 149, 146, 144, 142, 174, 175, 8,
+ 10, 9, 7, 14, 13, 0, 0, 11, 12, 1,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 16, 15, 0, 0, 29, 0, 0, 0,
- 35, 0, 0, 78, 0, 0, 95, 154, 155, 99,
- 0, 85, 34, 0, 87, 0, 0, 201, 200, 0,
- 133, 124, 140, 95, 0, 0, 0, 0, 131, 123,
- 125, 121, 135, 130, 128, 142, 138, 42, 0, 6,
- 64, 63, 0, 61, 60, 59, 58, 57, 52, 51,
- 55, 56, 54, 53, 50, 49, 43, 47, 48, 44,
- 45, 46, 25, 205, 26, 23, 0, 34, 160, 0,
- 27, 22, 20, 21, 18, 0, 38, 39, 0, 86,
- 93, 96, 94, 103, 101, 0, 95, 100, 105, 108,
- 110, 0, 88, 0, 171, 172, 72, 134, 0, 0,
- 0, 0, 0, 132, 136, 129, 41, 0, 24, 28,
- 0, 95, 95, 19, 36, 40, 104, 102, 0, 111,
- 113, 0, 0, 163, 95, 107, 109, 32, 89, 153,
- 0, 0, 0, 0, 62, 30, 161, 37, 112, 106,
- 114, 0, 0, 0, 0, 73, 75, 74, 76
+ 0, 0, 0, 16, 15, 0, 0, 29, 0, 0,
+ 0, 35, 0, 0, 78, 0, 0, 95, 159, 160,
+ 105, 103, 0, 95, 107, 109, 170, 110, 113, 115,
+ 85, 34, 0, 87, 0, 0, 211, 210, 172, 171,
+ 0, 138, 129, 145, 95, 0, 0, 0, 0, 136,
+ 128, 130, 126, 140, 135, 133, 147, 143, 42, 0,
+ 6, 64, 63, 0, 61, 60, 59, 58, 57, 52,
+ 51, 55, 56, 54, 53, 50, 49, 43, 47, 48,
+ 44, 45, 46, 25, 215, 26, 23, 0, 34, 167,
+ 0, 165, 27, 22, 20, 21, 18, 0, 38, 39,
+ 0, 86, 93, 96, 94, 106, 100, 0, 116, 118,
+ 0, 0, 101, 108, 95, 112, 114, 0, 88, 0,
+ 181, 182, 101, 173, 72, 139, 0, 0, 0, 0,
+ 0, 137, 141, 134, 41, 0, 24, 28, 0, 95,
+ 95, 19, 36, 40, 99, 104, 117, 111, 119, 100,
+ 32, 89, 158, 0, 0, 0, 0, 62, 30, 37,
+ 166, 168, 102, 0, 0, 0, 0, 73, 75, 74,
+ 76
};
/* YYDEFGOTO[NTERM-NUM]. */
static const short yydefgoto[] =
{
- -1, 45, 46, 144, 48, 247, 192, 49, 181, 257,
- 50, 51, 52, 53, 186, 54, 55, 56, 190, 267,
- 268, 269, 270, 248, 58, 116, 302, 59, 60, 61,
- 62, 105, 63
+ -1, 45, 46, 145, 48, 258, 201, 49, 182, 269,
+ 50, 51, 52, 53, 187, 54, 55, 56, 315, 194,
+ 319, 276, 195, 196, 197, 198, 199, 259, 58, 117,
+ 281, 261, 59, 99, 209, 60, 61, 62, 106, 63
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -178
+#define YYPACT_NINF -187
static const short yypact[] =
{
- 373, -178, -178, -178, -178, -178, -178, -43, 22, -178,
- 593, 101, 101, 101, 101, 209, 148, 45, 101, 0,
- 31, 34, 55, 219, 226, 48, -178, 39, 123, -178,
- -178, -178, -178, 450, 450, 450, 450, 450, 450, 373,
- 140, -178, 450, 450, -178, 161, -178, 131, 855, 296,
- 158, 151, -178, -178, 118, -178, 554, -178, 37, 362,
- -178, 124, -178, 154, -178, 24, -178, 127, 155, -178,
- -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
- -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
- -178, -178, 111, 141, -178, -178, -178, -178, 362, -178,
- -178, -178, -178, -178, -178, -178, -178, -178, -178, 22,
- 373, 1065, -178, 63, 191, -178, -178, -178, -178, -178,
- 173, 554, 554, 554, 554, 136, -178, -178, 193, 195,
- 54, -178, -178, 198, 200, -178, -178, -178, 1065, 1065,
- 1065, 1065, 1065, 1065, -10, 163, 1065, 1065, -178, 450,
- 450, 450, 450, 450, 450, 450, 450, 450, 450, 450,
- 450, 450, 450, 450, 450, 450, 450, 450, 450, 450,
- 450, 450, -178, -178, 93, 450, 656, 450, 450, 120,
- 855, -25, 159, -178, 101, 234, 81, 37, -178, -178,
- 290, -178, 450, 101, 224, 170, 177, -178, -178, 182,
- 222, -178, -178, 554, 210, 212, 213, 218, 242, -178,
- -178, -178, 243, 244, -178, -178, -178, -178, 450, 855,
- 855, 855, 672, 911, 937, 962, 986, 1009, 1030, 1030,
- 637, 637, 637, 637, 433, 433, 1044, 1056, 1056, 1065,
- 1065, 1065, -178, 22, -178, 269, 16, 450, -178, -3,
- 130, 130, -178, -178, 270, 450, -178, -178, 450, 261,
- -178, -178, -178, -44, 52, 11, 30, 37, 58, -178,
- -178, -2, -178, 101, -178, -178, 527, -178, 233, 220,
- 221, 225, 237, -178, -178, -178, 1065, 450, -178, -178,
- 2, 554, 81, -178, 855, 1065, -178, -178, 214, -178,
- -178, 215, 7, -178, 175, -178, -178, -178, -178, -178,
- 450, 450, 450, 450, 884, -178, -178, -178, -178, -178,
- -178, 711, 747, 783, 819, -178, -178, -178, -178
+ 388, -187, -187, -187, -187, -187, -187, -43, 32, -187,
+ 670, 56, 56, 56, 56, 197, 52, 16, 56, -19,
+ -16, 10, 19, 100, 84, 88, -187, 45, 47, -187,
+ -187, -187, -187, 466, 466, 466, 466, 466, 466, 388,
+ 72, -187, 466, 466, -187, 87, -187, 65, 964, 310,
+ 103, 92, -187, -187, 61, -187, 1108, -187, 24, 113,
+ -187, 64, -187, 101, -187, 31, -187, 93, 97, -187,
+ -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+ -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+ -187, -187, 91, 94, -187, -187, -187, -187, 44, -187,
+ -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+ 32, 388, 449, -187, 55, 138, -187, -187, -187, -187,
+ -187, 127, 1108, 1108, 1108, 1108, 135, -187, -187, 152,
+ 155, 159, -187, -187, 162, 163, -187, -187, -187, 449,
+ 449, 449, 449, 449, 449, -6, 114, 449, 449, -187,
+ 466, 466, 466, 466, 466, 466, 466, 466, 466, 466,
+ 466, 466, 466, 466, 466, 466, 466, 466, 466, 466,
+ 466, 466, 466, -187, -187, 37, 466, 760, 466, 466,
+ 86, 964, -9, 117, -187, 56, 191, 20, 24, -187,
+ 146, -187, 13, 611, 150, 115, -187, 122, -187, -187,
+ -187, 466, 56, 192, 140, 141, -187, -187, 67, -187,
+ 134, 187, -187, -187, 1108, 168, 173, 180, 182, 205,
+ -187, -187, -187, 206, 207, -187, -187, -187, -187, 466,
+ 964, 964, 964, 776, 1020, 1046, 1097, 1121, 1144, 1165,
+ 1165, 606, 606, 606, 606, 234, 234, 293, 371, 371,
+ 449, 449, 449, -187, 32, -187, 231, 12, 466, -187,
+ 165, 201, 160, 160, -187, -187, 235, 466, -187, -187,
+ 466, 227, -187, -187, -187, 150, 24, 171, -187, -187,
+ 172, 174, -187, 122, 571, -187, -187, -4, -187, 56,
+ -187, -187, -187, -187, 544, -187, 210, 181, 185, 190,
+ 195, -187, -187, -187, 449, 466, -187, -187, -3, 20,
+ 734, -187, 964, 449, -187, -187, -187, -187, -187, 24,
+ -187, -187, -187, 466, 466, 466, 466, 993, -187, -187,
+ -187, -187, -187, 816, 853, 890, 927, -187, -187, -187,
+ -187
};
/* YYPGOTO[NTERM-NUM]. */
static const short yypgoto[] =
{
- -178, -178, -178, 10, -15, -178, -178, -178, -177, 105,
- -178, -178, -178, -97, -178, -175, -178, -29, 51, -174,
- -178, 57, 66, 1, 263, 297, 162, 327, -178, -173,
- -9, -6, 323
+ -187, -187, -187, 11, -15, -187, -187, -187, -184, 77,
+ -187, -187, -187, -119, -187, -186, -187, -28, -54, -32,
+ -187, -187, -187, 74, 73, -183, -182, 2, 21, 246,
+ 95, -187, -187, -187, 68, -187, -175, -8, -5, 258
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
positive, shift that token. If negative, reduce the rule which
number is the opposite. If zero, do what YYDEFACT says.
If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF -101
+#define YYTABLE_NINF -96
static const short yytable[] =
{
- 111, 57, 104, 104, 104, 104, 106, 107, 108, 104,
- 47, 261, 120, 262, 298, 271, 255, 264, 138, 139,
- 140, 141, 142, 143, 265, 266, 64, 146, 147, 188,
- 189, 149, 99, 100, 180, 101, 102, 10, 291, 255,
- 145, 66, 65, 255, 11, 12, 13, 14, 291, 16,
- 182, 18, 121, 6, 117, 256, 104, 149, 10, 194,
- 23, 24, 25, 26, 27, 28, 29, 133, 217, 189,
- 290, 27, 28, 212, 136, 292, 307, 244, 134, 263,
- 315, 135, 253, 122, 213, 320, 123, 214, 299, 296,
- 297, 264, 301, 289, 200, -95, 201, 103, 265, 266,
- 193, 99, 100, 242, 243, 102, 10, 124, 300, 99,
- 100, 199, 101, 102, 10, 27, 28, 317, 118, 262,
- 265, 266, 204, 205, 206, 207, 265, 304, 99, 100,
- 252, 243, 102, 10, 219, 220, 221, 222, 223, 224,
- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
- 235, 236, 237, 238, 239, 240, 241, 137, 188, 112,
- -82, 148, 250, 251, 183, 104, 103, 208, 245, 209,
- 104, 184, 149, 254, 103, 104, 185, 180, 259, 113,
- 114, 115, -94, 191, 104, 246, 66, 272, 197, 11,
- 12, 13, 14, 103, 16, 195, 18, 174, 175, 176,
- 177, 178, 179, 286, 278, 23, 24, 25, 26, 27,
- 28, 29, 1, 2, 3, 4, 5, 6, 7, 198,
- 109, 9, 10, 196, 202, 203, 210, 15, 211, 17,
- 112, 215, 180, 216, 19, 20, 21, 22, 189, 256,
- 294, 218, 260, 295, 273, 128, 30, 274, 31, 32,
- 125, 126, 115, 300, 275, 277, 129, 130, 33, 131,
- 276, 286, 132, 279, 104, 280, 281, 308, 34, 35,
- 36, 282, 314, 37, 38, 283, 284, 285, 110, 288,
- 293, -84, 40, 41, 42, 43, 309, 258, 44, 310,
- 311, 318, 316, 319, 312, 321, 322, 323, 324, 1,
- 2, 3, 4, 5, 6, 7, 313, 8, 9, 10,
- 11, 12, 13, 14, 15, 16, 17, 18, 303, 187,
- 127, 19, 20, 21, 22, 305, 23, 24, 25, 26,
- 27, 28, 29, 30, 306, 31, 32, 98, 249, 263,
- 119, 0, 0, 0, 0, 33, 0, 0, 0, 0,
- 0, 264, 0, 0, -95, 34, 35, 36, 265, 266,
- 37, 38, 0, 0, 0, 39, 0, 0, 0, 40,
- 41, 42, 43, 0, 0, 44, 1, 2, 3, 4,
- 5, 6, 7, 0, 8, 9, 10, 11, 12, 13,
- 14, 15, 16, 17, 18, 0, 27, 28, 19, 20,
- 21, 22, 0, 23, 24, 25, 26, 27, 28, 29,
- 30, -100, 31, 32, 0, 0, 0, 0, 0, 0,
- -95, 0, 33, -100, 0, 0, 0, 0, 0, 0,
- -100, -100, 34, 35, 36, 0, 0, 37, 38, 0,
- 0, 0, 39, 0, 0, 0, 40, 41, 42, 43,
- 0, 0, 44, 1, 2, 3, 4, 5, 6, 7,
- 0, 109, 9, 10, 0, 0, 0, 0, 15, 0,
- 17, 0, 0, 0, 0, 19, 20, 21, 22, 0,
- 0, 0, 0, 0, 0, 0, 0, 30, 0, 31,
- 32, 166, 167, 168, 169, 170, 171, 172, 173, 33,
- 174, 175, 176, 177, 178, 179, 0, 0, 0, 34,
+ 112, 273, 57, 105, 105, 105, 105, 107, 108, 109,
+ 105, 47, 274, 121, 285, 286, 277, 287, 139, 140,
+ 141, 142, 143, 144, 6, 118, 64, 147, 148, 10,
+ 189, 98, 267, 122, 181, 150, 123, 267, 267, 100,
+ 101, 146, 102, 103, 10, 100, 101, 253, 254, 103,
+ 10, 183, 65, 150, 27, 28, 255, 105, 27, 28,
+ 203, 265, 124, 113, 100, 101, 208, 102, 103, 10,
+ 189, 125, 268, 228, 308, 320, 328, 188, 27, 28,
+ 137, 138, -95, 114, 115, 116, 211, 149, 212, 119,
+ 307, 278, -82, 190, 100, 101, 264, 254, 103, 10,
+ 285, 286, -95, 129, 104, 191, 150, 134, 202, 184,
+ 104, 113, 185, 210, 130, 131, 190, 132, 135, 186,
+ 133, 136, -94, 329, 215, 216, 217, 218, 292, 104,
+ 200, 126, 127, 116, 274, 230, 231, 232, 233, 234,
+ 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
+ 245, 246, 247, 248, 249, 250, 251, 252, 275, 104,
+ 189, 204, 190, 262, 263, 205, 219, 105, 220, 206,
+ 256, 213, 105, 207, 191, 266, 208, 105, 223, 214,
+ 271, 192, 193, 192, 193, 221, 181, 257, 222, 224,
+ 192, 284, 225, 229, 105, 226, 227, 288, 268, 272,
+ 1, 2, 3, 4, 5, 6, 7, 191, 110, 9,
+ 10, 282, 289, 294, 304, 15, 296, 17, 290, 291,
+ 295, 297, 19, 20, 21, 22, 298, 175, 176, 177,
+ 178, 179, 180, 299, 30, 300, 31, 32, 301, 302,
+ 303, 306, 310, 181, 309, 311, 33, -84, 314, 316,
+ 323, 317, 312, 318, 324, 313, 34, 35, 36, 325,
+ 270, 37, 38, 322, 326, 332, 111, 280, 283, 128,
+ 40, 41, 260, 42, 43, 120, 293, 44, 0, 304,
+ 0, 105, 0, 0, 321, 0, 0, 0, 0, 0,
+ 327, 314, 167, 168, 169, 170, 171, 172, 173, 174,
+ 0, 175, 176, 177, 178, 179, 180, 0, 333, 334,
+ 335, 336, 331, 1, 2, 3, 4, 5, 6, 7,
+ 0, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+ 17, 18, 0, 0, 0, 19, 20, 21, 22, 0,
+ 23, 24, 25, 26, 27, 28, 29, 30, 0, 31,
+ 32, 0, 168, 169, 170, 171, 172, 173, 174, 33,
+ 175, 176, 177, 178, 179, 180, 0, 0, -95, 34,
35, 36, 0, 0, 37, 38, 0, 0, 0, 39,
- 0, 0, 0, 40, 41, 42, 43, 0, 0, 44,
- 1, 2, 3, 4, 5, 6, 7, 0, 109, 9,
- 10, 0, 0, 0, 0, 15, 0, 17, 0, 0,
- 0, 0, 19, 20, 21, 22, 0, 0, 0, 0,
- 0, 0, 0, 0, 30, 66, 31, 32, 11, 12,
+ 0, 0, 0, 40, 41, 0, 42, 43, 0, 0,
+ 44, 1, 2, 3, 4, 5, 6, 7, 0, 8,
+ 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
+ 0, 0, 0, 19, 20, 21, 22, 0, 23, 24,
+ 25, 26, 27, 28, 29, 30, 0, 31, 32, 0,
+ 0, 0, 170, 171, 172, 173, 174, 33, 175, 176,
+ 177, 178, 179, 180, 0, 0, 0, 34, 35, 36,
+ 0, 0, 37, 38, 0, 0, 0, 39, 0, 0,
+ 0, 40, 41, 0, 42, 43, 0, 0, 44, 1,
+ 2, 3, 4, 5, 6, 7, 0, 110, 9, 10,
+ 0, 0, 0, 0, 15, 0, 17, 0, 0, 0,
+ 0, 19, 20, 21, 22, 0, 0, 0, 0, 0,
+ 0, 0, 0, 30, 0, 31, 32, 0, 0, 0,
+ 0, 0, 0, 173, 174, 33, 175, 176, 177, 178,
+ 179, 180, 0, 0, 0, 34, 35, 36, 0, 0,
+ 37, 38, 0, 0, 0, 39, 0, 0, 0, 40,
+ 41, 0, 42, 43, 0, 0, 44, 1, 2, 3,
+ 4, 5, 6, 7, 0, 110, 9, 10, 0, 0,
+ 0, 0, 15, 0, 17, 0, 0, 0, 0, 19,
+ 20, 21, 22, 0, 0, 0, 0, 0, 0, 0,
+ 0, 30, 66, 31, 32, 11, 12, 13, 14, 0,
+ 16, 0, 18, 0, 0, 0, 0, 0, 0, 0,
+ 0, 23, 24, 25, 26, 27, 28, 29, 37, 38,
+ 0, 0, 0, 39, 0, 0, 0, 40, 41, 0,
+ 42, 43, 66, 0, 44, 11, 12, 13, 14, 0,
+ 16, 0, 18, 0, 0, 0, 0, 0, 0, 0,
+ 0, 23, 24, 25, 26, 27, 28, 29, 0, 0,
+ 279, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 190, 0, 165, 166, 167, 168, 169, 170, 171, 172,
+ 173, 174, 191, 175, 176, 177, 178, 179, 180, 192,
+ 193, 66, 0, 0, 11, 12, 13, 14, 0, 16,
+ 279, 18, 0, 67, 68, 0, 0, 0, 0, 0,
+ 23, 24, 25, 26, 27, 28, 29, 0, 69, 0,
+ 0, 70, 0, 71, 0, 72, 73, 74, 75, 76,
+ 77, 78, 79, 80, 81, 82, 83, 84, 0, 85,
+ 86, 87, 88, 89, 90, 91, 0, 0, 92, 93,
+ 0, 94, 95, 0, 0, 66, 96, 97, 11, 12,
13, 14, 0, 16, 0, 18, 0, 0, 0, 0,
0, 0, 0, 0, 23, 24, 25, 26, 27, 28,
- 29, 37, 38, 0, 0, 0, 39, 0, 0, 0,
- 40, 41, 42, 43, 66, 0, 44, 11, 12, 13,
- 14, 0, 16, 0, 18, 0, 67, 68, 0, 0,
- 0, 0, 0, 23, 24, 25, 26, 27, 28, 29,
- 0, 69, 0, 0, 70, 0, 71, 0, 72, 73,
- 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
- 84, 0, 85, 86, 87, 88, 89, 90, 91, 0,
- 0, 92, 93, 0, 94, 95, 0, 66, 96, 97,
- 11, 12, 13, 14, 0, 16, 0, 18, 0, 0,
- 0, 0, 0, 0, 0, 0, 23, 24, 25, 26,
- 27, 28, 29, 164, 165, 166, 167, 168, 169, 170,
- 171, 172, 173, 0, 174, 175, 176, 177, 178, 179,
- 150, 0, 0, 0, -95, 151, 152, 153, 154, 155,
- 156, 157, 158, 159, 160, 161, 162, 163, 164, 165,
- 166, 167, 168, 169, 170, 171, 172, 173, 0, 174,
- 175, 176, 177, 178, 179, 0, 0, 0, 0, 150,
- 0, 0, 0, 287, 151, 152, 153, 154, 155, 156,
- 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
- 167, 168, 169, 170, 171, 172, 173, 0, 174, 175,
- 176, 177, 178, 179, 0, 150, 0, 0, 0, 325,
- 151, 152, 153, 154, 155, 156, 157, 158, 159, 160,
- 161, 162, 163, 164, 165, 166, 167, 168, 169, 170,
- 171, 172, 173, 0, 174, 175, 176, 177, 178, 179,
- 0, 150, 0, 0, 0, 326, 151, 152, 153, 154,
- 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 165, 166, 167, 168, 169, 170, 171, 172, 173, 0,
- 174, 175, 176, 177, 178, 179, 0, 150, 0, 0,
- 0, 327, 151, 152, 153, 154, 155, 156, 157, 158,
- 159, 160, 161, 162, 163, 164, 165, 166, 167, 168,
- 169, 170, 171, 172, 173, 0, 174, 175, 176, 177,
- 178, 179, 0, 150, 0, 0, 0, 328, 151, 152,
+ 29, 66, 0, 0, 11, 12, 13, 14, 0, 16,
+ 0, 18, 0, 0, 0, 0, 0, 0, 0, 0,
+ 23, 24, 25, 26, 27, 28, 29, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 330,
+ 0, 0, 0, 0, 151, 0, 0, 0, -95, 152,
153, 154, 155, 156, 157, 158, 159, 160, 161, 162,
163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
- 173, 0, 174, 175, 176, 177, 178, 179, 152, 153,
- 154, 155, 156, 157, 158, 159, 160, 161, 162, 163,
- 164, 165, 166, 167, 168, 169, 170, 171, 172, 173,
- 0, 174, 175, 176, 177, 178, 179, 154, 155, 156,
- 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
- 167, 168, 169, 170, 171, 172, 173, 0, 174, 175,
- 176, 177, 178, 179, 155, 156, 157, 158, 159, 160,
- 161, 162, 163, 164, 165, 166, 167, 168, 169, 170,
- 171, 172, 173, 0, 174, 175, 176, 177, 178, 179,
+ 173, 174, 0, 175, 176, 177, 178, 179, 180, 0,
+ 0, 0, 0, 0, 151, 0, 0, 0, 305, 152,
+ 153, 154, 155, 156, 157, 158, 159, 160, 161, 162,
+ 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
+ 173, 174, 0, 175, 176, 177, 178, 179, 180, 0,
+ 0, 151, 0, 0, 0, 337, 152, 153, 154, 155,
156, 157, 158, 159, 160, 161, 162, 163, 164, 165,
- 166, 167, 168, 169, 170, 171, 172, 173, 0, 174,
- 175, 176, 177, 178, 179, 157, 158, 159, 160, 161,
+ 166, 167, 168, 169, 170, 171, 172, 173, 174, 0,
+ 175, 176, 177, 178, 179, 180, 0, 0, 151, 0,
+ 0, 0, 338, 152, 153, 154, 155, 156, 157, 158,
+ 159, 160, 161, 162, 163, 164, 165, 166, 167, 168,
+ 169, 170, 171, 172, 173, 174, 0, 175, 176, 177,
+ 178, 179, 180, 0, 0, 151, 0, 0, 0, 339,
+ 152, 153, 154, 155, 156, 157, 158, 159, 160, 161,
162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
- 172, 173, 0, 174, 175, 176, 177, 178, 179, 158,
+ 172, 173, 174, 0, 175, 176, 177, 178, 179, 180,
+ 0, 0, 151, 0, 0, 0, 340, 152, 153, 154,
+ 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+ 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
+ 0, 175, 176, 177, 178, 179, 180, 153, 154, 155,
+ 156, 157, 158, 159, 160, 161, 162, 163, 164, 165,
+ 166, 167, 168, 169, 170, 171, 172, 173, 174, 0,
+ 175, 176, 177, 178, 179, 180, 155, 156, 157, 158,
159, 160, 161, 162, 163, 164, 165, 166, 167, 168,
- 169, 170, 171, 172, 173, 0, 174, 175, 176, 177,
- 178, 179, 160, 161, 162, 163, 164, 165, 166, 167,
- 168, 169, 170, 171, 172, 173, 0, 174, 175, 176,
- 177, 178, 179, 167, 168, 169, 170, 171, 172, 173,
- 0, 174, 175, 176, 177, 178, 179, 169, 170, 171,
- 172, 173, 0, 174, 175, 176, 177, 178, 179, 172,
- 173, 0, 174, 175, 176, 177, 178, 179
+ 169, 170, 171, 172, 173, 174, 0, 175, 176, 177,
+ 178, 179, 180, 156, 157, 158, 159, 160, 161, 162,
+ 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
+ 173, 174, 0, 175, 176, 177, 178, 179, 180, 66,
+ 0, 0, 11, 12, 13, 14, 0, 16, 0, 18,
+ 0, 0, 0, 0, 0, 0, 0, 0, 23, 24,
+ 25, 26, 27, 28, 29, 157, 158, 159, 160, 161,
+ 162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
+ 172, 173, 174, 0, 175, 176, 177, 178, 179, 180,
+ 158, 159, 160, 161, 162, 163, 164, 165, 166, 167,
+ 168, 169, 170, 171, 172, 173, 174, 0, 175, 176,
+ 177, 178, 179, 180, 159, 160, 161, 162, 163, 164,
+ 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
+ 0, 175, 176, 177, 178, 179, 180, 161, 162, 163,
+ 164, 165, 166, 167, 168, 169, 170, 171, 172, 173,
+ 174, 0, 175, 176, 177, 178, 179, 180
};
static const short yycheck[] =
{
- 15, 0, 11, 12, 13, 14, 12, 13, 14, 18,
- 0, 186, 18, 186, 3, 192, 41, 61, 33, 34,
- 35, 36, 37, 38, 68, 69, 69, 42, 43, 58,
- 59, 41, 8, 9, 49, 11, 12, 13, 41, 41,
- 39, 11, 20, 41, 14, 15, 16, 17, 41, 19,
- 49, 21, 52, 8, 9, 80, 65, 41, 13, 65,
- 30, 31, 32, 33, 34, 35, 36, 19, 78, 98,
- 247, 34, 35, 19, 35, 78, 78, 174, 30, 49,
- 78, 33, 179, 52, 30, 78, 52, 33, 77, 263,
- 264, 61, 266, 77, 31, 58, 33, 73, 68, 69,
- 76, 8, 9, 10, 11, 12, 13, 52, 78, 8,
- 9, 110, 11, 12, 13, 34, 35, 292, 73, 292,
- 68, 69, 121, 122, 123, 124, 68, 69, 8, 9,
- 10, 11, 12, 13, 149, 150, 151, 152, 153, 154,
+ 15, 187, 0, 11, 12, 13, 14, 12, 13, 14,
+ 18, 0, 187, 18, 197, 197, 3, 201, 33, 34,
+ 35, 36, 37, 38, 8, 9, 69, 42, 43, 13,
+ 58, 10, 41, 52, 49, 41, 52, 41, 41, 8,
+ 9, 39, 11, 12, 13, 8, 9, 10, 11, 12,
+ 13, 49, 20, 41, 34, 35, 175, 65, 34, 35,
+ 65, 180, 52, 11, 8, 9, 98, 11, 12, 13,
+ 98, 52, 81, 79, 258, 79, 79, 56, 34, 35,
+ 35, 34, 58, 31, 32, 33, 31, 0, 33, 73,
+ 78, 78, 20, 49, 8, 9, 10, 11, 12, 13,
+ 283, 283, 58, 19, 73, 61, 41, 19, 77, 6,
+ 73, 11, 20, 111, 30, 31, 49, 33, 30, 58,
+ 36, 33, 58, 309, 122, 123, 124, 125, 61, 73,
+ 29, 31, 32, 33, 309, 150, 151, 152, 153, 154,
155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 165, 166, 167, 168, 169, 170, 171, 34, 187, 11,
- 20, 0, 177, 178, 6, 174, 73, 31, 174, 33,
- 179, 20, 41, 179, 73, 184, 58, 192, 184, 31,
- 32, 33, 58, 29, 193, 175, 11, 193, 77, 14,
- 15, 16, 17, 73, 19, 68, 21, 67, 68, 69,
- 70, 71, 72, 218, 203, 30, 31, 32, 33, 34,
- 35, 36, 3, 4, 5, 6, 7, 8, 9, 78,
- 11, 12, 13, 68, 33, 52, 33, 18, 33, 20,
- 11, 33, 247, 33, 25, 26, 27, 28, 267, 80,
- 255, 78, 8, 258, 20, 19, 37, 77, 39, 40,
- 31, 32, 33, 78, 77, 33, 30, 31, 49, 33,
- 78, 276, 36, 53, 273, 53, 53, 273, 59, 60,
- 61, 53, 287, 64, 65, 33, 33, 33, 69, 10,
- 10, 20, 73, 74, 75, 76, 53, 182, 79, 69,
- 69, 77, 291, 78, 69, 310, 311, 312, 313, 3,
- 4, 5, 6, 7, 8, 9, 69, 11, 12, 13,
- 14, 15, 16, 17, 18, 19, 20, 21, 267, 56,
- 23, 25, 26, 27, 28, 268, 30, 31, 32, 33,
- 34, 35, 36, 37, 268, 39, 40, 10, 176, 49,
- 17, -1, -1, -1, -1, 49, -1, -1, -1, -1,
- -1, 61, -1, -1, 58, 59, 60, 61, 68, 69,
- 64, 65, -1, -1, -1, 69, -1, -1, -1, 73,
- 74, 75, 76, -1, -1, 79, 3, 4, 5, 6,
- 7, 8, 9, -1, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, -1, 34, 35, 25, 26,
- 27, 28, -1, 30, 31, 32, 33, 34, 35, 36,
- 37, 49, 39, 40, -1, -1, -1, -1, -1, -1,
- 58, -1, 49, 61, -1, -1, -1, -1, -1, -1,
- 68, 69, 59, 60, 61, -1, -1, 64, 65, -1,
- -1, -1, 69, -1, -1, -1, 73, 74, 75, 76,
- -1, -1, 79, 3, 4, 5, 6, 7, 8, 9,
- -1, 11, 12, 13, -1, -1, -1, -1, 18, -1,
- 20, -1, -1, -1, -1, 25, 26, 27, 28, -1,
- -1, -1, -1, -1, -1, -1, -1, 37, -1, 39,
- 40, 58, 59, 60, 61, 62, 63, 64, 65, 49,
- 67, 68, 69, 70, 71, 72, -1, -1, -1, 59,
+ 165, 166, 167, 168, 169, 170, 171, 172, 190, 73,
+ 188, 68, 49, 178, 179, 68, 31, 175, 33, 78,
+ 175, 33, 180, 79, 61, 180, 208, 185, 19, 52,
+ 185, 68, 69, 68, 69, 33, 201, 176, 33, 30,
+ 68, 69, 33, 79, 202, 33, 33, 202, 81, 8,
+ 3, 4, 5, 6, 7, 8, 9, 61, 11, 12,
+ 13, 61, 20, 79, 229, 18, 214, 20, 78, 78,
+ 33, 53, 25, 26, 27, 28, 53, 67, 68, 69,
+ 70, 71, 72, 53, 37, 53, 39, 40, 33, 33,
+ 33, 10, 41, 258, 79, 10, 49, 20, 276, 78,
+ 69, 79, 267, 79, 69, 270, 59, 60, 61, 69,
+ 183, 64, 65, 53, 69, 319, 69, 193, 195, 23,
+ 73, 74, 177, 76, 77, 17, 208, 80, -1, 294,
+ -1, 289, -1, -1, 289, -1, -1, -1, -1, -1,
+ 305, 319, 58, 59, 60, 61, 62, 63, 64, 65,
+ -1, 67, 68, 69, 70, 71, 72, -1, 323, 324,
+ 325, 326, 310, 3, 4, 5, 6, 7, 8, 9,
+ -1, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+ 20, 21, -1, -1, -1, 25, 26, 27, 28, -1,
+ 30, 31, 32, 33, 34, 35, 36, 37, -1, 39,
+ 40, -1, 59, 60, 61, 62, 63, 64, 65, 49,
+ 67, 68, 69, 70, 71, 72, -1, -1, 58, 59,
60, 61, -1, -1, 64, 65, -1, -1, -1, 69,
- -1, -1, -1, 73, 74, 75, 76, -1, -1, 79,
- 3, 4, 5, 6, 7, 8, 9, -1, 11, 12,
- 13, -1, -1, -1, -1, 18, -1, 20, -1, -1,
- -1, -1, 25, 26, 27, 28, -1, -1, -1, -1,
- -1, -1, -1, -1, 37, 11, 39, 40, 14, 15,
+ -1, -1, -1, 73, 74, -1, 76, 77, -1, -1,
+ 80, 3, 4, 5, 6, 7, 8, 9, -1, 11,
+ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+ -1, -1, -1, 25, 26, 27, 28, -1, 30, 31,
+ 32, 33, 34, 35, 36, 37, -1, 39, 40, -1,
+ -1, -1, 61, 62, 63, 64, 65, 49, 67, 68,
+ 69, 70, 71, 72, -1, -1, -1, 59, 60, 61,
+ -1, -1, 64, 65, -1, -1, -1, 69, -1, -1,
+ -1, 73, 74, -1, 76, 77, -1, -1, 80, 3,
+ 4, 5, 6, 7, 8, 9, -1, 11, 12, 13,
+ -1, -1, -1, -1, 18, -1, 20, -1, -1, -1,
+ -1, 25, 26, 27, 28, -1, -1, -1, -1, -1,
+ -1, -1, -1, 37, -1, 39, 40, -1, -1, -1,
+ -1, -1, -1, 64, 65, 49, 67, 68, 69, 70,
+ 71, 72, -1, -1, -1, 59, 60, 61, -1, -1,
+ 64, 65, -1, -1, -1, 69, -1, -1, -1, 73,
+ 74, -1, 76, 77, -1, -1, 80, 3, 4, 5,
+ 6, 7, 8, 9, -1, 11, 12, 13, -1, -1,
+ -1, -1, 18, -1, 20, -1, -1, -1, -1, 25,
+ 26, 27, 28, -1, -1, -1, -1, -1, -1, -1,
+ -1, 37, 11, 39, 40, 14, 15, 16, 17, -1,
+ 19, -1, 21, -1, -1, -1, -1, -1, -1, -1,
+ -1, 30, 31, 32, 33, 34, 35, 36, 64, 65,
+ -1, -1, -1, 69, -1, -1, -1, 73, 74, -1,
+ 76, 77, 11, -1, 80, 14, 15, 16, 17, -1,
+ 19, -1, 21, -1, -1, -1, -1, -1, -1, -1,
+ -1, 30, 31, 32, 33, 34, 35, 36, -1, -1,
+ 79, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 49, -1, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 61, 67, 68, 69, 70, 71, 72, 68,
+ 69, 11, -1, -1, 14, 15, 16, 17, -1, 19,
+ 79, 21, -1, 23, 24, -1, -1, -1, -1, -1,
+ 30, 31, 32, 33, 34, 35, 36, -1, 38, -1,
+ -1, 41, -1, 43, -1, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, -1, 59,
+ 60, 61, 62, 63, 64, 65, -1, -1, 68, 69,
+ -1, 71, 72, -1, -1, 11, 76, 77, 14, 15,
16, 17, -1, 19, -1, 21, -1, -1, -1, -1,
-1, -1, -1, -1, 30, 31, 32, 33, 34, 35,
- 36, 64, 65, -1, -1, -1, 69, -1, -1, -1,
- 73, 74, 75, 76, 11, -1, 79, 14, 15, 16,
- 17, -1, 19, -1, 21, -1, 23, 24, -1, -1,
- -1, -1, -1, 30, 31, 32, 33, 34, 35, 36,
- -1, 38, -1, -1, 41, -1, 43, -1, 45, 46,
+ 36, 11, -1, -1, 14, 15, 16, 17, -1, 19,
+ -1, 21, -1, -1, -1, -1, -1, -1, -1, -1,
+ 30, 31, 32, 33, 34, 35, 36, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 75,
+ -1, -1, -1, -1, 38, -1, -1, -1, 58, 43,
+ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, -1, 67, 68, 69, 70, 71, 72, -1,
+ -1, -1, -1, -1, 38, -1, -1, -1, 82, 43,
+ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, -1, 67, 68, 69, 70, 71, 72, -1,
+ -1, 38, -1, -1, -1, 79, 43, 44, 45, 46,
47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, -1, 59, 60, 61, 62, 63, 64, 65, -1,
- -1, 68, 69, -1, 71, 72, -1, 11, 75, 76,
- 14, 15, 16, 17, -1, 19, -1, 21, -1, -1,
- -1, -1, -1, -1, -1, -1, 30, 31, 32, 33,
- 34, 35, 36, 56, 57, 58, 59, 60, 61, 62,
- 63, 64, 65, -1, 67, 68, 69, 70, 71, 72,
- 38, -1, -1, -1, 58, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, 60, 61, 62, 63, 64, 65, -1, 67,
- 68, 69, 70, 71, 72, -1, -1, -1, -1, 38,
- -1, -1, -1, 81, 43, 44, 45, 46, 47, 48,
- 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 65, -1, 67, 68,
- 69, 70, 71, 72, -1, 38, -1, -1, -1, 78,
+ 57, 58, 59, 60, 61, 62, 63, 64, 65, -1,
+ 67, 68, 69, 70, 71, 72, -1, -1, 38, -1,
+ -1, -1, 79, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+ 60, 61, 62, 63, 64, 65, -1, 67, 68, 69,
+ 70, 71, 72, -1, -1, 38, -1, -1, -1, 79,
43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
63, 64, 65, -1, 67, 68, 69, 70, 71, 72,
- -1, 38, -1, -1, -1, 78, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, -1,
- 67, 68, 69, 70, 71, 72, -1, 38, -1, -1,
- -1, 78, 43, 44, 45, 46, 47, 48, 49, 50,
- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
- 61, 62, 63, 64, 65, -1, 67, 68, 69, 70,
- 71, 72, -1, 38, -1, -1, -1, 78, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, -1, 67, 68, 69, 70, 71, 72, 44, 45,
+ -1, -1, 38, -1, -1, -1, 79, 43, 44, 45,
46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
- -1, 67, 68, 69, 70, 71, 72, 46, 47, 48,
- 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 65, -1, 67, 68,
- 69, 70, 71, 72, 47, 48, 49, 50, 51, 52,
+ -1, 67, 68, 69, 70, 71, 72, 44, 45, 46,
+ 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
+ 57, 58, 59, 60, 61, 62, 63, 64, 65, -1,
+ 67, 68, 69, 70, 71, 72, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+ 60, 61, 62, 63, 64, 65, -1, 67, 68, 69,
+ 70, 71, 72, 47, 48, 49, 50, 51, 52, 53,
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, -1, 67, 68, 69, 70, 71, 72, 11,
+ -1, -1, 14, 15, 16, 17, -1, 19, -1, 21,
+ -1, -1, -1, -1, -1, -1, -1, -1, 30, 31,
+ 32, 33, 34, 35, 36, 48, 49, 50, 51, 52,
53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
63, 64, 65, -1, 67, 68, 69, 70, 71, 72,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, 60, 61, 62, 63, 64, 65, -1, 67,
- 68, 69, 70, 71, 72, 49, 50, 51, 52, 53,
- 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, -1, 67, 68, 69, 70, 71, 72, 50,
- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
- 61, 62, 63, 64, 65, -1, 67, 68, 69, 70,
- 71, 72, 52, 53, 54, 55, 56, 57, 58, 59,
- 60, 61, 62, 63, 64, 65, -1, 67, 68, 69,
- 70, 71, 72, 59, 60, 61, 62, 63, 64, 65,
- -1, 67, 68, 69, 70, 71, 72, 61, 62, 63,
- 64, 65, -1, 67, 68, 69, 70, 71, 72, 64,
+ 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
+ 59, 60, 61, 62, 63, 64, 65, -1, 67, 68,
+ 69, 70, 71, 72, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
+ -1, 67, 68, 69, 70, 71, 72, 52, 53, 54,
+ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
65, -1, 67, 68, 69, 70, 71, 72
};
@@ -1055,35 +1100,37 @@ static const unsigned char yystos[] =
13, 14, 15, 16, 17, 18, 19, 20, 21, 25,
26, 27, 28, 30, 31, 32, 33, 34, 35, 36,
37, 39, 40, 49, 59, 60, 61, 64, 65, 69,
- 73, 74, 75, 76, 79, 83, 84, 85, 86, 89,
- 92, 93, 94, 95, 97, 98, 99, 105, 106, 109,
- 110, 111, 112, 114, 69, 20, 11, 23, 24, 38,
+ 73, 74, 76, 77, 80, 84, 85, 86, 87, 90,
+ 93, 94, 95, 96, 98, 99, 100, 110, 111, 115,
+ 118, 119, 120, 122, 69, 20, 11, 23, 24, 38,
41, 43, 45, 46, 47, 48, 49, 50, 51, 52,
53, 54, 55, 56, 57, 59, 60, 61, 62, 63,
- 64, 65, 68, 69, 71, 72, 75, 76, 109, 8,
- 9, 11, 12, 73, 112, 113, 113, 113, 113, 11,
- 69, 86, 11, 31, 32, 33, 107, 9, 73, 114,
- 113, 52, 52, 52, 52, 31, 32, 107, 19, 30,
- 31, 33, 36, 19, 30, 33, 35, 34, 86, 86,
- 86, 86, 86, 86, 85, 105, 86, 86, 0, 41,
- 38, 43, 44, 45, 46, 47, 48, 49, 50, 51,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
- 62, 63, 64, 65, 67, 68, 69, 70, 71, 72,
- 86, 90, 105, 6, 20, 58, 96, 106, 99, 99,
- 100, 29, 88, 76, 113, 68, 68, 77, 78, 105,
- 31, 33, 33, 52, 105, 105, 105, 105, 31, 33,
- 33, 33, 19, 30, 33, 33, 33, 78, 78, 86,
- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
- 86, 86, 10, 11, 95, 113, 85, 87, 105, 108,
- 86, 86, 10, 95, 113, 41, 80, 91, 91, 113,
- 8, 97, 111, 49, 61, 68, 69, 101, 102, 103,
- 104, 90, 113, 20, 77, 77, 78, 33, 105, 53,
- 53, 53, 53, 33, 33, 33, 86, 81, 10, 77,
- 90, 41, 78, 10, 86, 86, 101, 101, 3, 77,
- 78, 101, 108, 100, 69, 103, 104, 78, 113, 53,
- 69, 69, 69, 69, 86, 78, 105, 97, 77, 78,
- 78, 86, 86, 86, 86, 78, 78, 78, 78
+ 64, 65, 68, 69, 71, 72, 76, 77, 111, 116,
+ 8, 9, 11, 12, 73, 120, 121, 121, 121, 121,
+ 11, 69, 87, 11, 31, 32, 33, 112, 9, 73,
+ 122, 121, 52, 52, 52, 52, 31, 32, 112, 19,
+ 30, 31, 33, 36, 19, 30, 33, 35, 34, 87,
+ 87, 87, 87, 87, 87, 86, 110, 87, 87, 0,
+ 41, 38, 43, 44, 45, 46, 47, 48, 49, 50,
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+ 61, 62, 63, 64, 65, 67, 68, 69, 70, 71,
+ 72, 87, 91, 110, 6, 20, 58, 97, 111, 100,
+ 49, 61, 68, 69, 102, 105, 106, 107, 108, 109,
+ 29, 89, 77, 121, 68, 68, 78, 79, 102, 117,
+ 110, 31, 33, 33, 52, 110, 110, 110, 110, 31,
+ 33, 33, 33, 19, 30, 33, 33, 33, 79, 79,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 10, 11, 96, 121, 86, 88, 110,
+ 113, 114, 87, 87, 10, 96, 121, 41, 81, 92,
+ 92, 121, 8, 98, 119, 102, 104, 3, 78, 79,
+ 106, 113, 61, 107, 69, 108, 109, 91, 121, 20,
+ 78, 78, 61, 117, 79, 33, 110, 53, 53, 53,
+ 53, 33, 33, 33, 87, 82, 10, 78, 91, 79,
+ 41, 10, 87, 87, 100, 101, 78, 79, 79, 103,
+ 79, 121, 53, 69, 69, 69, 69, 87, 79, 98,
+ 75, 110, 101, 87, 87, 87, 87, 79, 79, 79,
+ 79
};
#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
@@ -1694,81 +1741,81 @@ yyreduce:
switch (yyn)
{
case 4:
-#line 255 "c-exp.y"
+#line 268 "c-exp.y"
{ write_exp_elt_opcode(OP_TYPE);
write_exp_elt_type(yyvsp[0].tval);
write_exp_elt_opcode(OP_TYPE);}
break;
case 6:
-#line 263 "c-exp.y"
+#line 276 "c-exp.y"
{ write_exp_elt_opcode (BINOP_COMMA); }
break;
case 7:
-#line 268 "c-exp.y"
+#line 281 "c-exp.y"
{ write_exp_elt_opcode (UNOP_IND); }
break;
case 8:
-#line 272 "c-exp.y"
+#line 285 "c-exp.y"
{ write_exp_elt_opcode (UNOP_ADDR); }
break;
case 9:
-#line 276 "c-exp.y"
+#line 289 "c-exp.y"
{ write_exp_elt_opcode (UNOP_NEG); }
break;
case 10:
-#line 280 "c-exp.y"
+#line 293 "c-exp.y"
{ write_exp_elt_opcode (UNOP_PLUS); }
break;
case 11:
-#line 284 "c-exp.y"
+#line 297 "c-exp.y"
{ write_exp_elt_opcode (UNOP_LOGICAL_NOT); }
break;
case 12:
-#line 288 "c-exp.y"
+#line 301 "c-exp.y"
{ write_exp_elt_opcode (UNOP_COMPLEMENT); }
break;
case 13:
-#line 292 "c-exp.y"
+#line 305 "c-exp.y"
{ write_exp_elt_opcode (UNOP_PREINCREMENT); }
break;
case 14:
-#line 296 "c-exp.y"
+#line 309 "c-exp.y"
{ write_exp_elt_opcode (UNOP_PREDECREMENT); }
break;
case 15:
-#line 300 "c-exp.y"
+#line 313 "c-exp.y"
{ write_exp_elt_opcode (UNOP_POSTINCREMENT); }
break;
case 16:
-#line 304 "c-exp.y"
+#line 317 "c-exp.y"
{ write_exp_elt_opcode (UNOP_POSTDECREMENT); }
break;
case 17:
-#line 308 "c-exp.y"
+#line 321 "c-exp.y"
{ write_exp_elt_opcode (UNOP_SIZEOF); }
break;
case 18:
-#line 312 "c-exp.y"
+#line 325 "c-exp.y"
{ write_exp_elt_opcode (STRUCTOP_PTR);
write_exp_string (yyvsp[0].sval);
write_exp_elt_opcode (STRUCTOP_PTR); }
break;
case 19:
-#line 318 "c-exp.y"
+#line 331 "c-exp.y"
{ mark_struct_expression ();
write_exp_elt_opcode (STRUCTOP_PTR);
write_exp_string (yyvsp[-1].sval);
@@ -1776,7 +1823,7 @@ yyreduce:
break;
case 20:
-#line 325 "c-exp.y"
+#line 338 "c-exp.y"
{ struct stoken s;
mark_struct_expression ();
write_exp_elt_opcode (STRUCTOP_PTR);
@@ -1787,7 +1834,7 @@ yyreduce:
break;
case 21:
-#line 335 "c-exp.y"
+#line 348 "c-exp.y"
{ /* exp->type::name becomes exp->*(&type::name) */
/* Note: this doesn't work if name is a
static member! FIXME */
@@ -1796,19 +1843,19 @@ yyreduce:
break;
case 22:
-#line 343 "c-exp.y"
+#line 356 "c-exp.y"
{ write_exp_elt_opcode (STRUCTOP_MPTR); }
break;
case 23:
-#line 347 "c-exp.y"
+#line 360 "c-exp.y"
{ write_exp_elt_opcode (STRUCTOP_STRUCT);
write_exp_string (yyvsp[0].sval);
write_exp_elt_opcode (STRUCTOP_STRUCT); }
break;
case 24:
-#line 353 "c-exp.y"
+#line 366 "c-exp.y"
{ mark_struct_expression ();
write_exp_elt_opcode (STRUCTOP_STRUCT);
write_exp_string (yyvsp[-1].sval);
@@ -1816,7 +1863,7 @@ yyreduce:
break;
case 25:
-#line 360 "c-exp.y"
+#line 373 "c-exp.y"
{ struct stoken s;
mark_struct_expression ();
write_exp_elt_opcode (STRUCTOP_STRUCT);
@@ -1827,7 +1874,7 @@ yyreduce:
break;
case 26:
-#line 370 "c-exp.y"
+#line 383 "c-exp.y"
{ /* exp.type::name becomes exp.*(&type::name) */
/* Note: this doesn't work if name is a
static member! FIXME */
@@ -1836,29 +1883,29 @@ yyreduce:
break;
case 27:
-#line 378 "c-exp.y"
+#line 391 "c-exp.y"
{ write_exp_elt_opcode (STRUCTOP_MEMBER); }
break;
case 28:
-#line 382 "c-exp.y"
+#line 395 "c-exp.y"
{ write_exp_elt_opcode (BINOP_SUBSCRIPT); }
break;
case 29:
-#line 388 "c-exp.y"
+#line 401 "c-exp.y"
{ start_arglist (); }
break;
case 30:
-#line 390 "c-exp.y"
+#line 403 "c-exp.y"
{ write_exp_elt_opcode (OP_FUNCALL);
write_exp_elt_longcst ((LONGEST) end_arglist ());
write_exp_elt_opcode (OP_FUNCALL); }
break;
case 31:
-#line 396 "c-exp.y"
+#line 409 "c-exp.y"
{
/* This could potentially be a an argument defined
lookup function (Koenig). */
@@ -1876,7 +1923,7 @@ yyreduce:
break;
case 32:
-#line 411 "c-exp.y"
+#line 424 "c-exp.y"
{
write_exp_elt_opcode (OP_FUNCALL);
write_exp_elt_longcst ((LONGEST) end_arglist ());
@@ -1885,40 +1932,46 @@ yyreduce:
break;
case 33:
-#line 419 "c-exp.y"
+#line 432 "c-exp.y"
{ start_arglist (); }
break;
case 35:
-#line 426 "c-exp.y"
+#line 439 "c-exp.y"
{ arglist_len = 1; }
break;
case 36:
-#line 430 "c-exp.y"
+#line 443 "c-exp.y"
{ arglist_len++; }
break;
case 37:
-#line 434 "c-exp.y"
+#line 447 "c-exp.y"
{ int i;
+ VEC (type_ptr) *type_list = yyvsp[-2].tvec;
+ struct type *type_elt;
+ LONGEST len = VEC_length (type_ptr, type_list);
+
write_exp_elt_opcode (TYPE_INSTANCE);
- write_exp_elt_longcst ((LONGEST) yyvsp[-2].ivec[0]);
- for (i = 0; i < yyvsp[-2].ivec[0]; ++i)
- write_exp_elt_type (yyvsp[-2].tvec[i + 1]);
- write_exp_elt_longcst((LONGEST) yyvsp[-2].ivec[0]);
+ write_exp_elt_longcst (len);
+ for (i = 0;
+ VEC_iterate (type_ptr, type_list, i, type_elt);
+ ++i)
+ write_exp_elt_type (type_elt);
+ write_exp_elt_longcst(len);
write_exp_elt_opcode (TYPE_INSTANCE);
- xfree (yyvsp[-2].tvec);
+ VEC_free (type_ptr, type_list);
}
break;
case 38:
-#line 446 "c-exp.y"
+#line 465 "c-exp.y"
{ yyval.lval = end_arglist () - 1; }
break;
case 39:
-#line 449 "c-exp.y"
+#line 468 "c-exp.y"
{ write_exp_elt_opcode (OP_ARRAY);
write_exp_elt_longcst ((LONGEST) 0);
write_exp_elt_longcst ((LONGEST) yyvsp[0].lval);
@@ -1926,138 +1979,138 @@ yyreduce:
break;
case 40:
-#line 456 "c-exp.y"
+#line 475 "c-exp.y"
{ write_exp_elt_opcode (UNOP_MEMVAL);
write_exp_elt_type (yyvsp[-2].tval);
write_exp_elt_opcode (UNOP_MEMVAL); }
break;
case 41:
-#line 462 "c-exp.y"
+#line 481 "c-exp.y"
{ write_exp_elt_opcode (UNOP_CAST);
write_exp_elt_type (yyvsp[-2].tval);
write_exp_elt_opcode (UNOP_CAST); }
break;
case 42:
-#line 468 "c-exp.y"
+#line 487 "c-exp.y"
{ }
break;
case 43:
-#line 474 "c-exp.y"
+#line 493 "c-exp.y"
{ write_exp_elt_opcode (BINOP_REPEAT); }
break;
case 44:
-#line 478 "c-exp.y"
+#line 497 "c-exp.y"
{ write_exp_elt_opcode (BINOP_MUL); }
break;
case 45:
-#line 482 "c-exp.y"
+#line 501 "c-exp.y"
{ write_exp_elt_opcode (BINOP_DIV); }
break;
case 46:
-#line 486 "c-exp.y"
+#line 505 "c-exp.y"
{ write_exp_elt_opcode (BINOP_REM); }
break;
case 47:
-#line 490 "c-exp.y"
+#line 509 "c-exp.y"
{ write_exp_elt_opcode (BINOP_ADD); }
break;
case 48:
-#line 494 "c-exp.y"
+#line 513 "c-exp.y"
{ write_exp_elt_opcode (BINOP_SUB); }
break;
case 49:
-#line 498 "c-exp.y"
+#line 517 "c-exp.y"
{ write_exp_elt_opcode (BINOP_LSH); }
break;
case 50:
-#line 502 "c-exp.y"
+#line 521 "c-exp.y"
{ write_exp_elt_opcode (BINOP_RSH); }
break;
case 51:
-#line 506 "c-exp.y"
+#line 525 "c-exp.y"
{ write_exp_elt_opcode (BINOP_EQUAL); }
break;
case 52:
-#line 510 "c-exp.y"
+#line 529 "c-exp.y"
{ write_exp_elt_opcode (BINOP_NOTEQUAL); }
break;
case 53:
-#line 514 "c-exp.y"
+#line 533 "c-exp.y"
{ write_exp_elt_opcode (BINOP_LEQ); }
break;
case 54:
-#line 518 "c-exp.y"
+#line 537 "c-exp.y"
{ write_exp_elt_opcode (BINOP_GEQ); }
break;
case 55:
-#line 522 "c-exp.y"
+#line 541 "c-exp.y"
{ write_exp_elt_opcode (BINOP_LESS); }
break;
case 56:
-#line 526 "c-exp.y"
+#line 545 "c-exp.y"
{ write_exp_elt_opcode (BINOP_GTR); }
break;
case 57:
-#line 530 "c-exp.y"
+#line 549 "c-exp.y"
{ write_exp_elt_opcode (BINOP_BITWISE_AND); }
break;
case 58:
-#line 534 "c-exp.y"
+#line 553 "c-exp.y"
{ write_exp_elt_opcode (BINOP_BITWISE_XOR); }
break;
case 59:
-#line 538 "c-exp.y"
+#line 557 "c-exp.y"
{ write_exp_elt_opcode (BINOP_BITWISE_IOR); }
break;
case 60:
-#line 542 "c-exp.y"
+#line 561 "c-exp.y"
{ write_exp_elt_opcode (BINOP_LOGICAL_AND); }
break;
case 61:
-#line 546 "c-exp.y"
+#line 565 "c-exp.y"
{ write_exp_elt_opcode (BINOP_LOGICAL_OR); }
break;
case 62:
-#line 550 "c-exp.y"
+#line 569 "c-exp.y"
{ write_exp_elt_opcode (TERNOP_COND); }
break;
case 63:
-#line 554 "c-exp.y"
+#line 573 "c-exp.y"
{ write_exp_elt_opcode (BINOP_ASSIGN); }
break;
case 64:
-#line 558 "c-exp.y"
+#line 577 "c-exp.y"
{ write_exp_elt_opcode (BINOP_ASSIGN_MODIFY);
write_exp_elt_opcode (yyvsp[-1].opcode);
write_exp_elt_opcode (BINOP_ASSIGN_MODIFY); }
break;
case 65:
-#line 564 "c-exp.y"
+#line 583 "c-exp.y"
{ write_exp_elt_opcode (OP_LONG);
write_exp_elt_type (yyvsp[0].typed_val_int.type);
write_exp_elt_longcst ((LONGEST)(yyvsp[0].typed_val_int.val));
@@ -2065,7 +2118,7 @@ yyreduce:
break;
case 66:
-#line 571 "c-exp.y"
+#line 590 "c-exp.y"
{
struct stoken_vector vec;
vec.len = 1;
@@ -2075,7 +2128,7 @@ yyreduce:
break;
case 67:
-#line 580 "c-exp.y"
+#line 599 "c-exp.y"
{ YYSTYPE val;
parse_number (yyvsp[0].ssym.stoken.ptr, yyvsp[0].ssym.stoken.length, 0, &val);
write_exp_elt_opcode (OP_LONG);
@@ -2086,7 +2139,7 @@ yyreduce:
break;
case 68:
-#line 591 "c-exp.y"
+#line 610 "c-exp.y"
{ write_exp_elt_opcode (OP_DOUBLE);
write_exp_elt_type (yyvsp[0].typed_val_float.type);
write_exp_elt_dblcst (yyvsp[0].typed_val_float.dval);
@@ -2094,7 +2147,7 @@ yyreduce:
break;
case 69:
-#line 598 "c-exp.y"
+#line 617 "c-exp.y"
{ write_exp_elt_opcode (OP_DECFLOAT);
write_exp_elt_type (yyvsp[0].typed_val_decfloat.type);
write_exp_elt_decfloatcst (yyvsp[0].typed_val_decfloat.val);
@@ -2102,14 +2155,14 @@ yyreduce:
break;
case 71:
-#line 608 "c-exp.y"
+#line 627 "c-exp.y"
{
write_dollar_variable (yyvsp[0].sval);
}
break;
case 72:
-#line 614 "c-exp.y"
+#line 633 "c-exp.y"
{ write_exp_elt_opcode (OP_LONG);
write_exp_elt_type (lookup_signed_typename
(parse_language, parse_gdbarch,
@@ -2120,28 +2173,28 @@ yyreduce:
break;
case 73:
-#line 624 "c-exp.y"
+#line 643 "c-exp.y"
{ write_exp_elt_opcode (UNOP_REINTERPRET_CAST);
write_exp_elt_type (yyvsp[-4].tval);
write_exp_elt_opcode (UNOP_REINTERPRET_CAST); }
break;
case 74:
-#line 630 "c-exp.y"
+#line 649 "c-exp.y"
{ write_exp_elt_opcode (UNOP_CAST);
write_exp_elt_type (yyvsp[-4].tval);
write_exp_elt_opcode (UNOP_CAST); }
break;
case 75:
-#line 636 "c-exp.y"
+#line 655 "c-exp.y"
{ write_exp_elt_opcode (UNOP_DYNAMIC_CAST);
write_exp_elt_type (yyvsp[-4].tval);
write_exp_elt_opcode (UNOP_DYNAMIC_CAST); }
break;
case 76:
-#line 642 "c-exp.y"
+#line 661 "c-exp.y"
{ /* We could do more error checking here, but
it doesn't seem worthwhile. */
write_exp_elt_opcode (UNOP_CAST);
@@ -2150,7 +2203,7 @@ yyreduce:
break;
case 77:
-#line 651 "c-exp.y"
+#line 670 "c-exp.y"
{
/* We copy the string here, and not in the
lexer, to guarantee that we do not leak a
@@ -2169,7 +2222,7 @@ yyreduce:
break;
case 78:
-#line 668 "c-exp.y"
+#line 687 "c-exp.y"
{
/* Note that we NUL-terminate here, but just
for convenience. */
@@ -2188,7 +2241,7 @@ yyreduce:
break;
case 79:
-#line 686 "c-exp.y"
+#line 705 "c-exp.y"
{
int i;
enum c_string_type type = C_STRING;
@@ -2222,7 +2275,7 @@ yyreduce:
break;
case 80:
-#line 720 "c-exp.y"
+#line 739 "c-exp.y"
{ write_exp_elt_opcode (OP_LONG);
write_exp_elt_type (parse_type->builtin_bool);
write_exp_elt_longcst ((LONGEST) 1);
@@ -2230,7 +2283,7 @@ yyreduce:
break;
case 81:
-#line 727 "c-exp.y"
+#line 746 "c-exp.y"
{ write_exp_elt_opcode (OP_LONG);
write_exp_elt_type (parse_type->builtin_bool);
write_exp_elt_longcst ((LONGEST) 0);
@@ -2238,7 +2291,7 @@ yyreduce:
break;
case 82:
-#line 736 "c-exp.y"
+#line 755 "c-exp.y"
{
if (yyvsp[0].ssym.sym)
yyval.bval = SYMBOL_BLOCK_VALUE (yyvsp[0].ssym.sym);
@@ -2249,14 +2302,14 @@ yyreduce:
break;
case 83:
-#line 744 "c-exp.y"
+#line 763 "c-exp.y"
{
yyval.bval = yyvsp[0].bval;
}
break;
case 84:
-#line 750 "c-exp.y"
+#line 769 "c-exp.y"
{ struct symbol *tem
= lookup_symbol (copy_name (yyvsp[0].sval), yyvsp[-2].bval,
VAR_DOMAIN, (int *) NULL);
@@ -2267,7 +2320,7 @@ yyreduce:
break;
case 85:
-#line 760 "c-exp.y"
+#line 779 "c-exp.y"
{ struct symbol *sym = yyvsp[-1].ssym.sym;
if (sym == NULL || !SYMBOL_IS_ARGUMENT (sym)
@@ -2283,13 +2336,20 @@ yyreduce:
break;
case 86:
-#line 775 "c-exp.y"
+#line 794 "c-exp.y"
{ struct symbol *sym;
sym = lookup_symbol (copy_name (yyvsp[0].sval), yyvsp[-2].bval,
VAR_DOMAIN, (int *) NULL);
if (sym == 0)
error (_("No symbol \"%s\" in specified context."),
copy_name (yyvsp[0].sval));
+ if (symbol_read_needs_frame (sym))
+ {
+ if (innermost_block == 0
+ || contained_in (block_found,
+ innermost_block))
+ innermost_block = block_found;
+ }
write_exp_elt_opcode (OP_VAR_VALUE);
/* block_found is set by lookup_symbol. */
@@ -2299,7 +2359,7 @@ yyreduce:
break;
case 87:
-#line 790 "c-exp.y"
+#line 816 "c-exp.y"
{
struct type *type = yyvsp[-2].tsym.type;
CHECK_TYPEDEF (type);
@@ -2317,7 +2377,7 @@ yyreduce:
break;
case 88:
-#line 805 "c-exp.y"
+#line 831 "c-exp.y"
{
struct type *type = yyvsp[-3].tsym.type;
struct stoken tmp_token;
@@ -2344,7 +2404,7 @@ yyreduce:
break;
case 89:
-#line 829 "c-exp.y"
+#line 855 "c-exp.y"
{
char *copy = copy_name (yyvsp[-2].sval);
error (_("No type \"%s\" within class "
@@ -2354,7 +2414,7 @@ yyreduce:
break;
case 91:
-#line 839 "c-exp.y"
+#line 865 "c-exp.y"
{
char *name = copy_name (yyvsp[0].ssym.stoken);
struct symbol *sym;
@@ -2383,7 +2443,7 @@ yyreduce:
break;
case 92:
-#line 867 "c-exp.y"
+#line 893 "c-exp.y"
{ struct symbol *sym = yyvsp[0].ssym.sym;
if (sym)
@@ -2438,356 +2498,378 @@ yyreduce:
break;
case 93:
-#line 921 "c-exp.y"
- { push_type_address_space (copy_name (yyvsp[0].ssym.stoken));
- push_type (tp_space_identifier);
- }
+#line 947 "c-exp.y"
+ { insert_type_address_space (copy_name (yyvsp[0].ssym.stoken)); }
break;
case 101:
-#line 943 "c-exp.y"
- { push_type (tp_pointer); yyval.voidval = 0; }
- break;
-
- case 102:
-#line 945 "c-exp.y"
- { push_type (tp_pointer); yyval.voidval = yyvsp[0].voidval; }
+#line 968 "c-exp.y"
+ { insert_type (tp_pointer); }
break;
case 103:
-#line 947 "c-exp.y"
- { push_type (tp_reference); yyval.voidval = 0; }
+#line 971 "c-exp.y"
+ { insert_type (tp_pointer); }
break;
- case 104:
-#line 949 "c-exp.y"
- { push_type (tp_reference); yyval.voidval = yyvsp[0].voidval; }
+ case 105:
+#line 974 "c-exp.y"
+ { insert_type (tp_reference); }
break;
case 106:
-#line 954 "c-exp.y"
- { yyval.voidval = yyvsp[-1].voidval; }
+#line 976 "c-exp.y"
+ { insert_type (tp_reference); }
break;
case 107:
-#line 956 "c-exp.y"
+#line 980 "c-exp.y"
+ {
+ yyval.type_stack = get_type_stack ();
+ /* This cleanup is eventually run by
+ c_parse. */
+ make_cleanup (type_stack_cleanup, yyval.type_stack);
+ }
+ break;
+
+ case 108:
+#line 989 "c-exp.y"
+ { yyval.type_stack = append_type_stack (yyvsp[0].type_stack, yyvsp[-1].type_stack); }
+ break;
+
+ case 111:
+#line 995 "c-exp.y"
+ { yyval.type_stack = yyvsp[-1].type_stack; }
+ break;
+
+ case 112:
+#line 997 "c-exp.y"
{
+ push_type_stack (yyvsp[-1].type_stack);
push_type_int (yyvsp[0].lval);
push_type (tp_array);
+ yyval.type_stack = get_type_stack ();
}
break;
- case 108:
-#line 961 "c-exp.y"
+ case 113:
+#line 1004 "c-exp.y"
{
push_type_int (yyvsp[0].lval);
push_type (tp_array);
- yyval.voidval = 0;
+ yyval.type_stack = get_type_stack ();
}
break;
- case 109:
-#line 968 "c-exp.y"
- { push_type (tp_function); }
+ case 114:
+#line 1011 "c-exp.y"
+ {
+ push_type_stack (yyvsp[-1].type_stack);
+ push_typelist (yyvsp[0].tvec);
+ yyval.type_stack = get_type_stack ();
+ }
break;
- case 110:
-#line 970 "c-exp.y"
- { push_type (tp_function); }
+ case 115:
+#line 1017 "c-exp.y"
+ {
+ push_typelist (yyvsp[0].tvec);
+ yyval.type_stack = get_type_stack ();
+ }
break;
- case 111:
-#line 974 "c-exp.y"
+ case 116:
+#line 1024 "c-exp.y"
{ yyval.lval = -1; }
break;
- case 112:
-#line 976 "c-exp.y"
+ case 117:
+#line 1026 "c-exp.y"
{ yyval.lval = yyvsp[-1].typed_val_int.val; }
break;
- case 113:
-#line 980 "c-exp.y"
- { yyval.voidval = 0; }
+ case 118:
+#line 1030 "c-exp.y"
+ { yyval.tvec = NULL; }
break;
- case 114:
-#line 982 "c-exp.y"
- { xfree (yyvsp[-1].tvec); yyval.voidval = 0; }
+ case 119:
+#line 1032 "c-exp.y"
+ { yyval.tvec = yyvsp[-1].tvec; }
break;
- case 116:
-#line 998 "c-exp.y"
+ case 121:
+#line 1048 "c-exp.y"
{ yyval.tval = yyvsp[0].tsym.type; }
break;
- case 117:
-#line 1000 "c-exp.y"
+ case 122:
+#line 1050 "c-exp.y"
{ yyval.tval = lookup_signed_typename (parse_language,
parse_gdbarch,
"int"); }
break;
- case 118:
-#line 1004 "c-exp.y"
+ case 123:
+#line 1054 "c-exp.y"
{ yyval.tval = lookup_signed_typename (parse_language,
parse_gdbarch,
"long"); }
break;
- case 119:
-#line 1008 "c-exp.y"
+ case 124:
+#line 1058 "c-exp.y"
{ yyval.tval = lookup_signed_typename (parse_language,
parse_gdbarch,
"short"); }
break;
- case 120:
-#line 1012 "c-exp.y"
+ case 125:
+#line 1062 "c-exp.y"
{ yyval.tval = lookup_signed_typename (parse_language,
parse_gdbarch,
"long"); }
break;
- case 121:
-#line 1016 "c-exp.y"
+ case 126:
+#line 1066 "c-exp.y"
{ yyval.tval = lookup_signed_typename (parse_language,
parse_gdbarch,
"long"); }
break;
- case 122:
-#line 1020 "c-exp.y"
+ case 127:
+#line 1070 "c-exp.y"
{ yyval.tval = lookup_signed_typename (parse_language,
parse_gdbarch,
"long"); }
break;
- case 123:
-#line 1024 "c-exp.y"
+ case 128:
+#line 1074 "c-exp.y"
{ yyval.tval = lookup_signed_typename (parse_language,
parse_gdbarch,
"long"); }
break;
- case 124:
-#line 1028 "c-exp.y"
+ case 129:
+#line 1078 "c-exp.y"
{ yyval.tval = lookup_unsigned_typename (parse_language,
parse_gdbarch,
"long"); }
break;
- case 125:
-#line 1032 "c-exp.y"
+ case 130:
+#line 1082 "c-exp.y"
{ yyval.tval = lookup_unsigned_typename (parse_language,
parse_gdbarch,
"long"); }
break;
- case 126:
-#line 1036 "c-exp.y"
+ case 131:
+#line 1086 "c-exp.y"
{ yyval.tval = lookup_unsigned_typename (parse_language,
parse_gdbarch,
"long"); }
break;
- case 127:
-#line 1040 "c-exp.y"
+ case 132:
+#line 1090 "c-exp.y"
{ yyval.tval = lookup_signed_typename (parse_language,
parse_gdbarch,
"long long"); }
break;
- case 128:
-#line 1044 "c-exp.y"
+ case 133:
+#line 1094 "c-exp.y"
{ yyval.tval = lookup_signed_typename (parse_language,
parse_gdbarch,
"long long"); }
break;
- case 129:
-#line 1048 "c-exp.y"
+ case 134:
+#line 1098 "c-exp.y"
{ yyval.tval = lookup_signed_typename (parse_language,
parse_gdbarch,
"long long"); }
break;
- case 130:
-#line 1052 "c-exp.y"
+ case 135:
+#line 1102 "c-exp.y"
{ yyval.tval = lookup_signed_typename (parse_language,
parse_gdbarch,
"long long"); }
break;
- case 131:
-#line 1056 "c-exp.y"
+ case 136:
+#line 1106 "c-exp.y"
{ yyval.tval = lookup_signed_typename (parse_language,
parse_gdbarch,
"long long"); }
break;
- case 132:
-#line 1060 "c-exp.y"
+ case 137:
+#line 1110 "c-exp.y"
{ yyval.tval = lookup_signed_typename (parse_language,
parse_gdbarch,
"long long"); }
break;
- case 133:
-#line 1064 "c-exp.y"
+ case 138:
+#line 1114 "c-exp.y"
{ yyval.tval = lookup_unsigned_typename (parse_language,
parse_gdbarch,
"long long"); }
break;
- case 134:
-#line 1068 "c-exp.y"
+ case 139:
+#line 1118 "c-exp.y"
{ yyval.tval = lookup_unsigned_typename (parse_language,
parse_gdbarch,
"long long"); }
break;
- case 135:
-#line 1072 "c-exp.y"
+ case 140:
+#line 1122 "c-exp.y"
{ yyval.tval = lookup_unsigned_typename (parse_language,
parse_gdbarch,
"long long"); }
break;
- case 136:
-#line 1076 "c-exp.y"
+ case 141:
+#line 1126 "c-exp.y"
{ yyval.tval = lookup_unsigned_typename (parse_language,
parse_gdbarch,
"long long"); }
break;
- case 137:
-#line 1080 "c-exp.y"
+ case 142:
+#line 1130 "c-exp.y"
{ yyval.tval = lookup_signed_typename (parse_language,
parse_gdbarch,
"short"); }
break;
- case 138:
-#line 1084 "c-exp.y"
+ case 143:
+#line 1134 "c-exp.y"
{ yyval.tval = lookup_signed_typename (parse_language,
parse_gdbarch,
"short"); }
break;
- case 139:
-#line 1088 "c-exp.y"
+ case 144:
+#line 1138 "c-exp.y"
{ yyval.tval = lookup_signed_typename (parse_language,
parse_gdbarch,
"short"); }
break;
- case 140:
-#line 1092 "c-exp.y"
+ case 145:
+#line 1142 "c-exp.y"
{ yyval.tval = lookup_unsigned_typename (parse_language,
parse_gdbarch,
"short"); }
break;
- case 141:
-#line 1096 "c-exp.y"
+ case 146:
+#line 1146 "c-exp.y"
{ yyval.tval = lookup_unsigned_typename (parse_language,
parse_gdbarch,
"short"); }
break;
- case 142:
-#line 1100 "c-exp.y"
+ case 147:
+#line 1150 "c-exp.y"
{ yyval.tval = lookup_unsigned_typename (parse_language,
parse_gdbarch,
"short"); }
break;
- case 143:
-#line 1104 "c-exp.y"
+ case 148:
+#line 1154 "c-exp.y"
{ yyval.tval = lookup_typename (parse_language, parse_gdbarch,
"double", (struct block *) NULL,
0); }
break;
- case 144:
-#line 1108 "c-exp.y"
+ case 149:
+#line 1158 "c-exp.y"
{ yyval.tval = lookup_typename (parse_language, parse_gdbarch,
"long double",
(struct block *) NULL, 0); }
break;
- case 145:
-#line 1112 "c-exp.y"
+ case 150:
+#line 1162 "c-exp.y"
{ yyval.tval = lookup_struct (copy_name (yyvsp[0].sval),
expression_context_block); }
break;
- case 146:
-#line 1115 "c-exp.y"
+ case 151:
+#line 1165 "c-exp.y"
{ yyval.tval = lookup_struct (copy_name (yyvsp[0].sval),
expression_context_block); }
break;
- case 147:
-#line 1118 "c-exp.y"
+ case 152:
+#line 1168 "c-exp.y"
{ yyval.tval = lookup_union (copy_name (yyvsp[0].sval),
expression_context_block); }
break;
- case 148:
-#line 1121 "c-exp.y"
+ case 153:
+#line 1171 "c-exp.y"
{ yyval.tval = lookup_enum (copy_name (yyvsp[0].sval),
expression_context_block); }
break;
- case 149:
-#line 1124 "c-exp.y"
+ case 154:
+#line 1174 "c-exp.y"
{ yyval.tval = lookup_unsigned_typename (parse_language,
parse_gdbarch,
TYPE_NAME(yyvsp[0].tsym.type)); }
break;
- case 150:
-#line 1128 "c-exp.y"
+ case 155:
+#line 1178 "c-exp.y"
{ yyval.tval = lookup_unsigned_typename (parse_language,
parse_gdbarch,
"int"); }
break;
- case 151:
-#line 1132 "c-exp.y"
+ case 156:
+#line 1182 "c-exp.y"
{ yyval.tval = lookup_signed_typename (parse_language,
parse_gdbarch,
TYPE_NAME(yyvsp[0].tsym.type)); }
break;
- case 152:
-#line 1136 "c-exp.y"
+ case 157:
+#line 1186 "c-exp.y"
{ yyval.tval = lookup_signed_typename (parse_language,
parse_gdbarch,
"int"); }
break;
- case 153:
-#line 1143 "c-exp.y"
+ case 158:
+#line 1193 "c-exp.y"
{ yyval.tval = lookup_template_type(copy_name(yyvsp[-3].sval), yyvsp[-1].tval,
expression_context_block);
}
break;
- case 154:
-#line 1147 "c-exp.y"
+ case 159:
+#line 1197 "c-exp.y"
{ yyval.tval = follow_types (yyvsp[0].tval); }
break;
- case 155:
-#line 1149 "c-exp.y"
+ case 160:
+#line 1199 "c-exp.y"
{ yyval.tval = follow_types (yyvsp[-1].tval); }
break;
- case 157:
-#line 1154 "c-exp.y"
+ case 162:
+#line 1204 "c-exp.y"
{
yyval.tsym.stoken.ptr = "int";
yyval.tsym.stoken.length = 3;
@@ -2797,8 +2879,8 @@ yyreduce:
}
break;
- case 158:
-#line 1162 "c-exp.y"
+ case 163:
+#line 1212 "c-exp.y"
{
yyval.tsym.stoken.ptr = "long";
yyval.tsym.stoken.length = 4;
@@ -2808,8 +2890,8 @@ yyreduce:
}
break;
- case 159:
-#line 1170 "c-exp.y"
+ case 164:
+#line 1220 "c-exp.y"
{
yyval.tsym.stoken.ptr = "short";
yyval.tsym.stoken.length = 5;
@@ -2819,131 +2901,154 @@ yyreduce:
}
break;
- case 160:
-#line 1181 "c-exp.y"
- { yyval.tvec = (struct type **) xmalloc (sizeof (struct type *) * 2);
- yyval.ivec[0] = 1; /* Number of types in vector */
- yyval.tvec[1] = yyvsp[0].tval;
+ case 165:
+#line 1231 "c-exp.y"
+ { check_parameter_typelist (yyvsp[0].tvec); }
+ break;
+
+ case 166:
+#line 1233 "c-exp.y"
+ {
+ VEC_safe_push (type_ptr, yyvsp[-2].tvec, NULL);
+ check_parameter_typelist (yyvsp[-2].tvec);
+ yyval.tvec = yyvsp[-2].tvec;
+ }
+ break;
+
+ case 167:
+#line 1242 "c-exp.y"
+ {
+ VEC (type_ptr) *typelist = NULL;
+ VEC_safe_push (type_ptr, typelist, yyvsp[0].tval);
+ yyval.tvec = typelist;
}
break;
- case 161:
-#line 1186 "c-exp.y"
- { int len = sizeof (struct type *) * (++(yyvsp[-2].ivec[0]) + 1);
- yyval.tvec = (struct type **) xrealloc ((char *) yyvsp[-2].tvec, len);
- yyval.tvec[yyval.ivec[0]] = yyvsp[0].tval;
+ case 168:
+#line 1248 "c-exp.y"
+ {
+ VEC_safe_push (type_ptr, yyvsp[-2].tvec, yyvsp[0].tval);
+ yyval.tvec = yyvsp[-2].tvec;
}
break;
- case 163:
-#line 1194 "c-exp.y"
- { yyval.tval = follow_types (yyvsp[-3].tval); }
+ case 170:
+#line 1256 "c-exp.y"
+ {
+ push_type_stack (yyvsp[0].type_stack);
+ yyval.tval = follow_types (yyvsp[-1].tval);
+ }
break;
- case 166:
-#line 1202 "c-exp.y"
- { push_type (tp_const);
- push_type (tp_volatile);
+ case 171:
+#line 1263 "c-exp.y"
+ { yyval.tval = follow_types (yyvsp[-1].tval); }
+ break;
+
+ case 176:
+#line 1275 "c-exp.y"
+ { insert_type (tp_const);
+ insert_type (tp_volatile);
}
break;
- case 167:
-#line 1206 "c-exp.y"
- { push_type (tp_const); }
+ case 177:
+#line 1279 "c-exp.y"
+ { insert_type (tp_const); }
break;
- case 168:
-#line 1208 "c-exp.y"
- { push_type (tp_volatile); }
+ case 178:
+#line 1281 "c-exp.y"
+ { insert_type (tp_volatile); }
break;
- case 169:
-#line 1212 "c-exp.y"
+ case 179:
+#line 1285 "c-exp.y"
{ yyval.sval = operator_stoken (" new"); }
break;
- case 170:
-#line 1214 "c-exp.y"
+ case 180:
+#line 1287 "c-exp.y"
{ yyval.sval = operator_stoken (" delete"); }
break;
- case 171:
-#line 1216 "c-exp.y"
+ case 181:
+#line 1289 "c-exp.y"
{ yyval.sval = operator_stoken (" new[]"); }
break;
- case 172:
-#line 1218 "c-exp.y"
+ case 182:
+#line 1291 "c-exp.y"
{ yyval.sval = operator_stoken (" delete[]"); }
break;
- case 173:
-#line 1220 "c-exp.y"
+ case 183:
+#line 1293 "c-exp.y"
{ yyval.sval = operator_stoken ("+"); }
break;
- case 174:
-#line 1222 "c-exp.y"
+ case 184:
+#line 1295 "c-exp.y"
{ yyval.sval = operator_stoken ("-"); }
break;
- case 175:
-#line 1224 "c-exp.y"
+ case 185:
+#line 1297 "c-exp.y"
{ yyval.sval = operator_stoken ("*"); }
break;
- case 176:
-#line 1226 "c-exp.y"
+ case 186:
+#line 1299 "c-exp.y"
{ yyval.sval = operator_stoken ("/"); }
break;
- case 177:
-#line 1228 "c-exp.y"
+ case 187:
+#line 1301 "c-exp.y"
{ yyval.sval = operator_stoken ("%"); }
break;
- case 178:
-#line 1230 "c-exp.y"
+ case 188:
+#line 1303 "c-exp.y"
{ yyval.sval = operator_stoken ("^"); }
break;
- case 179:
-#line 1232 "c-exp.y"
+ case 189:
+#line 1305 "c-exp.y"
{ yyval.sval = operator_stoken ("&"); }
break;
- case 180:
-#line 1234 "c-exp.y"
+ case 190:
+#line 1307 "c-exp.y"
{ yyval.sval = operator_stoken ("|"); }
break;
- case 181:
-#line 1236 "c-exp.y"
+ case 191:
+#line 1309 "c-exp.y"
{ yyval.sval = operator_stoken ("~"); }
break;
- case 182:
-#line 1238 "c-exp.y"
+ case 192:
+#line 1311 "c-exp.y"
{ yyval.sval = operator_stoken ("!"); }
break;
- case 183:
-#line 1240 "c-exp.y"
+ case 193:
+#line 1313 "c-exp.y"
{ yyval.sval = operator_stoken ("="); }
break;
- case 184:
-#line 1242 "c-exp.y"
+ case 194:
+#line 1315 "c-exp.y"
{ yyval.sval = operator_stoken ("<"); }
break;
- case 185:
-#line 1244 "c-exp.y"
+ case 195:
+#line 1317 "c-exp.y"
{ yyval.sval = operator_stoken (">"); }
break;
- case 186:
-#line 1246 "c-exp.y"
+ case 196:
+#line 1319 "c-exp.y"
{ const char *op = "unknown";
switch (yyvsp[0].opcode)
{
@@ -2985,83 +3090,83 @@ yyreduce:
}
break;
- case 187:
-#line 1286 "c-exp.y"
+ case 197:
+#line 1359 "c-exp.y"
{ yyval.sval = operator_stoken ("<<"); }
break;
- case 188:
-#line 1288 "c-exp.y"
+ case 198:
+#line 1361 "c-exp.y"
{ yyval.sval = operator_stoken (">>"); }
break;
- case 189:
-#line 1290 "c-exp.y"
+ case 199:
+#line 1363 "c-exp.y"
{ yyval.sval = operator_stoken ("=="); }
break;
- case 190:
-#line 1292 "c-exp.y"
+ case 200:
+#line 1365 "c-exp.y"
{ yyval.sval = operator_stoken ("!="); }
break;
- case 191:
-#line 1294 "c-exp.y"
+ case 201:
+#line 1367 "c-exp.y"
{ yyval.sval = operator_stoken ("<="); }
break;
- case 192:
-#line 1296 "c-exp.y"
+ case 202:
+#line 1369 "c-exp.y"
{ yyval.sval = operator_stoken (">="); }
break;
- case 193:
-#line 1298 "c-exp.y"
+ case 203:
+#line 1371 "c-exp.y"
{ yyval.sval = operator_stoken ("&&"); }
break;
- case 194:
-#line 1300 "c-exp.y"
+ case 204:
+#line 1373 "c-exp.y"
{ yyval.sval = operator_stoken ("||"); }
break;
- case 195:
-#line 1302 "c-exp.y"
+ case 205:
+#line 1375 "c-exp.y"
{ yyval.sval = operator_stoken ("++"); }
break;
- case 196:
-#line 1304 "c-exp.y"
+ case 206:
+#line 1377 "c-exp.y"
{ yyval.sval = operator_stoken ("--"); }
break;
- case 197:
-#line 1306 "c-exp.y"
+ case 207:
+#line 1379 "c-exp.y"
{ yyval.sval = operator_stoken (","); }
break;
- case 198:
-#line 1308 "c-exp.y"
+ case 208:
+#line 1381 "c-exp.y"
{ yyval.sval = operator_stoken ("->*"); }
break;
- case 199:
-#line 1310 "c-exp.y"
+ case 209:
+#line 1383 "c-exp.y"
{ yyval.sval = operator_stoken ("->"); }
break;
- case 200:
-#line 1312 "c-exp.y"
+ case 210:
+#line 1385 "c-exp.y"
{ yyval.sval = operator_stoken ("()"); }
break;
- case 201:
-#line 1314 "c-exp.y"
+ case 211:
+#line 1387 "c-exp.y"
{ yyval.sval = operator_stoken ("[]"); }
break;
- case 202:
-#line 1316 "c-exp.y"
+ case 212:
+#line 1389 "c-exp.y"
{ char *name;
long length;
struct ui_file *buf = mem_fileopen ();
@@ -3074,38 +3179,38 @@ yyreduce:
}
break;
- case 203:
-#line 1330 "c-exp.y"
+ case 213:
+#line 1403 "c-exp.y"
{ yyval.sval = yyvsp[0].ssym.stoken; }
break;
- case 204:
-#line 1331 "c-exp.y"
+ case 214:
+#line 1404 "c-exp.y"
{ yyval.sval = yyvsp[0].ssym.stoken; }
break;
- case 205:
-#line 1332 "c-exp.y"
+ case 215:
+#line 1405 "c-exp.y"
{ yyval.sval = yyvsp[0].tsym.stoken; }
break;
- case 206:
-#line 1333 "c-exp.y"
+ case 216:
+#line 1406 "c-exp.y"
{ yyval.sval = yyvsp[0].ssym.stoken; }
break;
- case 207:
-#line 1334 "c-exp.y"
+ case 217:
+#line 1407 "c-exp.y"
{ yyval.sval = yyvsp[0].ssym.stoken; }
break;
- case 208:
-#line 1335 "c-exp.y"
+ case 218:
+#line 1408 "c-exp.y"
{ yyval.sval = yyvsp[0].sval; }
break;
- case 211:
-#line 1348 "c-exp.y"
+ case 221:
+#line 1421 "c-exp.y"
{
yyval.ssym.stoken = yyvsp[0].sval;
yyval.ssym.sym = lookup_symbol (yyvsp[0].sval.ptr,
@@ -3119,7 +3224,7 @@ yyreduce:
}
/* Line 1000 of yacc.c. */
-#line 3123 "c-exp.c"
+#line 3228 "c-exp.c"
yyvsp -= yylen;
yyssp -= yylen;
@@ -3344,7 +3449,7 @@ yyreturn:
}
-#line 1358 "c-exp.y"
+#line 1431 "c-exp.y"
/* Returns a stoken of the operator name given by OP (which does not
@@ -3364,6 +3469,37 @@ operator_stoken (const char *op)
return st;
};
+/* Validate a parameter typelist. */
+
+static void
+check_parameter_typelist (VEC (type_ptr) *params)
+{
+ struct type *type;
+ int ix;
+
+ for (ix = 0; VEC_iterate (type_ptr, params, ix, type); ++ix)
+ {
+ if (type != NULL && TYPE_CODE (check_typedef (type)) == TYPE_CODE_VOID)
+ {
+ if (ix == 0)
+ {
+ if (VEC_length (type_ptr, params) == 1)
+ {
+ /* Ok. */
+ break;
+ }
+ VEC_free (type_ptr, params);
+ error (_("parameter types following 'void'"));
+ }
+ else
+ {
+ VEC_free (type_ptr, params);
+ error (_("'void' invalid as parameter type"));
+ }
+ }
+ }
+}
+
/* Take care of parsing a number (anything that starts with a digit).
Set yylval and return the token type; update lexptr.
LEN is the number of characters in it. */
@@ -3396,9 +3532,6 @@ parse_number (char *p, int len, int parsed_float, YYSTYPE *putithere)
if (parsed_float)
{
- const char *suffix;
- int suffix_len;
-
/* If it ends at "df", "dd" or "dl", take it as type of decimal floating
point. Return DECFLOAT. */
@@ -3876,7 +4009,8 @@ static const struct token tokentab3[] =
{
{">>=", ASSIGN_MODIFY, BINOP_RSH, 0},
{"<<=", ASSIGN_MODIFY, BINOP_LSH, 0},
- {"->*", ARROW_STAR, BINOP_END, 1}
+ {"->*", ARROW_STAR, BINOP_END, 1},
+ {"...", DOTDOTDOT, BINOP_END, 0}
};
static const struct token tokentab2[] =
@@ -4485,9 +4619,8 @@ classify_name (struct block *block)
/* Like classify_name, but used by the inner loop of the lexer, when a
name might have already been seen. FIRST_NAME is true if the token
- in `yylval' is the first component of a name, false otherwise. If
- this function returns NAME, it might not have updated `yylval'.
- This is ok because the caller only cares about TYPENAME. */
+ in `yylval' is the first component of a name, false otherwise. */
+
static int
classify_inner_name (struct block *block, int first_name)
{
@@ -4501,18 +4634,28 @@ classify_inner_name (struct block *block, int first_name)
if (TYPE_CODE (type) != TYPE_CODE_STRUCT
&& TYPE_CODE (type) != TYPE_CODE_UNION
&& TYPE_CODE (type) != TYPE_CODE_NAMESPACE)
- /* We know the caller won't expect us to update yylval. */
- return NAME;
+ return ERROR;
copy = copy_name (yylval.tsym.stoken);
- new_type = cp_lookup_nested_type (yylval.tsym.type, copy, block);
+ yylval.ssym.sym = cp_lookup_nested_symbol (yylval.tsym.type, copy, block);
+ if (yylval.ssym.sym == NULL)
+ return ERROR;
- if (new_type == NULL)
- /* We know the caller won't expect us to update yylval. */
- return NAME;
+ switch (SYMBOL_CLASS (yylval.ssym.sym))
+ {
+ case LOC_BLOCK:
+ case LOC_LABEL:
+ return ERROR;
- yylval.tsym.type = new_type;
- return TYPENAME;
+ case LOC_TYPEDEF:
+ yylval.tsym.type = SYMBOL_TYPE (yylval.ssym.sym);;
+ return TYPENAME;
+
+ default:
+ yylval.ssym.is_a_field_of_this = 0;
+ return NAME;
+ }
+ internal_error (__FILE__, __LINE__, _("not reached"));
}
/* The outer level of a two-level lexer. This calls the inner lexer
@@ -4572,7 +4715,7 @@ yylex (void)
first_iter);
/* We keep going until we either run out of names, or until
we have a qualified name which is not a type. */
- if (classification != TYPENAME)
+ if (classification != TYPENAME && classification != NAME)
{
/* Push the final component and leave the loop. */
VEC_safe_push (token_and_value, token_fifo, &next);
« no previous file with comments | « gdb/buildsym.c ('k') | gdb/c-exp.y » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698