forks
/
dfmt
mirror of https://github.com/dlang-community/dfmt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: make it compile with latest DMD 

Some breaking changes in upstream borked the AST walker, it's been fixed
in this commit.

Signed-off-by: Prajwal S N <prajwalnadig21@gmail.com>
This commit is contained in:
Prajwal S N 2023-12-29 13:22:59 +05:30
parent 0897c83e86
commit 3b80011673
No known key found for this signature in database
GPG Key ID: 60701A603988FAC2
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dub.json
View File

@ -4,7 +4,7 @@
"targetType": "autodetect", "targetType": "autodetect",
"license": "BSL-1.0", "license": "BSL-1.0",
"dependencies": { "dependencies": {
"dmd": "~>2.106.0-beta.1" "dmd": "~>2.107.0-beta.1"
}, },
"targetPath": "bin/", "targetPath": "bin/",
"targetName": "dfmt", "targetName": "dfmt",

8
src/dfmt/ast.d
View File

@ -2144,6 +2144,11 @@ extern (C++) class FormatVisitor : SemanticTimeTransitiveVisitor
write('}'); write('}');
} }
void visitDefault(DefaultInitializer di)
{
write("{ }");
}
mixin VisitInitializer!void visit; mixin VisitInitializer!void visit;
visit.VisitInitializer(inx); visit.VisitInitializer(inx);
} }
@ -2164,8 +2169,6 @@ extern (C++) class FormatVisitor : SemanticTimeTransitiveVisitor
} }
else if (auto e = isExpression(oarg)) else if (auto e = isExpression(oarg))
{ {
if (e.op == EXP.variable)
e = e.optimize(WANTvalue); // added to fix https://issues.dlang.org/show_bug.cgi?id=7375
writeExprWithPrecedence(e, PREC.assign); writeExprWithPrecedence(e, PREC.assign);
} }
else if (ASTCodegen.Dsymbol s = isDsymbol(oarg)) else if (ASTCodegen.Dsymbol s = isDsymbol(oarg))
@ -2236,7 +2239,6 @@ extern (C++) class FormatVisitor : SemanticTimeTransitiveVisitor
if (e.type == Type.tsize_t) if (e.type == Type.tsize_t)
{ {
ASTCodegen.Expression ex = (e.op == EXP.cast_ ? (cast(ASTCodegen.CastExp) e).e1 : e); ASTCodegen.Expression ex = (e.op == EXP.cast_ ? (cast(ASTCodegen.CastExp) e).e1 : e);
ex = ex.optimize(WANTvalue);
const ulong uval = ex.op == EXP.int64 ? ex.toInteger() : cast(ulong)-1; const ulong uval = ex.op == EXP.int64 ? ex.toInteger() : cast(ulong)-1;
if (cast(long) uval >= 0) if (cast(long) uval >= 0)
{ {