mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-28 06:00:13 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix bugzilla 24670 - importC: .di generation does not place parentheses around const struct return types

Browse source
This commit is contained in:
Dennis Korpel 2024-07-21 16:52:29 +02:00 • committed by The Dlang Bot
parent 75554b77ba
commit 749fd9ec58
3 changed files with 51 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4279,13 +4279,23 @@ private void typeToBufferx(Type t, ref OutBuffer buf, ref HdrGenState hgs)
void visitTag(TypeTag t) void visitTag(TypeTag t)
{ {
if (t.mod & MODFlags.const_)
buf.writestring("const ");
if (hgs.importcHdr && t.id) if (hgs.importcHdr && t.id)
{ {
// https://issues.dlang.org/show_bug.cgi?id=24670
// `const` must be parenthesized because it can be a return type
if (t.mod & MODFlags.const_)
buf.writestring("const(");
// For C to D translation, `struct S` or `enum S` simply becomes `S`
buf.writestring(t.id.toString()); buf.writestring(t.id.toString());
if (t.mod & MODFlags.const_)
buf.writestring(")");
return; return;
} }
// The following produces something like "const enum E : short"
if (t.mod & MODFlags.const_)
buf.writestring("const ");
buf.writestring(Token.toString(t.tok)); buf.writestring(Token.toString(t.tok));
buf.writeByte(' '); buf.writeByte(' ');
if (t.id) if (t.id)

9
compiler/test/compilable/ctod.i
View file

@ -31,6 +31,11 @@ extern (C)
{ {
A, A,
} }
struct S24326
{
int x = void;
}
const(S24326) fun(int y);
/+enum int __DATE__ = 1+/; /+enum int __DATE__ = 1+/;
/+enum int __TIME__ = 1+/; /+enum int __TIME__ = 1+/;
/+enum int __TIMESTAMP__ = 1+/; /+enum int __TIMESTAMP__ = 1+/;
@ -76,3 +81,7 @@ typedef S T;
// https://issues.dlang.org/show_bug.cgi?id=24326 // https://issues.dlang.org/show_bug.cgi?id=24326
enum { A }; enum { A };
// https://issues.dlang.org/show_bug.cgi?id=24670
struct S24326 { int x; };
const struct S24326 fun(int y);

33
compiler/test/compilable/jsonc.i
View file

@ -12,12 +12,12 @@ TEST_OUTPUT:
"baseDeco": "i", "baseDeco": "i",
"char": 9, "char": 9,
"kind": "enum", "kind": "enum",
"line": 43, "line": 68,
"members": [ "members": [
{ {
"char": 17, "char": 17,
"kind": "enum member", "kind": "enum member",
"line": 43, "line": 68,
"name": "a" "name": "a"
} }
], ],
@ -28,10 +28,35 @@ TEST_OUTPUT:
"char": 22, "char": 22,
"deco": "VALUE_REMOVED_FOR_TEST", "deco": "VALUE_REMOVED_FOR_TEST",
"kind": "alias", "kind": "alias",
"line": 43, "line": 68,
"name": "E", "name": "E",
"originalType": "enum E", "originalType": "enum E",
"protection": "public" "protection": "public"
},
{
"baseDeco": "s",
"char": 15,
"kind": "enum",
"line": 70,
"members": [
{
"char": 32,
"kind": "enum member",
"line": 70,
"name": "a2"
}
],
"name": "E2",
"protection": "public"
},
{
"char": 38,
"deco": "VALUE_REMOVED_FOR_TEST",
"kind": "alias",
"line": 70,
"name": "E2",
"originalType": "const enum E2 : short",
"protection": "public"
} }
] ]
} }
@ -41,3 +66,5 @@ TEST_OUTPUT:
// https://issues.dlang.org/show_bug.cgi?id=24108 // https://issues.dlang.org/show_bug.cgi?id=24108
typedef enum { a, } E; typedef enum { a, } E;
typedef const enum : short { a2, } E2; // C23 feature