From 2ba1f15fb97925675536bec1376c68b9b8b21cd6 Mon Sep 17 00:00:00 2001 From: Alexandre Petit-Bianco Date: Wed, 26 May 1999 15:41:34 +0000 Subject: [PATCH] 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 * 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 | 5 +++++ gcc/java/parse.c | 12 +++++++++--- gcc/java/parse.y | 12 +++++++++--- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index ed91c91f210a..72e8d180f77f 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +Wed May 26 15:33:06 1999 Alexandre Petit-Bianco + + * 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 * 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 478428552d81..ba6ccf451a2d 100644 --- 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 69918a9c1c36..1f9e9957756a 100644 --- 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);