lex.c (do_identifier): Also generate LOOKUP_EXPR for RESULT_DECL.

	* lex.c (do_identifier): Also generate LOOKUP_EXPR for RESULT_DECL.
	* method.c (hack_identifier): Also check for using RESULT_DECL
	from outer context.

From-SVN: r23381

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 365dc2bc17ae1d282cf24823dbfdabbef987d4d1..328039aaec25da7b4e7b9f30ae2f7bb5165f50d7 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+1998-10-27  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * lex.c (do_identifier): Also generate LOOKUP_EXPR for RESULT_DECL.
+       * method.c (hack_identifier): Also check for using RESULT_DECL
+       from outer context.
+
 1998-10-27  Mark Mitchell  <mark@markmitchell.com>
 
        * decl.c (grokdeclarator): Use type_quals, rather than constp,

diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index e08166331850a65f9b0a0d3dfb66942c3632daba..30c70489abc56a88f3cb4837988fcb8b81a2c97c 100644 (file)
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -3070,6 +3070,7 @@ do_identifier (token, parsing, args)
              && CP_DECL_CONTEXT (id)
              && TREE_CODE (CP_DECL_CONTEXT (id)) == FUNCTION_DECL)
          || TREE_CODE (id) == PARM_DECL
+         || TREE_CODE (id) == RESULT_DECL
          || TREE_CODE (id) == USING_DECL))
     id = build_min_nt (LOOKUP_EXPR, token);
       

diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index f738124117fe5f914c50729b639e4bc68e5fd769..ee0185b761b6cc7c076d3d422088fc9f8441519c 100644 (file)
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -1924,7 +1924,8 @@ hack_identifier (value, name)
   else
     mark_used (value);
 
-  if (TREE_CODE (value) == VAR_DECL || TREE_CODE (value) == PARM_DECL)
+  if (TREE_CODE (value) == VAR_DECL || TREE_CODE (value) == PARM_DECL
+      || TREE_CODE (value) == RESULT_DECL)
     {
       tree context = decl_function_context (value);
       if (context != NULL_TREE && context != current_function_decl