Removed last trace of null
This commit is contained in:
parent
280b3b3c3a
commit
96e77a5ad4
@ -1,7 +1,7 @@
|
|||||||
pub const BUFFER_SIZE = 1024 * 64 * 64; // Line limit when parsing file and other buffers
|
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 MAX_FILE_SIZE = 5e+6; // 5Mb
|
||||||
pub const CSV_DELIMITER = ';'; // TODO: Delete
|
pub const CSV_DELIMITER = ';'; // TODO: Delete
|
||||||
pub const CPU_CORE = 6;
|
pub const CPU_CORE = 16;
|
||||||
|
|
||||||
// Testing
|
// Testing
|
||||||
pub const TEST_DATA_DIR = "data"; // Maybe put that directly in the build
|
pub const TEST_DATA_DIR = "data"; // Maybe put that directly in the build
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
// TODO: Only use a single and big ZipponError
|
// TODO: Only use a single and big ZipponError
|
||||||
|
|
||||||
pub const ZiQlParserError = error{
|
pub const ZiQlParserError = error{
|
||||||
|
MemoryError,
|
||||||
SynthaxError,
|
SynthaxError,
|
||||||
MemberNotFound,
|
MemberNotFound,
|
||||||
MemberMissing,
|
MemberMissing,
|
||||||
|
@ -12,7 +12,6 @@ pub const Token = struct {
|
|||||||
.{ "DELETE", .keyword_delete },
|
.{ "DELETE", .keyword_delete },
|
||||||
.{ "ADD", .keyword_add },
|
.{ "ADD", .keyword_add },
|
||||||
.{ "IN", .keyword_in },
|
.{ "IN", .keyword_in },
|
||||||
.{ "null", .keyword_null },
|
|
||||||
.{ "true", .bool_literal_true },
|
.{ "true", .bool_literal_true },
|
||||||
.{ "false", .bool_literal_false },
|
.{ "false", .bool_literal_false },
|
||||||
.{ "AND", .keyword_and },
|
.{ "AND", .keyword_and },
|
||||||
@ -33,7 +32,6 @@ pub const Token = struct {
|
|||||||
keyword_delete,
|
keyword_delete,
|
||||||
keyword_add,
|
keyword_add,
|
||||||
keyword_in,
|
keyword_in,
|
||||||
keyword_null,
|
|
||||||
keyword_and,
|
keyword_and,
|
||||||
keyword_or,
|
keyword_or,
|
||||||
keyword_to,
|
keyword_to,
|
||||||
|
@ -904,7 +904,7 @@ pub const Parser = struct {
|
|||||||
}
|
}
|
||||||
token = try self.checkTokensInArray(tag);
|
token = try self.checkTokensInArray(tag);
|
||||||
} else {
|
} else {
|
||||||
if (token.tag != tag and token.tag != .keyword_null) {
|
if (token.tag != tag) {
|
||||||
return printError(
|
return printError(
|
||||||
"Error: Expected {s}",
|
"Error: Expected {s}",
|
||||||
ZiQlParserError.SynthaxError,
|
ZiQlParserError.SynthaxError,
|
||||||
@ -925,13 +925,10 @@ pub const Parser = struct {
|
|||||||
.bool => {
|
.bool => {
|
||||||
switch (token.tag) {
|
switch (token.tag) {
|
||||||
.bool_literal_true => {
|
.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 => {
|
.bool_literal_false => {
|
||||||
member_map.put(member_name, "0") catch @panic("Could not add member name and value to map in getMapOfMember");
|
member_map.put(member_name, "0") catch return ZiQlParserError.MemoryError;
|
||||||
},
|
|
||||||
.keyword_null => {
|
|
||||||
member_map.put(member_name, self.toker.getTokenSlice(token)) catch return ZipponError.MemoryError;
|
|
||||||
},
|
},
|
||||||
else => return printError(
|
else => return printError(
|
||||||
"Error: Expected bool: true, false, or null",
|
"Error: Expected bool: true, false, or null",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user