TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

allow typename keyword in lieu of class, in template declarations

Browse Source
This commit is contained in:
David Rose 2011-11-04 16:58:39 +00:00
parent 594f1e32d7
commit 633e697d54
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dtool/src/cppparser/cppBison.yxx
View File

@ -1135,6 +1135,14 @@ template_formal_parameter:
| KW_CLASS name '=' full_type | KW_CLASS name '=' full_type
{ {
$$ = CPPType::new_type(new CPPClassTemplateParameter($2, $4)); $$ = CPPType::new_type(new CPPClassTemplateParameter($2, $4));
}
| KW_TYPENAME name
{
$$ = CPPType::new_type(new CPPClassTemplateParameter($2));
}
| KW_TYPENAME name '=' full_type
{
$$ = CPPType::new_type(new CPPClassTemplateParameter($2, $4));
} }
| template_formal_parameter_type formal_parameter_identifier template_parameter_maybe_initialize | template_formal_parameter_type formal_parameter_identifier template_parameter_maybe_initialize
{ {
@ -1165,10 +1173,6 @@ template_formal_parameter_type:
{ {
$$ = $1->find_type(current_scope, global_scope, false, current_lexer); $$ = $1->find_type(current_scope, global_scope, false, current_lexer);
assert($$ != NULL); assert($$ != NULL);
}
| KW_TYPENAME name
{
$$ = CPPType::new_type(new CPPTBDType($2));
} }
; ;