From cad125b39637ba4fc9979d608deba75fac011dc3 Mon Sep 17 00:00:00 2001 From: Arijit Dey Date: Mon, 3 Feb 2025 14:19:51 +0530 Subject: [PATCH] move parser to a separate module --- build.zig | 3 +++ src/array.zig | 2 +- src/comment.zig | 2 +- src/datetime.zig | 2 +- src/float.zig | 2 +- src/integer.zig | 2 +- src/key.zig | 2 +- src/key_value_pair.zig | 2 +- src/main.zig | 4 ++-- src/spaces.zig | 2 +- src/string.zig | 2 +- src/struct_mapping.zig | 4 ++-- src/table.zig | 2 +- src/value.zig | 4 ++-- 14 files changed, 19 insertions(+), 16 deletions(-) diff --git a/build.zig b/build.zig index 08543cd..6071408 100644 --- a/build.zig +++ b/build.zig @@ -5,9 +5,12 @@ pub fn build(b: *std.Build) void { const targetOpt = b.standardTargetOptions(.{}); const datetime = b.createModule(.{ .root_source_file = b.path("src/datetime.zig") }); + const parser = b.createModule(.{ .root_source_file = b.path("src/parser.zig") }); const module = b.addModule("zig-toml", .{ .root_source_file = b.path("src/main.zig") }); module.addImport("datetime", datetime); + module.addImport("parser", parser); + datetime.addImport("parser", parser); const main_tests = b.addTest(.{ .root_source_file = b.path("src/tests.zig"), diff --git a/src/array.zig b/src/array.zig index db5c952..dee73af 100644 --- a/src/array.zig +++ b/src/array.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const parser = @import("./parser.zig"); +const parser = @import("parser"); const testing = std.testing; const value = @import("./value.zig"); diff --git a/src/comment.zig b/src/comment.zig index bae369a..e78f93c 100644 --- a/src/comment.zig +++ b/src/comment.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const parser = @import("./parser.zig"); +const parser = @import("parser"); const Context = parser.Context; const spaces = @import("./spaces.zig"); const testing = std.testing; diff --git a/src/datetime.zig b/src/datetime.zig index c597271..c30dfd5 100644 --- a/src/datetime.zig +++ b/src/datetime.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const parser = @import("./parser.zig"); +const parser = @import("parser"); const testing = std.testing; pub const Date = struct { diff --git a/src/float.zig b/src/float.zig index c7dcf51..a70ec6e 100644 --- a/src/float.zig +++ b/src/float.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const parser = @import("./parser.zig"); +const parser = @import("parser"); const testing = std.testing; pub fn interpret(txt: []const u8) ?f64 { diff --git a/src/integer.zig b/src/integer.zig index 71bc9f9..6d867b5 100644 --- a/src/integer.zig +++ b/src/integer.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const parser = @import("./parser.zig"); +const parser = @import("parser"); const testing = std.testing; pub fn interpret(txt: []const u8) ?i64 { diff --git a/src/key.zig b/src/key.zig index 9ebeec4..924cd26 100644 --- a/src/key.zig +++ b/src/key.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const parser = @import("./parser.zig"); +const parser = @import("parser"); const spaces = @import("./spaces.zig"); const string = @import("./string.zig"); const testing = std.testing; diff --git a/src/key_value_pair.zig b/src/key_value_pair.zig index 6aba85e..f003be2 100644 --- a/src/key_value_pair.zig +++ b/src/key_value_pair.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const parser = @import("./parser.zig"); +const parser = @import("parser"); const testing = std.testing; const key = @import("./key.zig"); diff --git a/src/main.zig b/src/main.zig index ae8b2d9..d250d9b 100644 --- a/src/main.zig +++ b/src/main.zig @@ -1,9 +1,9 @@ const std = @import("std"); -const parser = @import("./parser.zig"); +const parser = @import("parser"); const table = @import("./table.zig"); const struct_mapping = @import("./struct_mapping.zig"); -const datetime = @import("./datetime.zig"); +const datetime = @import("datetime"); const value = @import("./value.zig"); const serialize = @import("serialize/root.zig"); diff --git a/src/spaces.zig b/src/spaces.zig index 5fba3e6..4b3e9ad 100644 --- a/src/spaces.zig +++ b/src/spaces.zig @@ -1,6 +1,6 @@ const std = @import("std"); const testing = std.testing; -const parser = @import("./parser.zig"); +const parser = @import("parser"); const Context = parser.Context; fn contains(c: u8, allowed: []const u8) bool { diff --git a/src/string.zig b/src/string.zig index 5bdddca..0090a3c 100644 --- a/src/string.zig +++ b/src/string.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const parser = @import("./parser.zig"); +const parser = @import("parser"); const spaces = @import("./spaces.zig"); const Context = parser.Context; const testing = std.testing; diff --git a/src/struct_mapping.zig b/src/struct_mapping.zig index 0296394..8d3cc49 100644 --- a/src/struct_mapping.zig +++ b/src/struct_mapping.zig @@ -1,10 +1,10 @@ const std = @import("std"); -const parser = @import("./parser.zig"); +const parser = @import("parser"); const testing = std.testing; const Value = @import("./value.zig").Value; const Table = @import("./table.zig").Table; -const datetime = @import("./datetime.zig"); +const datetime = @import("datetime"); pub const Context = struct { alloc: std.mem.Allocator, diff --git a/src/table.zig b/src/table.zig index 118bccd..b6749bf 100644 --- a/src/table.zig +++ b/src/table.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const parser = @import("./parser.zig"); +const parser = @import("parser"); const testing = std.testing; const kv = @import("./key_value_pair.zig"); diff --git a/src/value.zig b/src/value.zig index 37e324b..7f452b6 100644 --- a/src/value.zig +++ b/src/value.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const parser = @import("./parser.zig"); +const parser = @import("parser"); const testing = std.testing; const string = @import("./string.zig"); @@ -7,7 +7,7 @@ const integer = @import("./integer.zig"); const float = @import("./float.zig"); const array = @import("./array.zig"); const tablepkg = @import("./table.zig"); -const datetime = @import("./datetime.zig"); +const datetime = @import("datetime"); const Table = tablepkg.Table; pub const ValueList = std.ArrayList(Value);