From e2e8bc4d80cd4deb83b664cf88df8d4f111b4a24 Mon Sep 17 00:00:00 2001 From: MrBounty Date: Wed, 9 Oct 2024 23:32:37 +0200 Subject: [PATCH] Created the engines folder Created a new folder to clean a bit the repo, put the file and schema engine inside. As those and Parser depend on the types.zig, I also add this folder inside the new engines folder --- build.zig | 4 ++-- src/cliParser.zig | 2 +- src/{fileEngine.zig => engines/file.zig} | 8 +------- src/{schemaEngine.zig => engines/schema.zig} | 0 src/{ => engines}/types/dataType.zig | 0 src/{ => engines}/types/uuid.zig | 0 src/schemaParser.zig | 6 ++++-- src/ziqlParser.zig | 8 ++++---- 8 files changed, 12 insertions(+), 16 deletions(-) rename src/{fileEngine.zig => engines/file.zig} (99%) rename src/{schemaEngine.zig => engines/schema.zig} (100%) rename src/{ => engines}/types/dataType.zig (100%) rename src/{ => engines}/types/uuid.zig (100%) diff --git a/build.zig b/build.zig index 7378c91..f790abe 100644 --- a/build.zig +++ b/build.zig @@ -46,7 +46,7 @@ pub fn build(b: *std.Build) void { const run_tests4 = b.addRunArtifact(tests4); const tests5 = b.addTest(.{ - .root_source_file = b.path("src/types/uuid.zig"), + .root_source_file = b.path("src/engines/types/uuid.zig"), .target = target, .optimize = optimize, .name = "UUID", @@ -55,7 +55,7 @@ pub fn build(b: *std.Build) void { const run_tests5 = b.addRunArtifact(tests5); const tests6 = b.addTest(.{ - .root_source_file = b.path("src/fileEngine.zig"), + .root_source_file = b.path("src/engines/file.zig"), .target = target, .optimize = optimize, .name = "File Engine", diff --git a/src/cliParser.zig b/src/cliParser.zig index 199486b..a82d449 100644 --- a/src/cliParser.zig +++ b/src/cliParser.zig @@ -1,6 +1,6 @@ const std = @import("std"); const Allocator = std.mem.Allocator; -const DataEngine = @import("fileEngine.zig").FileEngine; +const DataEngine = @import("engines/file.zig").FileEngine; const cliTokenizer = @import("tokenizers/cli.zig").Tokenizer; const cliToken = @import("tokenizers/cli.zig").Token; const ziqlTokenizer = @import("tokenizers/ziql.zig").Tokenizer; diff --git a/src/fileEngine.zig b/src/engines/file.zig similarity index 99% rename from src/fileEngine.zig rename to src/engines/file.zig index 485f931..651c2e2 100644 --- a/src/fileEngine.zig +++ b/src/engines/file.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const schemaEngine = @import("schemaEngine.zig"); +const schemaEngine = @import("schema.zig"); const Allocator = std.mem.Allocator; const UUID = @import("types/uuid.zig").UUID; const DataType = @import("types/dataType.zig").DataType; @@ -437,12 +437,6 @@ test "Get list of UUID using condition" { try data_engine.getUUIDListUsingCondition(condition, &uuid_array); } -test "Open dir" { - const dir = std.fs.cwd(); - const sub_dir = try dir.openDir("src/types", .{}); - _ = sub_dir; -} - // Series of functions to use just before creating an entity. // Will transform the string of data into data of the right type./ diff --git a/src/schemaEngine.zig b/src/engines/schema.zig similarity index 100% rename from src/schemaEngine.zig rename to src/engines/schema.zig diff --git a/src/types/dataType.zig b/src/engines/types/dataType.zig similarity index 100% rename from src/types/dataType.zig rename to src/engines/types/dataType.zig diff --git a/src/types/uuid.zig b/src/engines/types/uuid.zig similarity index 100% rename from src/types/uuid.zig rename to src/engines/types/uuid.zig diff --git a/src/schemaParser.zig b/src/schemaParser.zig index 2d45a3d..32ab2c4 100644 --- a/src/schemaParser.zig +++ b/src/schemaParser.zig @@ -1,7 +1,7 @@ const std = @import("std"); const Allocator = std.mem.Allocator; -const Toker = @import("schemaTokenizer.zig").Tokenizer; -const Token = @import("schemaTokenizer.zig").Token; +const Toker = @import("tokenizers/schema.zig").Tokenizer; +const Token = @import("tokenizers/schema.zig").Token; pub const Parser = struct { file: std.fs.File, @@ -181,3 +181,5 @@ pub const Parser = struct { self.writeToFile("\";"); } }; + +// TODO: Some test, weird that there isn't any yet diff --git a/src/ziqlParser.zig b/src/ziqlParser.zig index eaa89a9..7b78327 100644 --- a/src/ziqlParser.zig +++ b/src/ziqlParser.zig @@ -1,10 +1,10 @@ const std = @import("std"); -const schemaEngine = @import("schemaEngine.zig"); -const DataEngine = @import("fileEngine.zig").FileEngine; -const Condition = @import("fileEngine.zig").FileEngine.Condition; +const schemaEngine = @import("engines/schema.zig"); +const DataEngine = @import("engines/file.zig").FileEngine; +const Condition = @import("engines/file.zig").FileEngine.Condition; const Tokenizer = @import("tokenizers/ziql.zig").Tokenizer; const Token = @import("tokenizers/ziql.zig").Token; -const UUID = @import("types/uuid.zig").UUID; +const UUID = @import("engines/types/uuid.zig").UUID; const Allocator = std.mem.Allocator; const stdout = std.io.getStdOut().writer();