From d5ff227d1839465b9b0e52317bdd2a4af252b09c Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 17 Dec 1998 12:50:02 +0000 Subject: [PATCH] parse-scan.y (report_main_declaration): Recognize `java.lang.String' in argument to main. * parse-scan.y (report_main_declaration): Recognize `java.lang.String' in argument to main. From-SVN: r24361 --- gcc/java/ChangeLog | 5 +++++ gcc/java/parse-scan.c | 3 ++- gcc/java/parse-scan.y | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 72e1535e9bb..33a15f0ca56 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +1998-12-17 Tom Tromey + + * parse-scan.y (report_main_declaration): Recognize + `java.lang.String' in argument to main. + Wed Dec 16 16:18:59 1998 Per Bothner * parse.y (create_interface): Remove bogus test. diff --git a/gcc/java/parse-scan.c b/gcc/java/parse-scan.c index eff77522969..84ba60d76b7 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 a5859c454f5..022393493c2 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) -- 2.30.2