yuzucchii/aether
2
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed some stuff

Browse Source
This commit is contained in:
yuzu 2025-05-25 19:19:15 -05:00
parent 2f307f3c37
commit f54b34dded
1 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
language.zig
View File

@ -49,20 +49,15 @@ pub const JsonInput = union(JsonType) {
pub fn deinit(self: JsonInput, allocator: mem.Allocator) void { pub fn deinit(self: JsonInput, allocator: mem.Allocator) void {
switch (self) { switch (self) {
JsonInput.array => |array| { JsonInput.array => |array| {
for (array) |json_input| { for (array) |json_input|
json_input.deinit(allocator); json_input.deinit(allocator);
}
allocator.free(array); allocator.free(array);
}, },
.object => |*object| { .object => |*object| {
var it = object.iterator(); var it = object.iterator();
while (it.next()) |entry| { while (it.next()) |entry| entry.value_ptr.deinit(allocator);
entry.value_ptr.deinit(allocator);
//allocator.free(entry.key_ptr.*);
}
@constCast(object).deinit(allocator); @constCast(object).deinit(allocator);
}, },
.string => |_| {},
else => {}, else => {},
} }
} }
@ -161,25 +156,9 @@ fn addString(self: *Self, allocator: mem.Allocator, bytes: []const u8) !usize {
return idx; return idx;
} }
fn addEmptyObject(self: *Self, allocator: mem.Allocator) !usize { fn addEmpty(self: *Self, allocator: mem.Allocator) !usize {
try self.index.ensureUnusedCapacity(allocator, 1); try self.index.ensureUnusedCapacity(allocator, 1);
const idx = self.index.addOneAssumeCapacity(); const idx = self.index.addOneAssumeCapacity();
const object: ObjectEntry = .{
.property_idx = self.property_index.string_bytes.items.len,
.value_idx = self.index.len + 1,
.len = 0,
};
self.index.set(idx, .{ .object = object });
return idx;
}
fn addEmptyArray(self: *Self, allocator: mem.Allocator) !usize {
try self.index.ensureUnusedCapacity(allocator, 1);
const idx = self.index.addOneAssumeCapacity();
self.index.set(idx, .{ .array = ArraySlice{
.start = self.index.len,
.len = 0,
} });
return idx; return idx;
} }
@ -252,9 +231,9 @@ fn getValue(
const entry = self.index.get(idx); const entry = self.index.get(idx);
switch (entry) { switch (entry) {
.null => return .null, .null => return .{ .null = {} },
.bool => return .{ .bool = entry.bool }, .bool => |b| return .{ .bool = b },
.number => return .{ .number = entry.number }, .number => |number| return .{ .number = number },
.string => |string| { .string => |string| {
const sl = string.slice(&self.string_index); const sl = string.slice(&self.string_index);
return .{ .string = sl }; return .{ .string = sl };
@ -333,7 +312,7 @@ pub fn parse(self: *Self, tokenizer: *Tokenizer) !usize {
var it = tokenizer.iterator(); var it = tokenizer.iterator();
const root = try self.addEmptyObject(allocator); const root = try self.addEmpty(allocator);
var token = it.next() orelse var token = it.next() orelse
return root; return root;
@ -343,6 +322,7 @@ pub fn parse(self: *Self, tokenizer: *Tokenizer) !usize {
flag: switch (token.type) { flag: switch (token.type) {
.eof => { .eof => {
assert(query.slice().len == 0); assert(query.slice().len == 0);
assert(root == 0);
return root; return root;
}, },
.property => { .property => {
@ -391,7 +371,7 @@ pub fn parse(self: *Self, tokenizer: *Tokenizer) !usize {
const parent_idx = query.get(query.len - 1); const parent_idx = query.get(query.len - 1);
const idx_ptr = try query.addOne(); const idx_ptr = try query.addOne();
idx_ptr.* = try self.addEmptyObject(allocator); idx_ptr.* = try self.addEmpty(allocator);
self.index.set(idx_ptr.*, .{ self.index.set(idx_ptr.*, .{
.object = ObjectEntry{ .object = ObjectEntry{
.len = 0, .len = 0,
@ -438,7 +418,7 @@ pub fn parse(self: *Self, tokenizer: *Tokenizer) !usize {
const idx_ptr = try query.addOne(); const idx_ptr = try query.addOne();
idx_ptr.* = try self.addEmptyArray(allocator); idx_ptr.* = try self.addEmpty(allocator);
self.index.set(idx_ptr.*, .{ .array = ArraySlice{ self.index.set(idx_ptr.*, .{ .array = ArraySlice{
.len = 0, .len = 0,
.start = idx_ptr.* + 1, .start = idx_ptr.* + 1,