parse.y (template_id): do_identifier for PFUNCNAMEs, too.

	* parse.y (template_id): do_identifier for PFUNCNAMEs, too.
	* spew.c (yylex): Don't do_identifier here.
	* decl2.c (build_expr_from_tree): Revert last change.

	* decl2.c (build_expr_from_tree): Expand the name for a method call.
	* parse.y (object_template_id): Don't try to take the DECL_NAME.

From-SVN: r16971

gcc/cp/ChangeLog

+Fri Dec  5 01:17:34 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* parse.y (template_id): do_identifier for PFUNCNAMEs, too.
+	* spew.c (yylex): Don't do_identifier here.
+	* decl2.c (build_expr_from_tree): Revert last change.
+
+	* decl2.c (build_expr_from_tree): Expand the name for a method call.
+	* parse.y (object_template_id): Don't try to take the DECL_NAME.
+
 Wed Dec  3 20:02:39 1997  Jason Merrill  <jason@yorick.cygnus.com>
 
 	* init.c (build_new): Use a TARGET_EXPR instead of SAVE_EXPR for

gcc/cp/parse.y

@@ -1295,9 +1295,11 @@ notype_unqualified_id:
 
 template_id:
         PFUNCNAME '<' template_arg_list template_close_bracket 
-                { $$ = lookup_template_function ($1, $3); }
+                { $$ = lookup_template_function
+		    (do_identifier ($1, 1), $3); }
         | PFUNCNAME '<' template_close_bracket
-                { $$ = lookup_template_function ($1, NULL_TREE); }
+                { $$ = lookup_template_function
+		    (do_identifier ($1, 1), NULL_TREE); }
         | operator_name '<' template_arg_list template_close_bracket
                 { $$ = lookup_template_function 
 		    (do_identifier ($1, 1), $3); }
@@ -1310,9 +1312,9 @@ object_template_id:
         TEMPLATE identifier '<' template_arg_list template_close_bracket
                 { $$ = lookup_template_function ($2, $4); }
         | TEMPLATE PFUNCNAME '<' template_arg_list template_close_bracket
-                { $$ = lookup_template_function (DECL_NAME ($2), $4); }
+                { $$ = lookup_template_function ($2, $4); }
         | TEMPLATE operator_name '<' template_arg_list template_close_bracket
-                { $$ = lookup_template_function (DECL_NAME ($2), $4); }
+                { $$ = lookup_template_function ($2, $4); }
         ;
 
 unqualified_id:

gcc/cp/spew.c

@@ -379,9 +379,6 @@ yylex ()
     debug_yychar (yychar);
 #endif
 
-  if (yychar == PFUNCNAME)
-    yylval.ttype = do_identifier (yylval.ttype, 1);
-
   return yychar;
 }