Rewrite gdb.asm so that it doesn't assume a C comiler (or any C

[deliverable/binutils-gdb.git] / gdb / c-exp.y

diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index 377f92a9fb1d6a79bbacbca96bea0436a40b3e4b..d4291f7b979806d8615d98c7d01171277b9a4648 100644 (file)
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -102,14 +102,11 @@ extern int hp_som_som_object_present;
 #define        YYDEBUG 0               /* Default to no yydebug support */
 #endif
 
-int
-yyparse PARAMS ((void));
+int yyparse (void);
 
-static int
-yylex PARAMS ((void));
+static int yylex (void);
 
-void
-yyerror PARAMS ((char *));
+void yyerror (char *);
 
 %}
 
@@ -144,8 +141,7 @@ yyerror PARAMS ((char *));
 
 %{
 /* YYSTYPE gets defined by %union */
-static int
-parse_number PARAMS ((char *, int, int, YYSTYPE *));
+static int parse_number (char *, int, int, YYSTYPE *);
 %}
 
 %type <voidval> exp exp1 type_exp start variable qualified_name lcurly
@@ -1437,8 +1433,6 @@ yylex ()
 
       if (c == '<')
        { 
-           if (hp_som_som_object_present)
-             {
                /* Scan ahead to get rest of the template specification.  Note
                   that we look ahead only when the '<' adjoins non-whitespace
                   characters; for comparison expressions, e.g. "a < b > c",
@@ -1448,26 +1442,6 @@ yylex ()
                if (p)
                  namelen = p - tokstart;
                break;
-             }
-           else
-             { 
-              int i = namelen;
-              int nesting_level = 1;
-              while (tokstart[++i])
-                {
-                  if (tokstart[i] == '<')
-                    nesting_level++;
-                  else if (tokstart[i] == '>')
-                    {
-                      if (--nesting_level == 0)
-                        break;
-                    }
-                }
-              if (tokstart[i] == '>')
-                namelen = i;
-              else
-                break;
-            }
        }
       c = tokstart[++namelen];
     }