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

Expand toErrMsg to other types (#20896)

Browse source
This commit is contained in:
Dennis 2025-02-18 23:39:32 +01:00 • committed by GitHub
parent edd9eb5a2f
commit e082ce247a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 29 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/src/dmd/dtemplate.d
View file

@ -136,6 +136,13 @@ inout(Parameter) isParameter(inout RootObject o)
return cast(inout(Parameter))o;
}
inout(Identifier) isIdentifier(inout RootObject o)
{
if (!o || o.dyncast() != DYNCAST.identifier)
return null;
return cast(inout(Identifier))o;
}
inout(TemplateParameter) isTemplateParameter(inout RootObject o)
{
if (!o || o.dyncast() != DYNCAST.templateparameter)

8
compiler/src/dmd/func.d
View file

@ -1883,10 +1883,10 @@ struct AttributeViolation
assert(args.length <= 4); // expand if necessary
OutBuffer buf;
buf.printf(fmt,
args.length > 0 && args[0] ? args[0].toChars() : "",
args.length > 1 && args[1] ? args[1].toChars() : "",
args.length > 2 && args[2] ? args[2].toChars() : "",
args.length > 3 && args[3] ? args[3].toChars() : "",
args.length > 0 && args[0] ? args[0].toErrMsg() : "",
args.length > 1 && args[1] ? args[1].toErrMsg() : "",
args.length > 2 && args[2] ? args[2].toErrMsg() : "",
args.length > 3 && args[3] ? args[3].toErrMsg() : "",
);
this.action = buf.extractSlice();
}

20
compiler/src/dmd/hdrgen.d
View file

@ -98,11 +98,25 @@ void genhdrfile(Module m, bool doFuncBodies, ref OutBuffer buf)
}
/**
* Convert `e` to a string for error messages.
* Convert `o` to a string for error messages.
* Params:
* e = expression to convert
* e = object to convert
* Returns: string representation of `e`
*/
const(char)* toErrMsg(const RootObject o)
{
if (auto e = o.isExpression())
return toErrMsg(e);
if (auto d = o.isDsymbol())
return toErrMsg(d);
if (auto t = o.isType())
return t.toChars();
if (auto id = o.isIdentifier())
return id.toChars();
assert(0);
}
/// ditto
const(char)* toErrMsg(const Expression e)
{
HdrGenState hgs;
@ -119,7 +133,7 @@ const(char)* toErrMsg(const Dsymbol d)
{
if (d.isFuncDeclaration() || d.isTemplateInstance())
{
if (d.ident && d.ident.toString.startsWith("__"))
if (d.ident && d.ident.toString.startsWith("__") && !d.isCtorDeclaration())
{
HdrGenState hgs;
hgs.errorMsg = true;

2
compiler/test/fail_compilation/fail11375.d
View file

@ -2,7 +2,7 @@
TEST_OUTPUT:
---
fail_compilation/fail11375.d(18): Error: constructor `fail11375.D!().D.this` is not `nothrow`
which calls `this() { return this; }`
which calls `this`
fail_compilation/fail11375.d(16): Error: function `D main` may throw but is marked as `nothrow`
---
*/