parse-scan.y (report_main_declaration): Recognize `java.lang.String' in argument...

	* parse-scan.y (report_main_declaration): Recognize
	`java.lang.String' in argument to main.

From-SVN: r24361

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 72e1535e9bb5e8618e1ae8f2699fb8fe3bad8d78..33a15f0ca56b106581acc13a5352ff31f72c584f 100644 (file)
--- 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 eff7752296980d06fbb1037e3cfd28a924cb1ad2..84ba60d76b79914c1a6fa04cac946306718c12e5 100644 (file)
--- 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 a5859c454f5d1a26743500d865d399fce258c9b3..022393493c250826f49986a517f64ac389311a27 100644 (file)
--- 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)