re PR java/15543 ("jv-scan --complexity" segfaults)

        PR java/15543
        * parse-scan.y (formal_parameter): Use $2 (type) instead of $$
        (modifiers) when square brackets are present in a declaration for
        a final paramter.
        * jv-scan.c (main): Set input_filename and input_line.

From-SVN: r94598

gcc/java/ChangeLog

+2005-02-02  Ranjit Mathew  <rmathew@hotmail.com>
+
+	PR java/15543
+	* parse-scan.y (formal_parameter): Use $2 (type) instead of $$
+	(modifiers) when square brackets are present in a declaration for
+	a final paramter.
+	* jv-scan.c (main): Set input_filename and input_line.
+
 2005-02-01  Tom Tromey  <tromey@redhat.com>
 
 	PR java/19742:
@@ -8,7 +16,7 @@
 	* jcf-write.c (generate_bytecode_insns): Implement RSHIFT_EXPR
 	of unsigned types using iushr and lushr JVM bytecodes.
 
-2005-02-02  Ranjit Mathew  <rmathew@hotmail.com>
+2005-02-01  Ranjit Mathew  <rmathew@hotmail.com>
 
 	PR java/19738
 	* gjavah.c (jni_print_float): Do not emit floating-point

gcc/java/jv-scan.c

@@ -237,6 +237,8 @@ main (int argc, char **argv)
 	    if (encoding == NULL || *encoding == '\0')
 	      encoding = DEFAULT_ENCODING;
 
+            input_filename = filename;
+            input_line = 0;
 	    java_init_lex (finput, encoding);
 	    ctxp->filename = filename;
 	    yyparse ();

gcc/java/parse-scan.y

@@ -515,10 +515,10 @@ formal_parameter:
 		  if (bracket_count)
 		    {
 		      int i;
-		      char *n = xmalloc (bracket_count + 1 + strlen ($$));
+		      char *n = xmalloc (bracket_count + 1 + strlen ($2));
 		      for (i = 0; i < bracket_count; ++i)
 			n[i] = '[';
-		      strcpy (n + bracket_count, $$);
+		      strcpy (n + bracket_count, $2);
 		      $$ = n;
 		    }
 		  else