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

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

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

gcc/java/ChangeLog

+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

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);
   

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);