github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

cpp: fixes

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@9006 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-10-12 06:50:27 +00:00
parent dbc66cc98d
commit aa71c826a3
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppsrc/CppBase/Parser.cpp
View file

@ -692,7 +692,7 @@ String Parser::ReadType(Decla& d, const String& tname, const String& tparam)
d.type = StructDeclaration(tname, tparam);
return String();
}
Key(tk_typename) || Key(tk_struct) || Key(tk_class) || Key(tk_union) || Key(tk_enum);
Key(tk_typename) || Key(tk_struct) || Key(tk_class) || Key(tk_union) || Key(tk_enum) || Key(tk_template);
if(Key(tk_bool) || Key(tk_float) || Key(tk_double) || Key(tk_void))
return Null;
bool sgn = Key(tk_signed) || Key(tk_unsigned);
@ -736,6 +736,7 @@ String Parser::ReadType(Decla& d, const String& tname, const String& tparam)
else {
if(Key(t_dblcolon))
d.type << "::";
Key(tk_typename) || Key(tk_template);
Check(lex.IsId(), "Name expected");
while(lex.IsId()) {
d.type << TType();
@ -750,6 +751,7 @@ String Parser::ReadType(Decla& d, const String& tname, const String& tparam)
d.type << "::";
if(Key('~'))
cs = true;
Key(tk_typename) || Key(tk_template);
}
else
break;