parse-scan.y (pop_class_context): Reset `inner_qualifier_length' when negative *befor...

2000-03-28  Alexandre Petit-Bianco  <apbianco@cygnus.com>

	* parse-scan.y (pop_class_context): Reset `inner_qualifier_length'
	when negative *before* using it as an array index.
	* ChangeLog: Fixed typo.

(Fixes the following bogus patch:
 http://gcc.gnu.org/ml/gcc-patches/2000-03/msg00937.html)

From-SVN: r32793

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index c6d72ce..0ab7edb 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,12 +1,18 @@
 2000-03-28  Alexandre Petit-Bianco  <apbianco@cygnus.com>
 
        * parse-scan.y (pop_class_context): Reset `inner_qualifier_length'
+       when negative *before* using it as an array index.
+       * ChangeLog: Fixed typo.
+
+2000-03-28  Alexandre Petit-Bianco  <apbianco@cygnus.com>
+
+       * parse-scan.y (pop_class_context): Reset `inner_qualifier_length'
        to 0 when it reaches -1.
 
 2000-03-27  Alexandre Petit-Bianco  <apbianco@cygnus.com>
 
        * jcf-parse.c (get_constant): Properly cast `num' during the
-       invocation of `add_double call'.
+       invocation of `add_double'.
        * jcf-write.c (push_long_const): Properly cast `lo' before
        comparing it to short bounds.
        * parse-scan.y (interface_declaration:): Rule re-arrange so that

diff --git a/gcc/java/parse-scan.c b/gcc/java/parse-scan.c
index 4e2f024..649c181 100644 (file)
--- a/gcc/java/parse-scan.c
+++ b/gcc/java/parse-scan.c
@@ -2495,9 +2495,9 @@ pop_class_context ()
         && inner_qualifier [inner_qualifier_length-1] != '$')
     ;
   inner_qualifier = xrealloc (inner_qualifier, inner_qualifier_length+1);
-  inner_qualifier [inner_qualifier_length] = '\0';
   if (inner_qualifier_length == -1)
     inner_qualifier_length = 0;
+  inner_qualifier [inner_qualifier_length] = '\0';
 }
 
 /* Actions defined here */

diff --git a/gcc/java/parse-scan.y b/gcc/java/parse-scan.y
index 73a46ab..f4d10b8 100644 (file)
--- a/gcc/java/parse-scan.y
+++ b/gcc/java/parse-scan.y
@@ -1144,9 +1144,9 @@ pop_class_context ()
         && inner_qualifier [inner_qualifier_length-1] != '$')
     ;
   inner_qualifier = xrealloc (inner_qualifier, inner_qualifier_length+1);
-  inner_qualifier [inner_qualifier_length] = '\0';
   if (inner_qualifier_length == -1)
     inner_qualifier_length = 0;
+  inner_qualifier [inner_qualifier_length] = '\0';
 }
 
 /* Actions defined here */