Commit 309ca98d by Tom Tromey Committed by Tom Tromey

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
parent 7fac66d4
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> 2005-07-08 Daniel Berlin <dberlin@dberlin.org>
* java-tree.h (LABEL_RETURN_LABELS): Use decl_non_common. * java-tree.h (LABEL_RETURN_LABELS): Use decl_non_common.
......
/* Specific flags and argument handling of the front-end of the /* Specific flags and argument handling of the front-end of the
GNU compiler for the Java(TM) language. 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. Free Software Foundation, Inc.
This file is part of GCC. This file is part of GCC.
...@@ -493,11 +493,22 @@ lang_specific_driver (int *in_argc, const char *const **in_argv, ...@@ -493,11 +493,22 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
arglist = xmalloc ((num_args + 1) * sizeof (char *)); arglist = xmalloc ((num_args + 1) * sizeof (char *));
j = 0; 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]; arglist[j] = argv[i];
if ((args[i] & PARAM_ARG) || i == 0) if ((args[i] & PARAM_ARG))
continue; continue;
if ((args[i] & RESOURCE_FILE_ARG) != 0) if ((args[i] & RESOURCE_FILE_ARG) != 0)
...@@ -559,15 +570,10 @@ lang_specific_driver (int *in_argc, const char *const **in_argv, ...@@ -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 (combine_inputs)
{ {
if (fclose (filelist_file)) if (fclose (filelist_file))
pfatal_with_name (filelist_filename); 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. */ /* If we saw no -O or -g option, default to -g1, for javac compatibility. */
......
...@@ -637,6 +637,7 @@ interface_member_declaration: ...@@ -637,6 +637,7 @@ interface_member_declaration:
| abstract_method_declaration | abstract_method_declaration
| class_declaration /* Added, JDK1.1 inner classes */ | class_declaration /* Added, JDK1.1 inner classes */
| interface_declaration /* Added, JDK1.1 inner classes */ | interface_declaration /* Added, JDK1.1 inner classes */
| empty_statement
; ;
constant_declaration: constant_declaration:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment