From b5b9808dd5932bc0da786b6b63748481eccee029 Mon Sep 17 00:00:00 2001
From: JinShil <slavo5150@yahoo.com>
Date: Wed, 3 Jan 2018 19:23:13 +0900
Subject: [PATCH] Fix syntax highlighting anomaly in func.d

---
 src/dmd/func.d                    | 4 ++--
 test/fail_compilation/diag13082.d | 4 ++--
 test/fail_compilation/diag8101.d  | 2 +-
 test/fail_compilation/diag8101b.d | 2 +-
 test/fail_compilation/diag9420.d  | 2 +-
 test/fail_compilation/fail263.d   | 2 +-
 test/fail_compilation/fail322.d   | 2 +-
 test/fail_compilation/fail332.d   | 2 +-
 test/fail_compilation/fail53.d    | 2 +-
 test/fail_compilation/fail55.d    | 2 +-
 test/fail_compilation/ice10922.d  | 2 +-
 test/fail_compilation/ice12501.d  | 4 ++--
 test/fail_compilation/ice14923.d  | 2 +-
 test/fail_compilation/ice8255.d   | 2 +-
 test/fail_compilation/ice9540.d   | 2 +-
 15 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/dmd/func.d b/src/dmd/func.d
index 4e6eb36d1886..9781021175ca 100644
--- a/src/dmd/func.d
+++ b/src/dmd/func.d
@@ -2604,8 +2604,8 @@ extern (C++) FuncDeclaration resolveFuncCall(Loc loc, Scope* sc, Dsymbol s,
                 }
                 else
                 {
-                    fd.error(loc, "`%s%s` is not callable using argument types `%s`",
-                        parametersTypeToChars(tf.parameters, tf.varargs),
+                    .error(loc, "%s `%s%s%s` is not callable using argument types `%s`",
+                        fd.kind(), fd.toPrettyChars(), parametersTypeToChars(tf.parameters, tf.varargs),
                         tf.modToChars(), fargsBuf.peekString());
                 }
             }
diff --git a/test/fail_compilation/diag13082.d b/test/fail_compilation/diag13082.d
index 55c28da2f668..4b5e0b93ace9 100644
--- a/test/fail_compilation/diag13082.d
+++ b/test/fail_compilation/diag13082.d
@@ -1,8 +1,8 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/diag13082.d(22): Error: constructor diag13082.C.this `(int a)` is not callable using argument types `(string)`
-fail_compilation/diag13082.d(23): Error: constructor diag13082.S.this `(int a)` is not callable using argument types `(string)`
+fail_compilation/diag13082.d(22): Error: constructor `diag13082.C.this(int a)` is not callable using argument types `(string)`
+fail_compilation/diag13082.d(23): Error: constructor `diag13082.S.this(int a)` is not callable using argument types `(string)`
 ---
 */
 
diff --git a/test/fail_compilation/diag8101.d b/test/fail_compilation/diag8101.d
index 569479c58fba..0f1f36410dbd 100644
--- a/test/fail_compilation/diag8101.d
+++ b/test/fail_compilation/diag8101.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/diag8101.d(56): Error: function diag8101.f_0 `(int)` is not callable using argument types `()`
+fail_compilation/diag8101.d(56): Error: function `diag8101.f_0(int)` is not callable using argument types `()`
 fail_compilation/diag8101.d(57): Error: none of the overloads of `f_1` are callable using argument types `()`, candidates are:
 fail_compilation/diag8101.d(32):        `diag8101.f_1(int)`
 fail_compilation/diag8101.d(33):        `diag8101.f_1(int, int)`
diff --git a/test/fail_compilation/diag8101b.d b/test/fail_compilation/diag8101b.d
index ade0ab6e6b78..e8bb1e7f7631 100644
--- a/test/fail_compilation/diag8101b.d
+++ b/test/fail_compilation/diag8101b.d
@@ -4,7 +4,7 @@ TEST_OUTPUT:
 fail_compilation/diag8101b.d(26): Error: none of the overloads of `foo` are callable using argument types `(double)`, candidates are:
 fail_compilation/diag8101b.d(17):        `diag8101b.S.foo(int _param_0)`
 fail_compilation/diag8101b.d(18):        `diag8101b.S.foo(int _param_0, int _param_1)`
-fail_compilation/diag8101b.d(28): Error: function diag8101b.S.bar `(int _param_0)` is not callable using argument types `(double)`
+fail_compilation/diag8101b.d(28): Error: function `diag8101b.S.bar(int _param_0)` is not callable using argument types `(double)`
 fail_compilation/diag8101b.d(31): Error: none of the overloads of `foo` are callable using a const object, candidates are:
 fail_compilation/diag8101b.d(17):        `diag8101b.S.foo(int _param_0)`
 fail_compilation/diag8101b.d(18):        `diag8101b.S.foo(int _param_0, int _param_1)`
diff --git a/test/fail_compilation/diag9420.d b/test/fail_compilation/diag9420.d
index 35ccb46ea8d3..cc71a606dd5f 100644
--- a/test/fail_compilation/diag9420.d
+++ b/test/fail_compilation/diag9420.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT
 ---
-fail_compilation/diag9420.d(20): Error: function diag9420.S.t3!().tx `()` is not callable using argument types `(int)`
+fail_compilation/diag9420.d(20): Error: function `diag9420.S.t3!().tx()` is not callable using argument types `(int)`
 ---
 */
 
diff --git a/test/fail_compilation/fail263.d b/test/fail_compilation/fail263.d
index b4d3f87b4ce6..7f70458999dc 100644
--- a/test/fail_compilation/fail263.d
+++ b/test/fail_compilation/fail263.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail263.d(18): Error: function fail263.f `(byte* p)` is not callable using argument types `(const(byte)*)`
+fail_compilation/fail263.d(18): Error: function `fail263.f(byte* p)` is not callable using argument types `(const(byte)*)`
 ---
 */
 
diff --git a/test/fail_compilation/fail322.d b/test/fail_compilation/fail322.d
index ab112f67c5b9..0415d56f9a4b 100644
--- a/test/fail_compilation/fail322.d
+++ b/test/fail_compilation/fail322.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail322.d(10): Error: function fail322.digestToString2 `(ref char[16] digest)` is not callable using argument types `(string)`
+fail_compilation/fail322.d(10): Error: function `fail322.digestToString2(ref char[16] digest)` is not callable using argument types `(string)`
 ---
 */
 
diff --git a/test/fail_compilation/fail332.d b/test/fail_compilation/fail332.d
index 76be2d6cf375..12db30979ab1 100644
--- a/test/fail_compilation/fail332.d
+++ b/test/fail_compilation/fail332.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail332.d(14): Error: function fail332.foo `(int _param_0, ...)` is not callable using argument types `()`
+fail_compilation/fail332.d(14): Error: function `fail332.foo(int _param_0, ...)` is not callable using argument types `()`
 ---
 */
 
diff --git a/test/fail_compilation/fail53.d b/test/fail_compilation/fail53.d
index ec48a457048c..11202b0ffeec 100644
--- a/test/fail_compilation/fail53.d
+++ b/test/fail_compilation/fail53.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail53.d(25): Error: function object.Object.opEquals `(Object o)` is not callable using argument types `(int)`
+fail_compilation/fail53.d(25): Error: function `object.Object.opEquals(Object o)` is not callable using argument types `(int)`
 ---
 */
 
diff --git a/test/fail_compilation/fail55.d b/test/fail_compilation/fail55.d
index 4d9fce0fbff4..10a47ca0c6e7 100644
--- a/test/fail_compilation/fail55.d
+++ b/test/fail_compilation/fail55.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail55.d(22): Error: function object.Object.opCmp `(Object o)` is not callable using argument types `(int)`
+fail_compilation/fail55.d(22): Error: function `object.Object.opCmp(Object o)` is not callable using argument types `(int)`
 ---
 */
 
diff --git a/test/fail_compilation/ice10922.d b/test/fail_compilation/ice10922.d
index 8d141f351a0e..a740d72207c9 100644
--- a/test/fail_compilation/ice10922.d
+++ b/test/fail_compilation/ice10922.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice10922.d(9): Error: function ice10922.__lambda4 `(const(uint) n)` is not callable using argument types `()`
+fail_compilation/ice10922.d(9): Error: function `ice10922.__lambda4(const(uint) n)` is not callable using argument types `()`
 ---
 */
 
diff --git a/test/fail_compilation/ice12501.d b/test/fail_compilation/ice12501.d
index c47ff6327050..1bae315081a1 100644
--- a/test/fail_compilation/ice12501.d
+++ b/test/fail_compilation/ice12501.d
@@ -1,8 +1,8 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice12501.d(29): Error: function ice12501.foo `(int value)` is not callable using argument types `(int, int)`
-fail_compilation/ice12501.d(29): Error: function ice12501.foo `(int value)` is not callable using argument types `(int, int)`
+fail_compilation/ice12501.d(29): Error: function `ice12501.foo(int value)` is not callable using argument types `(int, int)`
+fail_compilation/ice12501.d(29): Error: function `ice12501.foo(int value)` is not callable using argument types `(int, int)`
 fail_compilation/ice12501.d(43): Error: template instance ice12501.reduce!(foo, foo).reduce!(Tuple!(int, int), int[]) error instantiating
 ---
 */
diff --git a/test/fail_compilation/ice14923.d b/test/fail_compilation/ice14923.d
index a5d812f59d32..6e0e376bf903 100644
--- a/test/fail_compilation/ice14923.d
+++ b/test/fail_compilation/ice14923.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice14923.d(21): Error: function ice14923.parse `(C a)` is not callable using argument types `(A)`
+fail_compilation/ice14923.d(21): Error: function `ice14923.parse(C a)` is not callable using argument types `(A)`
 fail_compilation/ice14923.d(21):        instantiated from here: bar!((b) => parse(b))
 ---
 */
diff --git a/test/fail_compilation/ice8255.d b/test/fail_compilation/ice8255.d
index 4ece32153bfd..8aa0686cba7b 100644
--- a/test/fail_compilation/ice8255.d
+++ b/test/fail_compilation/ice8255.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice8255.d(10): Error: function ice8255.F!(G).F.f `(ref G _param_0)` is not callable using argument types `(G)`
+fail_compilation/ice8255.d(10): Error: function `ice8255.F!(G).F.f(ref G _param_0)` is not callable using argument types `(G)`
 fail_compilation/ice8255.d(10):        while evaluating pragma(msg, F().f(G()))
 ---
 */
diff --git a/test/fail_compilation/ice9540.d b/test/fail_compilation/ice9540.d
index bd975eb8bef6..77fb3ea98e21 100644
--- a/test/fail_compilation/ice9540.d
+++ b/test/fail_compilation/ice9540.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice9540.d(34): Error: function ice9540.A.test.AddFront!(this, f).AddFront.dg `(int _param_0)` is not callable using argument types `()`
+fail_compilation/ice9540.d(34): Error: function `ice9540.A.test.AddFront!(this, f).AddFront.dg(int _param_0)` is not callable using argument types `()`
 fail_compilation/ice9540.d(25): Error: template instance ice9540.A.test.AddFront!(this, f) error instantiating
 ---
 */