From 2e023322a05090c3bdfa4aa9d19d5292d2cfdc49 Mon Sep 17 00:00:00 2001
From: rmathew <rmathew@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 2 Feb 2005 18:41:25 +0000
Subject: [PATCH] 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@94598 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/java/ChangeLog | 10 +++++++++-
gcc/java/jv-scan.c | 2 ++
gcc/java/parse-scan.y | 4 ++--
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index aad92c7f08d6..d87124674517 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,11 @@
+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
diff --git a/gcc/java/jv-scan.c b/gcc/java/jv-scan.c
index 3c55d5961563..5f90ee93392d 100644
--- a/gcc/java/jv-scan.c
+++ b/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 ();
diff --git a/gcc/java/parse-scan.y b/gcc/java/parse-scan.y
index f3f5faae4572..189ee728e124 100644
--- a/gcc/java/parse-scan.y
+++ b/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
--
GitLab