Skip to content

Makes EmitPushIsSaved virtual #2480

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

Merged
wixoaGit merged 4 commits into from
Jan 3, 2026
Merged

Makes EmitPushIsSaved virtual #2480

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
2382808
makes EmitPushIsSaved virtual
Ruzihm Jan 2, 2026
bc90d27
maybe it makes more sense to just put it on expressioncontext and cal…
Ruzihm Jan 2, 2026
5a5f907
i didnt end a method with a return nope not me
Ruzihm Jan 2, 2026
b74c763
Update DMCompiler/DM/DMExpression.cs
wixoaGit Jan 3, 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
5 changes: 5 additions & 0 deletions DMCompiler/DM/DMExpression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ public virtual DMReference EmitReference(ExpressionContext ctx, string endLabel,
return DMReference.Invalid;
}

public virtual void EmitPushIsSaved(ExpressionContext ctx) {
ctx.Compiler.Emit(WarningCode.BadArgument, Location, $"can't get issaved() value of {this}");
ctx.Proc.PushNullAndError();
}

/// <summary>
/// Gets the canonical name of the expression if it exists.
/// </summary>
Expand Down
16 changes: 1 addition & 15 deletions DMCompiler/DM/Expressions/Builtins.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,21 +348,7 @@ internal sealed class IsSaved(Location location, DMExpression expr) : DMExpressi
public override DMComplexValueType ValType => DMValueType.Num;

public override void EmitPushValue(ExpressionContext ctx) {
switch (expr) {
case Dereference deref:
deref.EmitPushIsSaved(ctx);
return;
case Field field:
field.EmitPushIsSaved(ctx.Proc);
return;
case Local:
ctx.Proc.PushFloat(0);
return;
default:
ctx.Compiler.Emit(WarningCode.BadArgument, expr.Location, $"can't get saved value of {expr}");
ctx.Proc.PushNullAndError();
return;
}
expr.EmitPushIsSaved(ctx);
}
}

Expand Down
2 changes: 1 addition & 1 deletion DMCompiler/DM/Expressions/Dereference.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ public override void EmitPushInitial(ExpressionContext ctx) {
ctx.Proc.AddLabel(endLabel);
}

public void EmitPushIsSaved(ExpressionContext ctx) {
public override void EmitPushIsSaved(ExpressionContext ctx) {
string endLabel = ctx.Proc.NewLabelName();

if (_expression is LValue exprLValue) {
Expand Down
12 changes: 8 additions & 4 deletions DMCompiler/DM/Expressions/LValue.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,10 @@ public override void EmitPushInitial(ExpressionContext ctx) {
}

public override string GetNameof(ExpressionContext ctx) => LocalVar.Name;

public override void EmitPushIsSaved(ExpressionContext ctx) {
ctx.Proc.PushFloat(0);
}
}

// Identifier of field
Expand All @@ -209,10 +213,10 @@ public override void EmitPushInitial(ExpressionContext ctx) {
}
}

public void EmitPushIsSaved(DMProc proc) {
proc.PushReferenceValue(DMReference.Src);
proc.PushString(variable.Name);
proc.IsSaved();
public override void EmitPushIsSaved(ExpressionContext ctx) {
ctx.Proc.PushReferenceValue(DMReference.Src);
ctx.Proc.PushString(variable.Name);
ctx.Proc.IsSaved();
}

public override DMReference EmitReference(ExpressionContext ctx, string endLabel,
Expand Down
Loading