* inftarg.c (child_thread_alive): New function to see if a

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

diff --git a/gdb/f-exp.y b/gdb/f-exp.y
index df224684f9744bafb6365055a8e27b2f5866e00f..857b742b531cddf1d9a43f355c06cafd238e7c63 100644 (file)
--- a/gdb/f-exp.y
+++ b/gdb/f-exp.y
@@ -89,6 +89,15 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define        yylloc  f_lloc
 #define yyreds f_reds          /* With YYDEBUG defined */
 #define yytoks f_toks          /* With YYDEBUG defined */
+#define yylhs  f_yylhs
+#define yylen  f_yylen
+#define yydefred f_yydefred
+#define yydgoto        f_yydgoto
+#define yysindex f_yysindex
+#define yyrindex f_yyrindex
+#define yygindex f_yygindex
+#define yytable         f_yytable
+#define yycheck         f_yycheck
 
 #ifndef YYDEBUG
 #define        YYDEBUG 1               /* Default to no yydebug support */
@@ -279,7 +288,7 @@ complexnum:     exp ',' exp
         ;
 
 exp    :       '(' complexnum ')'
-                       { write_exp_elt_opcode(OP_F77_LITERAL_COMPLEX); }
+                       { write_exp_elt_opcode(OP_COMPLEX); }
        ;
 
 exp    :       '(' type ')' exp  %prec UNARY
@@ -436,32 +445,11 @@ exp     :       BOOLEAN_LITERAL
         ;
 
 exp    :       STRING_LITERAL
-                       {  /* In F77, we encounter string literals 
-                             basically in only one place:
-                             when we are setting up manual parameter 
-                             lists to functions we call by hand or 
-                             when setting string vars to manual values. 
-                             These are character*N type variables.
-                             They are treated specially  behind the 
-                             scenes. Remember that the literal strings's 
-                             OPs are being emitted in reverse order, thus 
-                             we first have the elements and then 
-                             the array descriptor itself.  */ 
-                         char *sp = $1.ptr; int count = $1.length;
-
-                         while (count-- > 0)
-                           {
-                             write_exp_elt_opcode (OP_LONG);
-                             write_exp_elt_type (builtin_type_f_character);
-                             write_exp_elt_longcst ((LONGEST)(*sp++));
-                             write_exp_elt_opcode (OP_LONG);
-                           }
-                         write_exp_elt_opcode (OP_ARRAY);
-                         write_exp_elt_longcst ((LONGEST) 1);
-                         write_exp_elt_longcst ((LONGEST) ($1.length)); 
-                         write_exp_elt_opcode (OP_ARRAY); 
+                       {
+                         write_exp_elt_opcode (OP_STRING);
+                         write_exp_string ($1);
+                         write_exp_elt_opcode (OP_STRING);
                        }
-
        ;
 
 variable:      name_not_typename
@@ -490,7 +478,8 @@ variable:   name_not_typename
                              struct minimal_symbol *msymbol;
                              register char *arg = copy_name ($1.stoken);
 
-                             msymbol = lookup_minimal_symbol (arg, NULL);
+                             msymbol =
+                               lookup_minimal_symbol (arg, NULL, NULL);
                              if (msymbol != NULL)
                                {
                                  write_exp_msymbol (msymbol,
@@ -1050,8 +1039,8 @@ yylex ()
              got_dot = got_d = 1;
            else if (!hex && !got_dot && *p == '.')
              got_dot = 1;
-           else if ((got_e && (p[-1] == 'e' || p[-1] == 'E'))
-                    || (got_d && (p[-1] == 'd' || p[-1] == 'D'))
+           else if (((got_e && (p[-1] == 'e' || p[-1] == 'E'))
+                    || (got_d && (p[-1] == 'd' || p[-1] == 'D')))
                     && (*p == '-' || *p == '+'))
              /* This is the sign of the exponent, not the end of the
                 number.  */
@@ -1125,7 +1114,6 @@ yylex ()
      and $$digits (equivalent to $<-digits> if you could type that).
      Make token type LAST, and put the number (the digits) in yylval.  */
   
- tryname:
   if (*tokstart == '$')
     {
       register int negate = 0;