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

ide: Fixed to compile in c++11

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8713 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-07-20 18:11:44 +00:00
parent a020192de1
commit cf1dc17dac
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
uppsrc/CppBase/Expression.cpp
View file

@ -394,35 +394,35 @@ Index<String> ExpressionTyper::ExpressionType()
LLOG("**** ExpressionType " << xp);
String type;
if(xp.GetCount() == 0)
return typeset;
return pick(typeset);
if(xp[0] == "this") {
LLOG("this: " << type);
ExpressionType(context_type, 1, false, 0);
return typeset;
return pick(typeset);
}
int q = parser.local.FindLast(xp[0]);
if(q >= 0) {
String type = Qualify(codebase, context_type, parser.local[q].type, parser.context.namespace_using);
LLOG("Found type local: " << type << " in scope: " << context_type);
ExpressionType(type, 1, !parser.local[q].isptr, 0);
return typeset;
return pick(typeset);
}
ExpressionType(context_type, 0, false, 0);
if(typeset.GetCount())
return typeset;
return pick(typeset);
if(xp.GetCount() >= 2 && xp[1] == "()") {
String qtype = Qualify(codebase, context_type, xp[0], parser.context.namespace_using);
Vector<String> tparam;
if(codebase.Find(ParseTemplatedType(qtype, tparam)) >= 0) {
LLOG("Is constructor " << qtype);
ExpressionType(qtype, 2, false, 0);
return typeset;
return pick(typeset);
}
}
Vector<String> ns = parser.GetNamespaces();
for(int i = 0; i < ns.GetCount(); i++)
ExpressionType(ns[i], 0, false, 0);
return typeset;
return pick(typeset);
}
Index<String> GetExpressionType(const CppBase& codebase, const Parser& parser, const Vector<String>& xp)