Skip to content

Support custom types #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davispuh wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Support custom types #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ecf04f6
Support `&=`, `^=`, `|=` for macros
davispuh Mar 14, 2026
1bcd197
Comment out compiler builtins
davispuh Mar 11, 2026
2a3cdd2
Support custom types
davispuh Mar 12, 2026
795051e
Support couple of `__*_TYPE__` types like `__SIZE_TYPE__`
davispuh Mar 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 36 additions & 4 deletions dstep/translator/MacroDefinition.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,14 @@ string translate(Expression expression, ExpressionContext context)
},
delegate string(CastExpr castExpr)
{
if (!castExpr.type.isExposed && !castExpr.isParamType)
{
return format(
"%s(%s)",
castExpr.type.spelling,
castExpr.subexpr.debraced.translate(context));
}

return format(
"cast(%s) %s",
translateType(context, Cursor.init, castExpr.type).makeString(),
Expand All @@ -343,6 +351,9 @@ string translate(Expression expression, ExpressionContext context)
translateBinaryOperator!OrExpr,
translateBinaryOperator!LogicalAndExpr,
translateBinaryOperator!LogicalOrExpr,
translateBinaryOperator!AndAssignExpr,
translateBinaryOperator!XorAssignExpr,
translateBinaryOperator!OrAssignExpr,
delegate string(CondExpr condExpr)
{
return format(
Expand Down Expand Up @@ -403,6 +414,9 @@ void guessParamTypes(Expression expression, ref ExprType[string] params, ExprTyp
guessBinaryOperator!OrExpr,
guessBinaryOperator!LogicalAndExpr,
guessBinaryOperator!LogicalOrExpr,
guessBinaryOperator!AndAssignExpr,
guessBinaryOperator!XorAssignExpr,
guessBinaryOperator!OrAssignExpr,
delegate void(CondExpr condExpr)
{
condExpr.expr.guessParamTypes(params, type);
Expand Down Expand Up @@ -522,6 +536,7 @@ bool translateFunctAlias(
{
import std.algorithm.comparison : equal;
import std.algorithm.iteration : map;
import std.algorithm.searching : startsWith;

CallExpr* expr = definition.expr.peek!CallExpr;
auto expressionContext = ExpressionContext.make(context);
Expand Down Expand Up @@ -554,11 +569,17 @@ bool translateFunctAlias(
.map!(a => a.translate(expressionContext))))
{
version (D1)
enum fmt = "alias %2$s %1$s;";
string fmt = "alias %2$s %1$s;";
else
enum fmt = "alias %1$s = %2$s;";
string fmt = "alias %1$s = %2$s;";

output.singleLine(fmt, definition.spelling, ident.spelling);
// Handle compiler builtins (eg. __builtin_unreachable)
string value = ident.spelling;
if (value.startsWith("__builtin_") || value == "_Alignof")
{
fmt = "// FIXME: " ~ fmt;
}
output.singleLine(fmt, definition.spelling, value);
return true;
}
}
Expand Down Expand Up @@ -592,6 +613,8 @@ void translateMacroDefinitionAliasOrConst(
Context context,
TypedMacroDefinition definition)
{
import std.algorithm.searching : startsWith, canFind;

auto expressionContext = ExpressionContext.make(context);

string formatString;
Expand All @@ -612,10 +635,19 @@ void translateMacroDefinitionAliasOrConst(
formatString = "enum %s = %s;";
}

string value = debraced.translate(expressionContext);
if (["const", "static", "volatile", "_Static_assert"].canFind(value) ||
// Handle compiler builtins
value.startsWith("__builtin_") ||
value.startsWith("__attribute__"))
{
formatString = "// FIXME: " ~ formatString;
}

output.singleLine(
formatString,
definition.definition.spelling,
debraced.translate(expressionContext));
value);

expressionContext.elevateImports();
}
Expand Down
Loading