diff options
| author | apbianco <apbianco@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-05-26 15:41:34 +0000 |
|---|---|---|
| committer | apbianco <apbianco@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-05-26 15:41:34 +0000 |
| commit | 1d415fd1548cb87683b55fefe524beaf7eae586a (patch) | |
| tree | 93667d35c33303207ff76ac7882add7159db087d /gcc/java | |
| parent | 6f457fa96ff00755af1e6b011cf78bfd8789433b (diff) | |
| download | gcc-1d415fd1548cb87683b55fefe524beaf7eae586a.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@27181 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java')
| -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 ed91c91f210..72e8d180f77 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 478428552d8..ba6ccf451a2 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 69918a9c1c3..1f9e9957756 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); |