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

cpp11 branch merged back to to trunk

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7047 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-03-16 16:33:48 +00:00
parent 3f6132b553
commit 51687976c2
155 changed files with 1887 additions and 1038 deletions
Download patch file Download diff file Expand all files Collapse all files

8
uppsrc/CppBase/Parser.cpp
View file

@ -498,7 +498,7 @@ void Parser::ParamList(Decl& d) {
break;
}
else
d.param.Add() = Declaration().Top();
d.param.Add() = pick(Declaration().Top());
if(Key(t_elipsis)) {
Elipsis(d);
break;
@ -640,7 +640,7 @@ Parser::Decl Parser::Type() {
Qualifier();
SimpleType(d);
Declarator(d, p);
return Finish(d, p);
return pick(Finish(d, p));
}
bool Parser::IsParamList(int q)
@ -1180,7 +1180,7 @@ bool Parser::Scope(const String& tp, const String& tn) {
im.pname.Clear();
im.param.Clear();
if(Key(';')) {
context = cc;
context = pick(cc);
im.natural = Gpurify(nn);
SetScopeCurrent();
return true;
@ -1219,7 +1219,7 @@ bool Parser::Scope(const String& tp, const String& tn) {
else
if(IsNull(im.natural))
im.natural = Gpurify(nn);
context = cc;
context = pick(cc);
CheckKey(';');
SetScopeCurrent();
return true;