AstralTransRocketries/Cubyz
1
0
Fork 0
mirror of https://github.com/PixelGuys/Cubyz.git synced 2025-08-03 11:17:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add some testing for joining zon and fix #1231

Browse Source
This commit is contained in:
IntegratedQuantum 2025-04-03 19:43:43 +02:00
parent 0762e30955
commit db3d640c2a
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/zon.zig
View File

@ -1,4 +1,5 @@
const std = @import("std");
const builtin = @import("builtin");
const main = @import("main");
const NeverFailingAllocator = main.heap.NeverFailingAllocator;
@ -127,6 +128,10 @@ pub const ZonElement = union(enum) { // MARK: Zon
if(other == .null) {
return;
}
if(self.* != .object or other != .object) {
if(!builtin.is_test) std.log.err("Trying to join zon that isn't an object.", .{}); // TODO: #1275
return;
}
var iter = other.object.iterator();
while(iter.next()) |entry| {
@ -921,3 +926,29 @@ test "element parsing" {
try std.testing.expectEqual(ZonElement{.float = 17.1}, result.array.items[2]);
result.deinit(allocator);
}
test "merging" {
var wrap = main.heap.ErrorHandlingAllocator.init(std.testing.allocator);
const allocator = wrap.allocator();
const zon1 = ZonElement.parseFromString(allocator, null, ".{ .object1 = \"\" \n, .object2 =\t.{\n},.object3 =1.0e4\t,@\"\nobject1\"=.{},@\"\tobject1θ\"=.{},}");
defer zon1.deinit(allocator);
const zon2 = ZonElement.parseFromString(allocator, null, ".{ .object5 = 1 \n,}");
zon2.join(zon1);
try std.testing.expectEqual(.object, std.meta.activeTag(zon2));
try std.testing.expectEqual(.float, std.meta.activeTag(zon2.object.get("object3") orelse .null));
try std.testing.expectEqual(.stringOwned, std.meta.activeTag(zon2.object.get("object1") orelse .null));
try std.testing.expectEqual(.array, std.meta.activeTag(zon2.object.get("\nobject1") orelse .null));
try std.testing.expectEqual(.array, std.meta.activeTag(zon2.object.get("\tobject1θ") orelse .null));
try std.testing.expectEqual(.int, std.meta.activeTag(zon2.object.get("object5") orelse .null));
zon2.deinit(allocator);
const zon3 = ZonElement.parseFromString(allocator, null, "1");
zon3.join(zon1);
zon3.deinit(allocator);
const zon4 = ZonElement.parseFromString(allocator, null, "true");
zon1.join(zon4);
zon4.deinit(allocator);
}