* doc/binutils.texi: Fix typos.

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

diff --git a/gdb/f-exp.y b/gdb/f-exp.y
index 7cbfd5ac8f2b4eba41010a82f87c86051b1c1a19..56fd70af954871ff8f1b5143e53b2132be0e937e 100644 (file)
--- a/gdb/f-exp.y
+++ b/gdb/f-exp.y
@@ -91,6 +91,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define        yylloc  f_lloc
 #define yyreds f_reds          /* With YYDEBUG defined */
 #define yytoks f_toks          /* With YYDEBUG defined */
+#define yyname f_name          /* With YYDEBUG defined */
+#define yyrule f_rule          /* With YYDEBUG defined */
 #define yylhs  f_yylhs
 #define yylen  f_yylen
 #define yydefred f_yydefred
@@ -102,9 +104,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define yycheck         f_yycheck
 
 #ifndef YYDEBUG
-#define        YYDEBUG 1               /* Default to no yydebug support */
+#define        YYDEBUG 1               /* Default to yydebug support */
 #endif
 
+#define YYFPRINTF parser_fprintf
+
 int yyparse (void);
 
 static int yylex (void);
@@ -237,9 +241,11 @@ exp     :       '(' exp ')'
 /* Expressions, not including the comma operator.  */
 exp    :       '*' exp    %prec UNARY
                        { write_exp_elt_opcode (UNOP_IND); }
+       ;
 
 exp    :       '&' exp    %prec UNARY
                        { write_exp_elt_opcode (UNOP_ADDR); }
+       ;
 
 exp    :       '-' exp    %prec UNARY
                        { write_exp_elt_opcode (UNOP_NEG); }
@@ -279,6 +285,7 @@ arglist     :       exp
 
 arglist :      substring
                         { arglist_len = 2;}
+       ;
    
 arglist        :       arglist ',' exp   %prec ABOVE_COMMA
                        { arglist_len++; }
@@ -924,7 +931,9 @@ yylex ()
   char *tokstart;
   
  retry:
-  
+ 
+  prev_lexptr = lexptr;
+ 
   tokstart = lexptr;
   
   /* First of all, let us make sure we are not dealing with the 
@@ -1171,5 +1180,8 @@ void
 yyerror (msg)
      char *msg;
 {
+  if (prev_lexptr)
+    lexptr = prev_lexptr;
+
   error ("A %s in expression, near `%s'.", (msg ? msg : "error"), lexptr);
 }