From 24f52a201f0bdf49a4922402edce0064b6e9e16c Mon Sep 17 00:00:00 2001 From: Nick Treleaven Date: Mon, 15 Jan 2018 11:25:30 +0000 Subject: [PATCH] Fix triggering CallExp error message --- src/dmd/expressionsem.d | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dmd/expressionsem.d b/src/dmd/expressionsem.d index 5f7f38e4e46b..b5dc8e66055f 100644 --- a/src/dmd/expressionsem.d +++ b/src/dmd/expressionsem.d @@ -3498,7 +3498,7 @@ private extern (C++) final class ExpressionSemanticVisitor : Visitor assert(exp.f); tiargs = null; - if (ve.hasOverloads) + if (exp.f.overnext) exp.f = resolveFuncCall(exp.loc, sc, exp.f, tiargs, null, exp.arguments, 2); else { @@ -3513,8 +3513,8 @@ private extern (C++) final class ExpressionSemanticVisitor : Visitor buf.writeByte(')'); //printf("tf = %s, args = %s\n", tf.deco, (*arguments)[0].type.deco); - .error(exp.loc, "`%s%s` is not callable using argument types `%s`", - exp.e1.toChars(), parametersTypeToChars(tf.parameters, tf.varargs), buf.peekString()); + .error(exp.loc, "%s `%s%s` is not callable using argument types `%s`", + exp.f.kind(), exp.f.toPrettyChars(), parametersTypeToChars(tf.parameters, tf.varargs), buf.peekString()); if (failMessage) errorSupplemental(exp.loc, failMessage); exp.f = null;