diff options
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/parse-scan.c | 3 | ||||
| -rw-r--r-- | gcc/java/parse-scan.y | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 72e1535..33a15f0 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +1998-12-17 Tom Tromey <tromey@cygnus.com> + + * parse-scan.y (report_main_declaration): Recognize + `java.lang.String' in argument to main. + Wed Dec 16 16:18:59 1998 Per Bothner <bothner@cygnus.com> * parse.y (create_interface): Remove bogus test. diff --git a/gcc/java/parse-scan.c b/gcc/java/parse-scan.c index eff7752..84ba60d 100644 --- a/gcc/java/parse-scan.c +++ b/gcc/java/parse-scan.c @@ -2368,7 +2368,8 @@ report_main_declaration (declarator) && !strcmp (declarator->method_name, "main") && declarator->args && declarator->args [0] == '[' - && !strcmp( declarator->args+1, "String") + && (! strcmp (declarator->args+1, "String") + || ! strcmp (declarator->args + 1, "java.lang.String")) && current_class) { if (!previous_output) diff --git a/gcc/java/parse-scan.y b/gcc/java/parse-scan.y index a5859c4..0223934 100644 --- a/gcc/java/parse-scan.y +++ b/gcc/java/parse-scan.y @@ -1126,7 +1126,8 @@ report_main_declaration (declarator) && !strcmp (declarator->method_name, "main") && declarator->args && declarator->args [0] == '[' - && !strcmp( declarator->args+1, "String") + && (! strcmp (declarator->args+1, "String") + || ! strcmp (declarator->args + 1, "java.lang.String")) && current_class) { if (!previous_output) |