Wed May 11 20:11:51 1994 Stan Shebs (shebs@andros.cygnus.com)

	* c-exp.y (yyerror): Display a more informative error message.
	* ch-exp.y (yyerror): Ditto, don't use global yychar.
	* m2-exp.y (yyerror): Ditto.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5bf998ade7305a87f04045f2a83467183e9e7e78..8b0176741f6b34d5946f03ec51bf1947de12c6bf 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+Wed May 11 20:11:51 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+       * c-exp.y (yyerror): Display a more informative error message.
+       * ch-exp.y (yyerror): Ditto, don't use global yychar.
+       * m2-exp.y (yyerror): Ditto.
+
 Tue May 10 11:57:53 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
        * inflow.c (job_control): Move definition to front of file.

diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index d559c115d0e2f9be1c80ab5928bd972e6f5784ee..c3befb71e32c1f3b8a1b8c8c2c19097c629e4ffb 100644 (file)
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -1637,5 +1637,5 @@ void
 yyerror (msg)
      char *msg;
 {
-  error (msg ? msg : "Invalid syntax in expression.");
+  error ("A %s in expression, near `%s'.", (msg ? msg : "error"), lexptr);
 }

diff --git a/gdb/ch-exp.y b/gdb/ch-exp.y
index ded20b5ca93735be3d84685ab0bbba2616b4b563..95259787ff22ed08863b5860f4262fc545dea24e 100644 (file)
--- a/gdb/ch-exp.y
+++ b/gdb/ch-exp.y
@@ -1989,15 +1989,7 @@ yylex ()
 
 void
 yyerror (msg)
-     char *msg;        /* unused */
+     char *msg;
 {
-  printf_unfiltered ("Parsing:  %s\n", lexptr);
-  if (yychar < 256)
-    {
-      error ("Invalid syntax in expression near character '%c'.", yychar);
-    }
-  else
-    {
-      error ("Invalid syntax in expression");
-    }
+  error ("A %s in expression, near `%s'.", (msg ? msg : "error"), lexptr);
 }

diff --git a/gdb/m2-exp.y b/gdb/m2-exp.y
index 0b8961d35e882c23b6064c01273ec4054dea95cf..bbbdda48f7786253fd05ea7a0dd129cc4daaab9e 100644 (file)
--- a/gdb/m2-exp.y
+++ b/gdb/m2-exp.y
@@ -1152,13 +1152,8 @@ make_qualname(mod,ident)
 #endif  /* 0 */
 
 void
-yyerror(msg)
-     char *msg;        /* unused */
+yyerror (msg)
+     char *msg;
 {
-   printf_unfiltered("Parsing:  %s\n",lexptr);
-   if (yychar < 256)
-     error("Invalid syntax in expression near character '%c'.",yychar);
-   else
-     error("Invalid syntax in expression");
+  error ("A %s in expression, near `%s'.", (msg ? msg : "error"), lexptr);
 }
-