2005-02-15 Andrew Cagney <[email protected]>

[binutils.git] / gdb / f-exp.y

diff --git a/gdb/f-exp.y b/gdb/f-exp.y
index 1555d5edb2a3ab024814f8f980ce2965157253a1..a066c5ac57f9306a221a96ba422dcd90cbf490a6 100644 (file)
--- a/gdb/f-exp.y
+++ b/gdb/f-exp.y
@@ -177,9 +177,7 @@ static int parse_number (char *, int, int, YYSTYPE *);
 %token <lval> BOOLEAN_LITERAL
 %token <ssym> NAME 
 %token <tsym> TYPENAME
-%type <sval> name
 %type <ssym> name_not_typename
-%type <tsym> typename
 
 /* A NAME_OR_INT is a symbol which is not known in the symbol table,
    but which would parse as a valid number in the current input radix.
@@ -597,9 +595,6 @@ typebase  /* Implements (approximately): (type-qualifier)* type-specifier */
                        { $$ = builtin_type_f_complex_s32;}
        ;
 
-typename:      TYPENAME
-       ;
-
 nonempty_typelist
        :       type
                { $$ = (struct type **) malloc (sizeof (struct type *) * 2);
@@ -613,14 +608,6 @@ nonempty_typelist
                }
        ;
 
-name   :       NAME
-                       { $$ = $1.stoken; }
-       |       TYPENAME
-                       { $$ = $1.stoken; }
-       |       NAME_OR_INT
-                       { $$ = $1.stoken; }
-       ;
-
 name_not_typename :    NAME
 /* These would be useful if name_not_typename was useful, but it is just
    a fake for "variable", so these cause reduce/reduce conflicts because
@@ -944,8 +931,8 @@ yylex ()
     { 
       for (i = 0; boolean_values[i].name != NULL; i++)
        {
-         if STREQN (tokstart, boolean_values[i].name,
-                   strlen (boolean_values[i].name))
+         if (strncmp (tokstart, boolean_values[i].name,
+                      strlen (boolean_values[i].name)) == 0)
            {
              lexptr += strlen (boolean_values[i].name); 
              yylval.lval = boolean_values[i].value; 
@@ -957,7 +944,7 @@ yylex ()
   /* See if it is a special .foo. operator */
   
   for (i = 0; dot_ops[i].operator != NULL; i++)
-    if (STREQN (tokstart, dot_ops[i].operator, strlen (dot_ops[i].operator)))
+    if (strncmp (tokstart, dot_ops[i].operator, strlen (dot_ops[i].operator)) == 0)
       {
        lexptr += strlen (dot_ops[i].operator);
        yylval.opcode = dot_ops[i].opcode;
@@ -1114,8 +1101,8 @@ yylex ()
   /* Catch specific keywords.  */
   
   for (i = 0; f77_keywords[i].operator != NULL; i++)
-    if (STREQN(tokstart, f77_keywords[i].operator,
-               strlen(f77_keywords[i].operator)))
+    if (strncmp (tokstart, f77_keywords[i].operator,
+                strlen(f77_keywords[i].operator)) == 0)
       {
        /*      lexptr += strlen(f77_keywords[i].operator); */ 
        yylval.opcode = f77_keywords[i].opcode;
@@ -1150,7 +1137,10 @@ yylex ()
        yylval.tsym.type = SYMBOL_TYPE (sym);
        return TYPENAME;
       }
-    if ((yylval.tsym.type = lookup_primitive_typename (tmp)) != 0)
+    yylval.tsym.type
+      = language_lookup_primitive_type_by_name (current_language,
+                                               current_gdbarch, tmp);
+    if (yylval.tsym.type != NULL)
       return TYPENAME;
     
     /* Input names that aren't symbols but ARE valid hex numbers,