diff --git a/README b/README index 5f60216..6acb50e 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ ========== -Project Name Generator +aturkri: A Project Name Generator ========== How to build: diff --git a/build.zig b/build.zig index e4bd172..c364c40 100644 --- a/build.zig +++ b/build.zig @@ -1,71 +1,40 @@ const std = @import("std"); -// Although this function looks imperative, note that its job is to -// declaratively construct a build graph that will be executed by an external -// runner. pub fn build(b: *std.Build) void { - // Standard target options allows the person running `zig build` to choose - // what target to build for. Here we do not override the defaults, which - // means any target is allowed, and the default is native. Other options - // for restricting supported target set are available. const target = b.standardTargetOptions(.{}); - // Standard optimization options allow the person running `zig build` to select - // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do not - // set a preferred release mode, allowing the user to decide how to optimize. const optimize = b.standardOptimizeOption(.{}); const lib = b.addStaticLibrary(.{ - .name = "project_id_generater", - // In this case the main source file is merely a path, however, in more - // complicated build scripts, this could be a generated file. + .name = "aturkri", + .root_source_file = b.path("src/root.zig"), .target = target, .optimize = optimize, }); - // This declares intent for the library to be installed into the standard - // location when the user invokes the "install" step (the default step when - // running `zig build`). b.installArtifact(lib); const exe = b.addExecutable(.{ - .name = "project_id_generater", + .name = "aturkri", .root_source_file = b.path("src/main.zig"), .target = target, .optimize = optimize, }); - // This declares intent for the executable to be installed into the - // standard location when the user invokes the "install" step (the default - // step when running `zig build`). b.installArtifact(exe); - // This *creates* a Run step in the build graph, to be executed when another - // step is evaluated that depends on it. The next line below will establish - // such a dependency. const run_cmd = b.addRunArtifact(exe); - // By making the run step depend on the install step, it will be run from the - // installation directory rather than directly from within the cache directory. - // This is not necessary, however, if the application depends on other installed - // files, this ensures they will be present and in the expected location. run_cmd.step.dependOn(b.getInstallStep()); - // This allows the user to pass arguments to the application in the build - // command itself, like this: `zig build run -- arg1 arg2 etc` if (b.args) |args| { run_cmd.addArgs(args); } - // This creates a build step. It will be visible in the `zig build --help` menu, - // and can be selected like this: `zig build run` - // This will evaluate the `run` step rather than the default, which is "install". const run_step = b.step("run", "Run the app"); run_step.dependOn(&run_cmd.step); - // Creates a step for unit testing. This only builds the test executable - // but does not run it. const lib_unit_tests = b.addTest(.{ .root_source_file = b.path("src/root.zig"), .target = target, @@ -82,9 +51,6 @@ pub fn build(b: *std.Build) void { const run_exe_unit_tests = b.addRunArtifact(exe_unit_tests); - // Similar to creating the run step earlier, this exposes a `test` step to - // the `zig build --help` menu, providing a way for the user to request - // running the unit tests. const test_step = b.step("test", "Run unit tests"); test_step.dependOn(&run_lib_unit_tests.step); test_step.dependOn(&run_exe_unit_tests.step); diff --git a/build.zig.zon b/build.zig.zon index 04cf6e2..2b2c8f4 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -1,72 +1,14 @@ .{ - // This is the default name used by packages depending on this one. For - // example, when a user runs `zig fetch --save `, this field is used - // as the key in the `dependencies` table. Although the user can choose a - // different name, most users will stick with this provided value. - // - // It is redundant to include "zig" in this name because it is already - // within the Zig package namespace. - .name = "project_id_generater", + .name = "aturkri", - // This is a [Semantic Version](https://semver.org/). - // In a future version of Zig it will be used for package deduplication. - .version = "0.0.0", + .version = "0.1.0", - // This field is optional. - // This is currently advisory only; Zig does not yet do anything - // with this value. - //.minimum_zig_version = "0.11.0", + .dependencies = .{}, - // This field is optional. - // Each dependency must either provide a `url` and `hash`, or a `path`. - // `zig build --fetch` can be used to fetch all dependencies of a package, recursively. - // Once all dependencies are fetched, `zig build` no longer requires - // internet connectivity. - .dependencies = .{ - // See `zig fetch --save ` for a command-line interface for adding dependencies. - //.example = .{ - // // When updating this field to a new URL, be sure to delete the corresponding - // // `hash`, otherwise you are communicating that you expect to find the old hash at - // // the new URL. - // .url = "https://example.com/foo.tar.gz", - // - // // This is computed from the file contents of the directory of files that is - // // obtained after fetching `url` and applying the inclusion rules given by - // // `paths`. - // // - // // This field is the source of truth; packages do not come from a `url`; they - // // come from a `hash`. `url` is just one of many possible mirrors for how to - // // obtain a package matching this `hash`. - // // - // // Uses the [multihash](https://multiformats.io/multihash/) format. - // .hash = "...", - // - // // When this is provided, the package is found in a directory relative to the - // // build root. In this case the package's hash is irrelevant and therefore not - // // computed. This field and `url` are mutually exclusive. - // .path = "foo", - - // // When this is set to `true`, a package is declared to be lazily - // // fetched. This makes the dependency only get fetched if it is - // // actually used. - // .lazy = false, - //}, - }, - - // Specifies the set of files and directories that are included in this package. - // Only files and directories listed here are included in the `hash` that - // is computed for this package. Only files listed here will remain on disk - // when using the zig package manager. As a rule of thumb, one should list - // files required for compilation plus any license(s). - // Paths are relative to the build root. Use the empty string (`""`) to refer to - // the build root itself. - // A directory listed here means that all files within, recursively, are included. .paths = .{ "build.zig", "build.zig.zon", "src", - // For example... - //"LICENSE", - //"README.md", + "LICENSE", }, } diff --git a/src/main.zig b/src/main.zig index 279b7dd..13ea587 100644 --- a/src/main.zig +++ b/src/main.zig @@ -12,7 +12,8 @@ pub fn main() !void { if (std.fmt.parseInt(usize, arg, 10)) |n| { count = n; } else |_| { - std.debug.print("Invalid parameter, generating one name.\n", .{}); + std.debug.print("Usage: \n {s} [how-many-names]\n", .{args[0]}); + return; } } diff --git a/src/root.zig b/src/root.zig index 1750ca0..84e9533 100644 --- a/src/root.zig +++ b/src/root.zig @@ -30,14 +30,12 @@ pub fn generateName(allocator: std.mem.Allocator, seed: u64, syllable_count: usi } test "Test single syllable" { - // try testing.expect(add(3, 7) == 10); var prng = isaac64.init(0); var rng = prng.random(); std.debug.print("A Syllable: {s}\n", .{getRandomSyllable(&rng)}); } test "Test random word" { - // try testing.expect(add(3, 7) == 10); var gpa = std.heap.page_allocator; var prng = isaac64.init(0); var rng = prng.random(); diff --git a/src/syllable.zig b/src/syllable.zig index 1718640..c1e88c7 100644 --- a/src/syllable.zig +++ b/src/syllable.zig @@ -1,18 +1,17 @@ -// const syllables = [_][]const u8{ -// "uta", "po", "nia", "ta", "ro", "mo", "ri", "tze", "tki", "ru", "vi", "ra", -// "ko", "sa", "ri", "ne", "ko", "mi", "wa", "tsu", "ot", "ku", "tsi", "tso", -// "ryo", "psi", "kro", "ato", "oyo", "kyo", -// }; - pub const syllables = [_][]const u8{ - "at", "ap", "ay", "ak", "aq", "ar", "ab", "am", - "it", "ip", "iy", "ik", "iq", "ir", "ib", "im", - "ut", "up", "uy", "uk", "uq", "ur", "ub", "um", - "et", "ep", "ey", "ek", "eq", "er", "eb", "em", - "ot", "op", "oy", "ok", "oq", "or", "ob", "om", - "na", "ka", "kra", "kza", "tsa", "tza", "rya", "psa", - "ni", "ki", "kri", "kzi", "tsi", "tzi", "ryi", "psi", - "nu", "ku", "kru", "kzu", "tsu", "tzu", "ryu", "psu", - "ne", "ke", "kre", "kze", "tse", "tze", "rye", "pse", - "no", "ko", "kro", "kzo", "tso", "tzo", "ryo", "psa", + "at", "ap", "ay", "ak", "aq", "ar", "ab", "am", + "it", "ip", "iy", "ik", "iq", "ir", "ib", "im", + "ut", "up", "uy", "uk", "uq", "ur", "ub", "um", + "et", "ep", "ey", "ek", "eq", "er", "eb", "em", + "ot", "op", "oy", "ok", "oq", "or", "ob", "om", + "na", "ka", "kra", "kza", "tsa", "tza", "rya", "psa", + "ni", "ki", "kri", "kzi", "tsi", "tzi", "ryi", "psi", + "nu", "ku", "kru", "kzu", "tsu", "tzu", "ryu", "psu", + "ne", "ke", "kre", "kze", "tse", "tze", "rye", "pse", + "no", "ko", "kro", "kzo", "tso", "tzo", "ryo", "psa", + "qta", "qua", "tka", "hya", "hua", "pha", "rza", "dza", + "qti", "qui", "tki", "hyi", "hui", "phi", "rzi", "dzi", + "qtu", "quu", "tku", "hyu", "huu", "phu", "rzu", "dzu", + "qte", "que", "tke", "hye", "hue", "phe", "rze", "dze", + "qto", "quo", "tko", "hyo", "huo", "pho", "rzo", "dzo", };