Merge GDB 7.5.1

gdb/cp-name-parser.c

 /* A Bison parser, made by GNU Bison 1.875c.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
@@ skipping 286 matching lines @@
 #define yyrule  cpname_rule             /* With YYDEBUG defined */
 #define yylhs   cpname_yylhs
 #define yylen   cpname_yylen
 #define yydefred cpname_yydefred
 #define yydgoto cpname_yydgoto
 #define yysindex cpname_yysindex
 #define yyrindex cpname_yyrindex
 #define yygindex cpname_yygindex
 #define yytable  cpname_yytable
 #define yycheck  cpname_yycheck
+#define yyss    cpname_yyss
+#define yysslim cpname_yysslim
+#define yyssp   cpname_yyssp
+#define yystacksize cpname_yystacksize
+#define yyvs    cpname_yyvs
+#define yyvsp   cpname_yyvsp
 
 int yyparse (void);
 static int yylex (void);
 static void yyerror (char *);
 
 /* Enable yydebug for the stand-alone parser.  */
 #ifdef TEST_CPNAMES
 # define YYDEBUG        1
 #endif
 
 /* Helper functions.  These wrap the demangler tree interface, handle
    allocation from our global store, and return the allocated component.  */
 
 static struct demangle_component *
 fill_comp (enum demangle_component_type d_type, struct demangle_component *lhs,
            struct demangle_component *rhs)
 {
   struct demangle_component *ret = d_grab ();
-  cplus_demangle_fill_component (ret, d_type, lhs, rhs);
+  int i;
+
+  i = cplus_demangle_fill_component (ret, d_type, lhs, rhs);
+  gdb_assert (i);
+
   return ret;
 }
 
 static struct demangle_component *
 make_empty (enum demangle_component_type d_type)
 {
   struct demangle_component *ret = d_grab ();
   ret->type = d_type;
   return ret;
 }
 
 static struct demangle_component *
 make_operator (const char *name, int args)
 {
   struct demangle_component *ret = d_grab ();
-  cplus_demangle_fill_operator (ret, name, args);
+  int i;
+
+  i = cplus_demangle_fill_operator (ret, name, args);
+  gdb_assert (i);
+
   return ret;
 }
 
 static struct demangle_component *
 make_dtor (enum gnu_v3_dtor_kinds kind, struct demangle_component *name)
 {
   struct demangle_component *ret = d_grab ();
-  cplus_demangle_fill_dtor (ret, kind, name);
+  int i;
+
+  i = cplus_demangle_fill_dtor (ret, kind, name);
+  gdb_assert (i);
+
   return ret;
 }
 
 static struct demangle_component *
 make_builtin_type (const char *name)
 {
   struct demangle_component *ret = d_grab ();
-  cplus_demangle_fill_builtin_type (ret, name);
+  int i;
+
+  i = cplus_demangle_fill_builtin_type (ret, name);
+  gdb_assert (i);
+
   return ret;
 }
 
 static struct demangle_component *
 make_name (const char *name, int len)
 {
   struct demangle_component *ret = d_grab ();
-  cplus_demangle_fill_name (ret, name, len);
+  int i;
+
+  i = cplus_demangle_fill_name (ret, name, len);
+  gdb_assert (i);
+
   return ret;
 }
 
 #define d_left(dc) (dc)->u.s_binary.left
 #define d_right(dc) (dc)->u.s_binary.right
 
 
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
 #endif
 
 /* Enabling verbose error messages.  */
 #ifdef YYERROR_VERBOSE
 # undef YYERROR_VERBOSE
 # define YYERROR_VERBOSE 1
 #else
 # define YYERROR_VERBOSE 0
 #endif
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 241 "cp-name-parser.y"
+#line 267 "cp-name-parser.y"
 typedef union YYSTYPE {
     struct demangle_component *comp;
     struct nested {
       struct demangle_component *comp;
       struct demangle_component **last;
     } nested;
     struct {
       struct demangle_component *comp, *last;
     } nested1;
     struct {
       struct demangle_component *comp, **last;
       struct nested fn;
       struct demangle_component *start;
       int fold_flag;
     } abstract;
     int lval;
     const char *opname;
   } YYSTYPE;
 /* Line 191 of yacc.c.  */
-#line 409 "cp-name-parser.c"
+#line 435 "cp-name-parser.c"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
 
 /* Copy the second part of user declarations.  */
 
 
 /* Line 214 of yacc.c.  */
-#line 421 "cp-name-parser.c"
+#line 447 "cp-name-parser.c"
 
 #if ! defined (yyoverflow) || YYERROR_VERBOSE
 
 # ifndef YYFREE
 #  define YYFREE xfree
 # endif
 # ifndef YYMALLOC
 #  define YYMALLOC xmalloc
 # endif
 
@@ skipping 236 matching lines @@
       52,   113,    -1,   113,    49,   113,    -1,   113,    48,   113,
       -1,   113,    47,   113,    -1,   113,    46,   113,    -1,   113,
       45,   113,    -1,   113,    69,     5,    -1,   113,    67,     5,
       -1,   113,    44,   113,    74,   113,    -1,     3,    -1,     4,
       -1,    10,    73,   108,    41,    -1,    36,    -1,    37,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short yyrline[] =
 {
-       0,   355,   355,   359,   361,   363,   368,   369,   376,   385,
-     388,   392,   395,   414,   418,   422,   424,   426,   428,   430,
-     432,   434,   436,   438,   440,   442,   444,   446,   448,   450,
-     452,   454,   456,   458,   460,   462,   464,   466,   468,   470,
-     472,   474,   476,   478,   480,   482,   484,   486,   494,   499,
-     504,   508,   513,   521,   522,   524,   536,   537,   543,   545,
-     546,   548,   551,   552,   555,   556,   560,   562,   565,   571,
-     578,   584,   595,   599,   602,   613,   614,   618,   620,   622,
-     625,   629,   634,   639,   645,   655,   659,   663,   671,   672,
-     675,   677,   679,   683,   684,   691,   693,   695,   697,   699,
-     701,   705,   706,   710,   712,   714,   716,   718,   720,   722,
-     726,   732,   736,   744,   754,   758,   774,   776,   777,   779,
-     782,   784,   785,   787,   790,   792,   794,   796,   801,   804,
-     809,   816,   820,   831,   837,   855,   858,   866,   868,   879,
-     886,   887,   893,   897,   901,   903,   908,   913,   926,   930,
-     935,   943,   948,   957,   961,   966,   971,   975,   981,   987,
-     990,   997,   999,  1004,  1008,  1012,  1019,  1035,  1042,  1049,
-    1068,  1072,  1076,  1080,  1084,  1088,  1092,  1096,  1100,  1104,
-    1108,  1112,  1116,  1120,  1124,  1128,  1132,  1137,  1141,  1145,
-    1152,  1156,  1159,  1164,  1173
+       0,   381,   381,   385,   387,   389,   394,   395,   402,   411,
+     414,   418,   421,   440,   444,   448,   450,   452,   454,   456,
+     458,   460,   462,   464,   466,   468,   470,   472,   474,   476,
+     478,   480,   482,   484,   486,   488,   490,   492,   494,   496,
+     498,   500,   502,   504,   506,   508,   510,   512,   520,   525,
+     530,   534,   539,   547,   548,   550,   562,   563,   569,   571,
+     572,   574,   577,   578,   581,   582,   586,   588,   591,   597,
+     604,   610,   621,   625,   628,   639,   640,   644,   646,   648,
+     651,   655,   660,   665,   671,   681,   685,   689,   697,   698,
+     701,   703,   705,   709,   710,   717,   719,   721,   723,   725,
+     727,   731,   732,   736,   738,   740,   742,   744,   746,   748,
+     752,   758,   762,   770,   780,   784,   800,   802,   803,   805,
+     808,   810,   811,   813,   816,   818,   820,   822,   827,   830,
+     835,   842,   846,   857,   863,   881,   884,   892,   894,   905,
+     912,   913,   919,   923,   927,   929,   934,   939,   952,   956,
+     961,   969,   974,   983,   987,   992,   997,  1001,  1007,  1013,
+    1016,  1023,  1025,  1030,  1034,  1038,  1045,  1061,  1068,  1075,
+    1094,  1098,  1102,  1106,  1110,  1114,  1118,  1122,  1126,  1130,
+    1134,  1138,  1142,  1146,  1150,  1154,  1158,  1163,  1167,  1171,
+    1178,  1182,  1185,  1190,  1199
 };
 #endif
 
 #if YYDEBUG || YYERROR_VERBOSE
 /* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 static const char *const yytname[] =
 {
   "$end", "error", "$undefined", "INT", "FLOAT", "NAME", "STRUCT",
   "CLASS", "UNION", "ENUM", "SIZEOF", "UNSIGNED", "COLONCOLON", "TEMPLATE",
@@ skipping 1053 matching lines @@
 
   /* If YYLEN is nonzero, implement the default value of the action:
      `$$ = $1'.
 
      Otherwise, the following line sets YYVAL to garbage.
      This behavior is undocumented and Bison
      users should not rely upon it.  Assigning to YYVAL
      unconditionally makes the parser a bit smaller, and it avoids a
      GCC warning that YYVAL may be used uninitialized.  */
   yyval = yyvsp[1-yylen];