Skip to content

R
riscv-gcc-1
Commit 46422d6c by Jason Merrill Committed by Jason Merrill
Options

parse.y (do_id): New nonterminal. 

	* parse.y (do_id): New nonterminal.
	(template_id): Use it.

From-SVN: r16974
parent 81797aba
Showing with 17 additions and 13 deletions
gcc/cp/ChangeLog
Sat Dec 6 01:29:37 1997 Jason Merrill <jason@yorick.cygnus.com>
* parse.y (do_id): New nonterminal.
(template_id): Use it.
Fri Dec 5 01:17:34 1997 Jason Merrill <jason@yorick.cygnus.com> Fri Dec 5 01:17:34 1997 Jason Merrill <jason@yorick.cygnus.com>
* parse.y (template_id): do_identifier for PFUNCNAMEs, too. * parse.y (template_id): do_identifier for PFUNCNAMEs, too.
......
gcc/cp/parse.y
...@@ -228,7 +228,7 @@ empty_parms () ...@@ -228,7 +228,7 @@ empty_parms ()
%type <ttype> fcast_or_absdcl regcast_or_absdcl %type <ttype> fcast_or_absdcl regcast_or_absdcl
%type <ttype> expr_or_declarator complex_notype_declarator %type <ttype> expr_or_declarator complex_notype_declarator
%type <ttype> notype_unqualified_id unqualified_id qualified_id %type <ttype> notype_unqualified_id unqualified_id qualified_id
%type <ttype> template_id object_template_id notype_template_declarator %type <ttype> template_id do_id object_template_id notype_template_declarator
%type <ttype> overqualified_id notype_qualified_id any_id %type <ttype> overqualified_id notype_qualified_id any_id
%type <ttype> complex_direct_notype_declarator functional_cast %type <ttype> complex_direct_notype_declarator functional_cast
%type <ttype> complex_parmlist parms_comma %type <ttype> complex_parmlist parms_comma
...@@ -1293,19 +1293,18 @@ notype_unqualified_id: ...@@ -1293,19 +1293,18 @@ notype_unqualified_id:
| NSNAME %prec EMPTY | NSNAME %prec EMPTY
; ;
do_id:
{ $$ = do_identifier ($<ttype>-1, 1); }
template_id: template_id:
PFUNCNAME '<' template_arg_list template_close_bracket PFUNCNAME '<' do_id template_arg_list template_close_bracket
{ $$ = lookup_template_function { $$ = lookup_template_function ($3, $4); }
(do_identifier ($1, 1), $3); } | PFUNCNAME '<' do_id template_close_bracket
| PFUNCNAME '<' template_close_bracket { $$ = lookup_template_function ($3, NULL_TREE); }
{ $$ = lookup_template_function | operator_name '<' do_id template_arg_list template_close_bracket
(do_identifier ($1, 1), NULL_TREE); } { $$ = lookup_template_function ($3, $4); }
| operator_name '<' template_arg_list template_close_bracket | operator_name '<' do_id template_close_bracket
{ $$ = lookup_template_function { $$ = lookup_template_function ($3, NULL_TREE); }
(do_identifier ($1, 1), $3); }
| operator_name '<' template_close_bracket
{ $$ = lookup_template_function
(do_identifier ($1, 1), NULL_TREE); }
; ;
object_template_id: object_template_id:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment