aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Always include the passed arg types when printing errors about function overload resolution failing.

Browse Source
This commit is contained in:
Matt Pharr
2011-07-06 15:33:50 +01:00
parent 8e5ea9c33c
commit af70718eca
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
expr.cpp
View File

@@ -1895,6 +1895,21 @@ lPrintFunctionOverloads(const std::vector<Symbol *> &matches) {
} }
static void
lPrintPassedTypes(const char *funName, const std::vector<Expr *> &argExprs) {
fprintf(stderr, "Passed types:\n\t%s(", funName);
for (unsigned int i = 0; i < argExprs.size(); ++i) {
const Type *t = argExprs[i]->GetType();
if (t)
fprintf(stderr, "%s%s", t->GetString().c_str(),
(i < argExprs.size()-1) ? ", " : ")\n\n");
else
fprintf(stderr, "(unknown type)%s",
(i < argExprs.size()-1) ? ", " : ")\n\n");
}
}
/** Helper function used for function overload resolution: returns true if /** Helper function used for function overload resolution: returns true if
the call argument's type exactly matches the function argument type the call argument's type exactly matches the function argument type
(modulo a conversion to a const type if needed). (modulo a conversion to a const type if needed).
@@ -2064,6 +2079,7 @@ FunctionCallExpr::tryResolve(bool (*matchFunc)(Expr *, const Type *)) {
Error(fse->pos, "Multiple overloaded instances of function \"%s\" matched.", Error(fse->pos, "Multiple overloaded instances of function \"%s\" matched.",
funName); funName);
lPrintFunctionOverloads(matches); lPrintFunctionOverloads(matches);
lPrintPassedTypes(funName, args->exprs);
// Stop trying to find more matches after failure // Stop trying to find more matches after failure
return true; return true;
} }
@@ -2112,16 +2128,7 @@ FunctionCallExpr::resolveFunctionOverloads() {
funName); funName);
fprintf(stderr, "Candidates are:\n"); fprintf(stderr, "Candidates are:\n");
lPrintFunctionOverloads(*fse->candidateFunctions); lPrintFunctionOverloads(*fse->candidateFunctions);
fprintf(stderr, "Passed types:\n\t%s(", funName); lPrintPassedTypes(funName, args->exprs);
for (unsigned int i = 0; i < args->exprs.size(); ++i) {
const Type *t = args->exprs[i]->GetType();
if (t)
fprintf(stderr, "%s%s", t->GetString().c_str(),
(i < args->exprs.size()-1) ? ", " : ")\n");
else
fprintf(stderr, "(unknown type)%s",
(i < args->exprs.size()-1) ? ", " : ")\n");
}
} }