diff options
| author | Alexandre Petit-Bianco <apbianco@cygnus.com> | 1999-05-26 15:41:34 +0000 |
|---|---|---|
| committer | Alexandre Petit-Bianco <apbianco@gcc.gnu.org> | 1999-05-26 08:41:34 -0700 |
| commit | 2ba1f15fb97925675536bec1376c68b9b8b21cd6 (patch) | |
| tree | 93667d35c33303207ff76ac7882add7159db087d | |
| parent | 5685ba9013e948e5a7e20bd3888d15f992e82c91 (diff) | |
| download | gcc-2ba1f15fb97925675536bec1376c68b9b8b21cd6.zip gcc-2ba1f15fb97925675536bec1376c68b9b8b21cd6.tar.gz gcc-2ba1f15fb97925675536bec1376c68b9b8b21cd6.tar.bz2 | |
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
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/parse.c | 12 | ||||
| -rw-r--r-- | gcc/java/parse.y | 12 |
3 files changed, 23 insertions, 6 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index ed91c91..72e8d18 100644 --- 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 4784285..ba6ccf4 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 69918a9..1f9e995 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); |