mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-26 21:21:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Improve UFCS/property error message (#21046)

Browse source
This commit is contained in:
Dennis 2025-03-21 15:15:29 +01:00 • committed by GitHub
parent 94950cae58
commit 9d2f034398
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 35 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/src/dmd/typesem.d
View file

@ -3444,8 +3444,16 @@ Expression getProperty(Type t, Scope* scope_, Loc loc, Identifier ident, int fla
auto s2 = scope_.search_correct(ident); auto s2 = scope_.search_correct(ident);
// UFCS // UFCS
if (s2 && s2.isFuncDeclaration) if (s2 && s2.isFuncDeclaration)
errorSupplemental(loc, "did you mean %s `%s`?", {
if (s2.ident == ident)
{
errorSupplemental(s2.loc, "cannot call %s `%s` with UFCS because it is not declared at module scope",
s2.kind(), s2.toChars()); s2.kind(), s2.toChars());
}
else
errorSupplemental(s2.loc, "did you mean %s `%s`?",
s2.kind(), s2.toChars());
}
else if (src.type.ty == Tpointer) else if (src.type.ty == Tpointer)
{ {
// structPtr.field // structPtr.field
@ -3454,7 +3462,7 @@ Expression getProperty(Type t, Scope* scope_, Loc loc, Identifier ident, int fla
{ {
if (auto s3 = as.search_correct(ident)) if (auto s3 = as.search_correct(ident))
{ {
errorSupplemental(loc, "did you mean %s `%s`?", errorSupplemental(s3.loc, "did you mean %s `%s`?",
s3.kind(), s3.toChars()); s3.kind(), s3.toChars());
} }
} }

4
compiler/test/fail_compilation/fail347.d
View file

@ -5,10 +5,10 @@ TEST_OUTPUT:
fail_compilation/fail347.d(26): Error: undefined identifier `bbr`, did you mean variable `bar`? fail_compilation/fail347.d(26): Error: undefined identifier `bbr`, did you mean variable `bar`?
fail_compilation/fail347.d(27): Error: no property `ofo` for type `S`, did you mean `fail347.S.foo`? fail_compilation/fail347.d(27): Error: no property `ofo` for type `S`, did you mean `fail347.S.foo`?
fail_compilation/fail347.d(29): Error: no property `fool` for `sp` of type `fail347.S*` fail_compilation/fail347.d(29): Error: no property `fool` for `sp` of type `fail347.S*`
fail_compilation/fail347.d(29): did you mean variable `foo`? fail_compilation/fail347.d(20): did you mean variable `foo`?
fail_compilation/fail347.d(30): Error: undefined identifier `strlenx`, did you mean function `strlen`? fail_compilation/fail347.d(30): Error: undefined identifier `strlenx`, did you mean function `strlen`?
fail_compilation/fail347.d(31): Error: no property `strlenx` for `"hello"` of type `string` fail_compilation/fail347.d(31): Error: no property `strlenx` for `"hello"` of type `string`
fail_compilation/fail347.d(31): did you mean function `strlen`? fail_compilation/imports/fail347a.d(3): did you mean function `strlen`?
--- ---
*/ */

36
compiler/test/fail_compilation/ufcs.d
View file

@ -1,23 +1,28 @@
/* /*
TEST_OUTPUT: TEST_OUTPUT:
--- ---
fail_compilation/ufcs.d(26): Error: no property `regularF` for `s` of type `S` fail_compilation/ufcs.d(31): Error: no property `regularF` for `s` of type `S`
fail_compilation/ufcs.d(26): the following error occured while looking for a UFCS match fail_compilation/ufcs.d(31): the following error occured while looking for a UFCS match
fail_compilation/ufcs.d(26): Error: function `regularF` is not callable using argument types `(S)` fail_compilation/ufcs.d(31): Error: function `regularF` is not callable using argument types `(S)`
fail_compilation/ufcs.d(26): expected 0 argument(s), not 1 fail_compilation/ufcs.d(31): expected 0 argument(s), not 1
fail_compilation/ufcs.d(31): `ufcs.regularF()` declared here fail_compilation/ufcs.d(39): `ufcs.regularF()` declared here
fail_compilation/ufcs.d(27): Error: no property `templateF` for `s` of type `S` fail_compilation/ufcs.d(32): Error: no property `templateF` for `s` of type `S`
fail_compilation/ufcs.d(27): the following error occured while looking for a UFCS match fail_compilation/ufcs.d(32): the following error occured while looking for a UFCS match
fail_compilation/ufcs.d(27): Error: template `templateF` is not callable using argument types `!()(S)` fail_compilation/ufcs.d(32): Error: template `templateF` is not callable using argument types `!()(S)`
fail_compilation/ufcs.d(32): Candidate is: `templateF()()` fail_compilation/ufcs.d(40): Candidate is: `templateF()()`
fail_compilation/ufcs.d(28): Error: no property `templateO` for `s` of type `S` fail_compilation/ufcs.d(33): Error: no property `templateO` for `s` of type `S`
fail_compilation/ufcs.d(28): the following error occured while looking for a UFCS match fail_compilation/ufcs.d(33): the following error occured while looking for a UFCS match
fail_compilation/ufcs.d(28): Error: none of the overloads of template `ufcs.templateO` are callable using argument types `!()(S)` fail_compilation/ufcs.d(33): Error: none of the overloads of template `ufcs.templateO` are callable using argument types `!()(S)`
fail_compilation/ufcs.d(34): Candidates are: `templateO()(int x)` fail_compilation/ufcs.d(42): Candidates are: `templateO()(int x)`
fail_compilation/ufcs.d(35): `templateO()(float y)` fail_compilation/ufcs.d(43): `templateO()(float y)`
fail_compilation/ufcs.d(36): Error: no property `local` for `s` of type `ufcs.S`
fail_compilation/ufcs.d(35): cannot call function `local` with UFCS because it is not declared at module scope
fail_compilation/ufcs.d(26): struct `S` defined here
--- ---
*/ */
struct S { } struct S { }
void f() void f()
@ -26,6 +31,9 @@ void f()
s.regularF(); s.regularF();
s.templateF(); s.templateF();
s.templateO(); s.templateO();
void local(S) {}
s.local();
} }
void regularF(); void regularF();