diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 14db26fb6a44119ae08a9a5a40f5fe86cfb76834..18030fca3fbc74a801501f6ea59b47813e969ec7 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+1999-10-04  Tom Tromey  <tromey@cygnus.com>
+
+	* lex.h (BUILD_OPERATOR2): Return ASSIGN_ANY_TK in `lite' case as
+	well.  Fixes Java PR gcj/59.
+	* parse-scan.y (yyerror): Report errors.
+
 Fri Sep 24 12:23:05 1999  Glenn Chambers  <GChambers@provsol.com>
 
 	* decl.c (insert_block): Remove unconditional `abort'.
diff --git a/gcc/java/lex.h b/gcc/java/lex.h
index 4b55d26d781e3d34f63185f3a94ebc78fffc7300..e8418b6a818d8290eb18520f3cf4925b8875507e 100644
--- a/gcc/java/lex.h
+++ b/gcc/java/lex.h
@@ -123,7 +123,7 @@ typedef struct _java_lc {
 #define SET_MODIFIER_CTX(TOKEN) java_lval->value = (TOKEN)
 #define GET_TYPE_PRECISION(NODE) 4
 #define BUILD_OPERATOR(TOKEN)	return TOKEN
-#define BUILD_OPERATOR2(TOKEN)	return TOKEN
+#define BUILD_OPERATOR2(TOKEN)	return ASSIGN_ANY_TK
 #define SET_LVAL_NODE(NODE)
 #define SET_LVAL_NODE_TYPE(NODE, TYPE)
 #define BUILD_ID_WFL(EXP) (EXP)
diff --git a/gcc/java/parse-scan.c b/gcc/java/parse-scan.c
index 5c9721a667de1c3d578ffa96c7e93d69e288220b..6d1b9a4b353756bde07f86a7c3187e18862fbb36 100644
--- a/gcc/java/parse-scan.c
+++ b/gcc/java/parse-scan.c
@@ -1378,7 +1378,7 @@ static const short yycheck[] = {     3,
 #define YYPURE 1
 
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/local/gnu/share/bison.simple"
+#line 3 "/usr/share/misc/bison.simple"
 
 /* Skeleton output parser for bison,
    Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
@@ -1395,7 +1395,7 @@ static const short yycheck[] = {     3,
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.
@@ -1571,7 +1571,7 @@ __yy_memcpy (char *to, char *from, int count)
 #endif
 #endif
 
-#line 196 "/usr/local/gnu/share/bison.simple"
+#line 196 "/usr/share/misc/bison.simple"
 
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.
@@ -2149,7 +2149,7 @@ case 337:
     break;}
 }
    /* the action file gets copied in in place of this dollarsign */
-#line 498 "/usr/local/gnu/share/bison.simple"
+#line 498 "/usr/share/misc/bison.simple"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -2424,4 +2424,6 @@ void
 yyerror (msg)
      const char *msg ATTRIBUTE_UNUSED;
 {
+  fprintf (stderr, "%s: %d: %s\n", input_filename, lineno, msg);
+  exit (1);
 }
diff --git a/gcc/java/parse-scan.y b/gcc/java/parse-scan.y
index dee5dc2ddf423a3839b053c603d638cf59f5831d..662323a7752fb8c2a7ec30cf56ff30514deb6e88 100644
--- a/gcc/java/parse-scan.y
+++ b/gcc/java/parse-scan.y
@@ -1174,4 +1174,6 @@ void
 yyerror (msg)
      const char *msg ATTRIBUTE_UNUSED;
 {
+  fprintf (stderr, "%s: %d: %s\n", input_filename, lineno, msg);
+  exit (1);
 }