Skip to content

Bring parity to num/null #2432

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 7 commits into from
Dec 9, 2025
Merged

Bring parity to num/null #2432

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0bae34b
fix runtime
amylizzle Oct 26, 2025
591db06
ew I touched the compiler
amylizzle Oct 26, 2025
0629206
all errors
amylizzle Nov 6, 2025
5aff10a
add a proper error and test
amylizzle Nov 6, 2025
a8768bd
Update OpenDreamRuntime/Procs/DMOpcodeHandlers.cs
amylizzle Nov 15, 2025
959d46d
Remove `WarningCode.DivideByNull`
wixoaGit Dec 9, 2025
28f99de
Update Content.Tests/DMProject/Tests/Operators/div_by_null.dm
wixoaGit Dec 9, 2025
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
2 changes: 1 addition & 1 deletion Content.Tests/DMProject/Tests/Operators/Division.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
var/list/expected = list(
1,
"Error",
10,
"Error",
"Error",
"Error", // index 5
"Error",
Expand Down
3 changes: 3 additions & 0 deletions Content.Tests/DMProject/Tests/Operators/div_by_null.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// COMPILE ERROR OD0502
/proc/RunTest
var/test = 10/null
2 changes: 1 addition & 1 deletion Content.Tests/DMProject/Tests/Operators/valid_and_null.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

ASSERT(C(4) / C(2) == C(2))
ASSERT(C(null) / C(2) == C(0))
ASSERT(C(2) / C(null) == C(2))
//ASSERT(C(2) / C(null) == C(2)) // Runtime error
ASSERT(C(null) / C(null) == C(0))

ASSERT(C(4) % C(3) == C(1))
Expand Down
4 changes: 2 additions & 2 deletions Content.Tests/DMProject/Tests/Operators/valid_and_null_const.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@

ASSERT(C(4) / C(2) == C(2))
ASSERT(C(null) / C(2) == C(0))
ASSERT(C(2) / C(null) == C(2))
ASSERT(C(null) / C(null) == C(0))
//ASSERT(C(2) / C(null) == C(2)) //compile time error
//ASSERT(C(null) / C(null) == C(0))

ASSERT(C(4) % C(3) == C(1))
ASSERT(C(null) % C(3) == C(0))
Expand Down
4 changes: 4 additions & 0 deletions DMCompiler/DM/Expressions/Binary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@ public override bool TryAsConstant(DMCompiler compiler, [NotNullWhen(true)] out

if (lhs is Number lhsNum && rhs is Number rhsNum) {
constant = new Number(Location, lhsNum.Value / rhsNum.Value);
} else if (rhs is Null) {
compiler.Emit(WarningCode.BadExpression, Location, "Division by null is invalid");
constant = null;
return false;
} else {
constant = null;
return false;
Expand Down
3 changes: 1 addition & 2 deletions OpenDreamRuntime/Procs/DMOpcodeHandlers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1143,8 +1143,7 @@ public static ProcStatus Divide(DMProcState state) {
state.Push(new DreamValue(0));
break;
case DreamValue.DreamValueType.Float when second.IsNull:
state.Push(new DreamValue(first.MustGetValueAsFloat()));
break;
throw new Exception($"Attempted to divide {first} by null");
case DreamValue.DreamValueType.Float when second.Type == DreamValue.DreamValueType.Float:
var secondFloat = second.MustGetValueAsFloat();
if (secondFloat == 0) {
Expand Down
Loading