github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-09-05 17:44:55 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Resolved issue with usings namespace for functions #1273

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8959 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-09-22 22:41:01 +00:00
parent c1905ef670
commit 1bdc66dc32
1 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
uppsrc/CppBase/Expression.cpp
View file

@ -222,7 +222,7 @@ void ExpressionTyper::ExpressionType(bool isptr, const String& ttype, int ii,
Index<String>& visited_bases, int lvl)
{
LLOG("--- ExpressionType " << scan_counter << ", lvl " << lvl << ", ttype " << ttype << ", isptr " << isptr
<< ", ii " << ii << ": " << ii << (ii < xp.GetCount() ? xp[ii] : "<end>"));
<< ", ii: " << ii << ", " << (ii < xp.GetCount() ? xp[ii] : "<end>"));
if(++scan_counter >= MAX_COUNT || lvl > 100) // sort of ugly limitation of parsing permutations
return;
LDUMP(can_shortcut_operator);
@ -407,17 +407,24 @@ Index<String> ExpressionTyper::ExpressionType()
ExpressionType(parser.local[q].isptr, type, 1, !parser.local[q].isptr, 0);
return pick(typeset);
}
ExpressionType(false, context_type, 0, false, 0);
if(typeset.GetCount())
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(false, qtype, 2, false, 0);
if(context_type.GetCount()) {
ExpressionType(false, context_type, 0, false, 0);
if(typeset.GetCount())
return pick(typeset);
}
if(xp.GetCount() >= 2 && xp[1] == "()") {
Vector<String> usings = Split(parser.context.namespace_using, ';');
usings.Add("");
for(int i = 0; i < usings.GetCount(); i++) {
String qtype = Qualify(codebase, context_type, Merge("::", usings[i], xp[0]), parser.context.namespace_using);
Vector<String> tparam;
if(codebase.Find(ParseTemplatedType(qtype, tparam)) >= 0) {
LLOG("Is constructor " << qtype);
ExpressionType(false, qtype, 2, false, 0);
}
}
if(typeset.GetCount())
return pick(typeset);
}
Vector<String> ns = parser.GetNamespaces();
for(int i = 0; i < ns.GetCount(); i++)