Skip to content

Fix list() | list() not including the first list's associated values #2671

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

Closed
wixoaGit wants to merge 2 commits into from
Closed

Fix list() | list() not including the first list's associated values #2671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41e57c6
Fix `list() | list()` not including the first list's associated values
wixoaGit Jul 23, 2026
341b547
Include a test
wixoaGit Jul 23, 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
6 changes: 6 additions & 0 deletions Content.Tests/DMProject/Tests/List/ListOr.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/proc/RunTest()
var/list/L1 = list("a" = 1, "b" = 2)
var/list/L2 = list("c" = 3, "d" = 4)
var/list/result = L1 | L2

ASSERT(result ~= list("a" = 1, "b" = 2, "c" = 3, "d" = 4))
2 changes: 1 addition & 1 deletion OpenDreamRuntime/Objects/Types/DreamList.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ public virtual int GetLength() {
}

public DreamList Union(DreamList other) {
DreamList newList = new DreamList(ObjectDefinition, _values.Union(other.GetValues()).ToList(), null);
DreamList newList = new DreamList(ObjectDefinition, _values.Union(other.EnumerateValues()).ToList(), IsAssociative ? new(_associativeValues!) : null);
foreach ((DreamValue key, DreamValue value) in other.GetAssociativeValues()) {
newList.SetValue(key, value);
}
Expand Down
Loading