From 96e77a5ad428234b01427e5d95f420b38eee74af Mon Sep 17 00:00:00 2001 From: MrBounty Date: Mon, 4 Nov 2024 22:57:19 +0100 Subject: [PATCH] Removed last trace of null --- src/config.zig | 2 +- src/stuffs/errors.zig | 1 + src/tokenizers/ziql.zig | 2 -- src/ziqlParser.zig | 9 +++------ 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/config.zig b/src/config.zig index 2475aed..fd122ff 100644 --- a/src/config.zig +++ b/src/config.zig @@ -1,7 +1,7 @@ pub const BUFFER_SIZE = 1024 * 64 * 64; // Line limit when parsing file and other buffers pub const MAX_FILE_SIZE = 5e+6; // 5Mb pub const CSV_DELIMITER = ';'; // TODO: Delete -pub const CPU_CORE = 6; +pub const CPU_CORE = 16; // Testing pub const TEST_DATA_DIR = "data"; // Maybe put that directly in the build diff --git a/src/stuffs/errors.zig b/src/stuffs/errors.zig index e339d4c..69e0d99 100644 --- a/src/stuffs/errors.zig +++ b/src/stuffs/errors.zig @@ -1,6 +1,7 @@ // TODO: Only use a single and big ZipponError pub const ZiQlParserError = error{ + MemoryError, SynthaxError, MemberNotFound, MemberMissing, diff --git a/src/tokenizers/ziql.zig b/src/tokenizers/ziql.zig index 5152e21..b8d7a74 100644 --- a/src/tokenizers/ziql.zig +++ b/src/tokenizers/ziql.zig @@ -12,7 +12,6 @@ pub const Token = struct { .{ "DELETE", .keyword_delete }, .{ "ADD", .keyword_add }, .{ "IN", .keyword_in }, - .{ "null", .keyword_null }, .{ "true", .bool_literal_true }, .{ "false", .bool_literal_false }, .{ "AND", .keyword_and }, @@ -33,7 +32,6 @@ pub const Token = struct { keyword_delete, keyword_add, keyword_in, - keyword_null, keyword_and, keyword_or, keyword_to, diff --git a/src/ziqlParser.zig b/src/ziqlParser.zig index 9c7e128..e75d4a0 100644 --- a/src/ziqlParser.zig +++ b/src/ziqlParser.zig @@ -904,7 +904,7 @@ pub const Parser = struct { } token = try self.checkTokensInArray(tag); } else { - if (token.tag != tag and token.tag != .keyword_null) { + if (token.tag != tag) { return printError( "Error: Expected {s}", ZiQlParserError.SynthaxError, @@ -925,13 +925,10 @@ pub const Parser = struct { .bool => { switch (token.tag) { .bool_literal_true => { - member_map.put(member_name, "1") catch @panic("Could not add member name and value to map in getMapOfMember"); + member_map.put(member_name, "1") catch return ZiQlParserError.MemoryError; }, .bool_literal_false => { - member_map.put(member_name, "0") catch @panic("Could not add member name and value to map in getMapOfMember"); - }, - .keyword_null => { - member_map.put(member_name, self.toker.getTokenSlice(token)) catch return ZipponError.MemoryError; + member_map.put(member_name, "0") catch return ZiQlParserError.MemoryError; }, else => return printError( "Error: Expected bool: true, false, or null",