* m32c-desc.c: Regenerated.

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

diff --git a/gdb/f-exp.y b/gdb/f-exp.y
index 1555d5edb2a3ab024814f8f980ce2965157253a1..4e1f6359e2ec84e2e580c21e0e349d3925c10c48 100644 (file)
--- a/gdb/f-exp.y
+++ b/gdb/f-exp.y
@@ -1,6 +1,6 @@
 /* YACC parser for Fortran expressions, for GDB.
-   Copyright 1986, 1989, 1990, 1991, 1993, 1994, 1995, 1996, 2000, 2001
-   Free Software Foundation, Inc.
+   Copyright 1986, 1989, 1990, 1991, 1993, 1994, 1995, 1996, 2000, 2001,
+   2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
    Contributed by Motorola.  Adapted from the C parser by Farooq Butt
    (fmbutt@engage.sps.mot.com).
@@ -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.
@@ -219,6 +217,7 @@ static int parse_number (char *, int, int, YYSTYPE *);
 %left '@'
 %left '+' '-'
 %left '*' '/' '%'
+%right STARSTAR
 %right UNARY 
 %right '('
 
@@ -284,18 +283,39 @@ arglist   :       exp
                        { arglist_len = 1; }
        ;
 
-arglist :      substring
-                        { arglist_len = 2;}
+arglist :      subrange
+                       { arglist_len = 1; }
        ;
    
 arglist        :       arglist ',' exp   %prec ABOVE_COMMA
                        { arglist_len++; }
        ;
 
-substring:     exp ':' exp   %prec ABOVE_COMMA
-                       { } 
+/* There are four sorts of subrange types in F90.  */
+
+subrange:      exp ':' exp     %prec ABOVE_COMMA
+                       { write_exp_elt_opcode (OP_F90_RANGE); 
+                         write_exp_elt_longcst (NONE_BOUND_DEFAULT);
+                         write_exp_elt_opcode (OP_F90_RANGE); }
        ;
 
+subrange:      exp ':' %prec ABOVE_COMMA
+                       { write_exp_elt_opcode (OP_F90_RANGE);
+                         write_exp_elt_longcst (HIGH_BOUND_DEFAULT);
+                         write_exp_elt_opcode (OP_F90_RANGE); }
+       ;
+
+subrange:      ':' exp %prec ABOVE_COMMA
+                       { write_exp_elt_opcode (OP_F90_RANGE);
+                         write_exp_elt_longcst (LOW_BOUND_DEFAULT);
+                         write_exp_elt_opcode (OP_F90_RANGE); }
+       ;
+
+subrange:      ':'     %prec ABOVE_COMMA
+                       { write_exp_elt_opcode (OP_F90_RANGE);
+                         write_exp_elt_longcst (BOTH_BOUND_DEFAULT);
+                         write_exp_elt_opcode (OP_F90_RANGE); }
+       ;
 
 complexnum:     exp ',' exp 
                        { }                          
@@ -317,6 +337,10 @@ exp        :       exp '@' exp
                        { write_exp_elt_opcode (BINOP_REPEAT); }
        ;
 
+exp    :       exp STARSTAR exp
+                       { write_exp_elt_opcode (BINOP_EXP); }
+       ;
+
 exp    :       exp '*' exp
                        { write_exp_elt_opcode (BINOP_MUL); }
        ;
@@ -597,9 +621,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 +634,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 +957,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; 
@@ -954,16 +967,25 @@ yylex ()
        }
     }
   
-  /* See if it is a special .foo. operator */
+  /* 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;
        return dot_ops[i].token;
       }
   
+  /* See if it is an exponentiation operator.  */
+
+  if (strncmp (tokstart, "**", 2) == 0)
+    {
+      lexptr += 2;
+      yylval.opcode = BINOP_EXP;
+      return STARSTAR;
+    }
+
   switch (c = *tokstart)
     {
     case 0:
@@ -1114,8 +1136,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 +1172,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,