This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

[PATCH] Java: patch for the gcj PR #55


I checked in the following patch to fix the gcj PR #55.

./A

hu Nov  4 16:27:01 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>

        * parse.y (resolve_qualified_expression_name): Handle PLUS_EXPR.
        (qualify_ambiguous_name): Likewise.

Index: parse.y
===================================================================
RCS file: /cvs/gcc/egcs/gcc/java/parse.y,v
retrieving revision 1.117
diff -u -p -r1.117 parse.y
--- parse.y	1999/11/02 07:51:19	1.117
+++ parse.y	1999/11/04 22:34:53
@@ -6714,6 +6714,15 @@ resolve_qualified_expression_name (wfl, 
 	  type = QUAL_DECL_TYPE (decl);
 	  continue;
 
+	case PLUS_EXPR:
+	  if ((decl = java_complete_tree (qual_wfl)) == error_mark_node)
+	    return 1;
+	  if ((type = patch_string (decl)))
+	    decl = type;
+	  *where_found = QUAL_RESOLUTION (q) = decl;
+	  *type_found = type = TREE_TYPE (decl);
+	  break;
+
 	default:
 	  /* Fix for -Wall Just go to the next statement. Don't
              continue */
@@ -7885,7 +7894,8 @@ qualify_ambiguous_name (id)
 	     TREE_CODE (TREE_OPERAND (qual_wfl, 0)) == EXPR_WITH_FILE_LOCATION)
       name = EXPR_WFL_NODE (TREE_OPERAND (qual_wfl, 0));
 
-    else if (code == STRING_CST || code == CONDITIONAL_EXPR)
+    else if (code == STRING_CST || code == CONDITIONAL_EXPR 
+	     || code == PLUS_EXPR)
       {
 	qual = TREE_CHAIN (qual);
 	qual_wfl = QUAL_WFL (qual);


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]