re PR java/19674 (Empty declaration through semicolon (;) causes compile failure)

	PR java/19674:
	* parse-scan.y (interface_member_declaration): Added
	empty_statement.

From-SVN: r101948

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index b1eed198a8fdca93f6a1a05353c7ba8f288f4ceb..c45a7918ede41045d7205fef0610cc9b9919b682 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-12  Tom Tromey  <tromey@redhat.com>
+
+       PR java/19674:
+       * parse-scan.y (interface_member_declaration): Added
+       empty_statement.
+
 2005-07-08  Daniel Berlin  <dberlin@dberlin.org>
        
        * java-tree.h (LABEL_RETURN_LABELS): Use decl_non_common.

diff --git a/gcc/java/jvspec.c b/gcc/java/jvspec.c
index e4f4d1838de617a5d0aa26eb0d63b6382bb63bc8..2163a3c05c99fa8ac2d07aafb5303b451ecdae6a 100644 (file)
--- a/gcc/java/jvspec.c
+++ b/gcc/java/jvspec.c
@@ -1,6 +1,6 @@
 /* Specific flags and argument handling of the front-end of the 
    GNU compiler for the Java(TM) language.
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -493,11 +493,22 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
   arglist = xmalloc ((num_args + 1) * sizeof (char *));
   j = 0;
 
-  for (i = 0; i < argc; i++, j++)
+  arglist[j++] = argv[0];
+
+  if (combine_inputs || indirect_files_count > 0)
+    arglist[j++] = "-ffilelist-file";
+
+  if (combine_inputs)
+    {
+      arglist[j++] = "-xjava";
+      arglist[j++] = filelist_filename;
+    }
+
+  for (i = 1; i < argc; i++, j++)
     {
       arglist[j] = argv[i];
 
-      if ((args[i] & PARAM_ARG) || i == 0)
+      if ((args[i] & PARAM_ARG))
        continue;
 
       if ((args[i] & RESOURCE_FILE_ARG) != 0)
@@ -559,15 +570,10 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
        }
   }
 
-  if (combine_inputs || indirect_files_count > 0)
-    arglist[j++] = "-ffilelist-file";
-
   if (combine_inputs)
     {
       if (fclose (filelist_file))
        pfatal_with_name (filelist_filename);
-      arglist[j++] = "-xjava";
-      arglist[j++] = filelist_filename;
     }
 
   /* If we saw no -O or -g option, default to -g1, for javac compatibility. */

diff --git a/gcc/java/parse-scan.y b/gcc/java/parse-scan.y
index 2b1564677856aa74b5342719c87159e7b9ea5861..71c43a74af697577738428301249f4be4c77db97 100644 (file)
--- a/gcc/java/parse-scan.y
+++ b/gcc/java/parse-scan.y
@@ -637,6 +637,7 @@ interface_member_declaration:
 |      abstract_method_declaration
 |      class_declaration       /* Added, JDK1.1 inner classes */
 |      interface_declaration   /* Added, JDK1.1 inner classes */
+|      empty_statement
 ;
 
 constant_declaration: