parse.y (qualify_ambiguous_name): Take into account that a CONVERT_EXPR might specify...

Wed May 26 15:33:06 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>
        * parse.y (qualify_ambiguous_name): Take into account that a
        CONVERT_EXPR might specify a type as a WFL.

From-SVN: r27181

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index ed91c91f210acf48c3e523f7f515a448b8ab243d..72e8d180f77f62e2b5edb9c455eb40fd451d034d 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 26 15:33:06 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>
+
+       * parse.y (qualify_ambiguous_name): Take into account that a
+       CONVERT_EXPR might specify a type as a WFL.
+
 Tue May 25 15:06:13 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>
  
         * parse.y (patch_assignment): Save the rhs before using it as an

diff --git a/gcc/java/parse.c b/gcc/java/parse.c
index 478428552d8151956eb730bef6dcc8b3438935eb..ba6ccf451a2d9592b2d718041732710f3e7cc1ac 100644 (file)
--- a/gcc/java/parse.c
+++ b/gcc/java/parse.c
@@ -10190,9 +10190,15 @@ qualify_ambiguous_name (id)
        || TREE_CODE (qual_wfl) == STRING_CST
        || TREE_CODE (qual_wfl) == CONVERT_EXPR)
       {
-       qual = TREE_CHAIN (qual);
-       qual_wfl = QUAL_WFL (qual);
-       again = 1;
+       if (TREE_CODE (qual_wfl) == CONVERT_EXPR
+           && TREE_CODE (TREE_TYPE (qual_wfl)) == EXPR_WITH_FILE_LOCATION)
+           name = EXPR_WFL_NODE (TREE_TYPE (qual_wfl));
+       else
+         {
+           qual = TREE_CHAIN (qual);
+           qual_wfl = QUAL_WFL (qual);
+           again = 1;
+         }
       }
   } while (again);
   

diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 69918a9c1c368044250f90c3634192db991062d7..1f9e9957756a53dce7c656b466419f90994eb253 100644 (file)
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -7605,9 +7605,15 @@ qualify_ambiguous_name (id)
        || TREE_CODE (qual_wfl) == STRING_CST
        || TREE_CODE (qual_wfl) == CONVERT_EXPR)
       {
-       qual = TREE_CHAIN (qual);
-       qual_wfl = QUAL_WFL (qual);
-       again = 1;
+       if (TREE_CODE (qual_wfl) == CONVERT_EXPR
+           && TREE_CODE (TREE_TYPE (qual_wfl)) == EXPR_WITH_FILE_LOCATION)
+           name = EXPR_WFL_NODE (TREE_TYPE (qual_wfl));
+       else
+         {
+           qual = TREE_CHAIN (qual);
+           qual_wfl = QUAL_WFL (qual);
+           again = 1;
+         }
       }
   } while (again);