Merge GDB 7.5.1

gdb/cp-name-parser.y

 /* YACC parser for C++ names, for GDB.
 
    Copyright (C) 2003-2005, 2007-2012 Free Software Foundation, Inc.
 
    Parts of the lexer are based on c-exp.y from GDB.
 
    This file is part of GDB.
 
    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
@@ skipping 152 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
 
 %}
 
 %union
   {
@@ skipping 168 matching lines @@
                           if ($2.start) $$ = fill_comp (DEMANGLE_COMPONENT_LOCAL_NAME, $$, $2.start);
                         }
                 ;
 
 demangler_special
                 :       DEMANGLER_SPECIAL start
                         { $$ = make_empty ($1);
                           d_left ($$) = $2;
                           d_right ($$) = NULL; }
                 |       CONSTRUCTION_VTABLE start CONSTRUCTION_IN start