Merge pull request #1 from travisstaloch/update-0.15.2

Update to 0.15.2

Author: daneelsan

.gitignore

@@ -1 +1 @@
-.zig-cache/
+.zig-cache/

build.zig

@@ -1,35 +1,49 @@
 const std = @import("std");
 
 pub fn build(b: *std.Build) void {
+    const target = b.standardTargetOptions(.{});
+    const optimize = b.standardOptimizeOption(.{});
+
     // WASM executable
-    const target = b.resolveTargetQuery(.{
-        .cpu_arch = .wasm32,
-        .os_tag = .freestanding,
-    });
     const wasm_exe = b.addExecutable(.{
         .name = "tinylisp",
-        .root_source_file = b.path("src/wasm.zig"),
-        .target = target,
-        .optimize = .Debug,
+        .root_module = b.createModule(.{
+            .root_source_file = b.path("src/wasm.zig"),
+            .target = b.resolveTargetQuery(.{
+                .cpu_arch = .wasm32,
+                .os_tag = .freestanding,
+            }),
+            .optimize = optimize,
+        }),
     });
     wasm_exe.entry = .disabled;
     wasm_exe.rdynamic = true;
     b.installArtifact(wasm_exe);
 
     // Local executable
-    const local_exe = b.addExecutable(.{
+    const exe = b.addExecutable(.{
         .name = "tinylisp",
-        .root_source_file = b.path("src/main.zig"),
-        .target = b.standardTargetOptions(.{}),
-        .optimize = b.standardOptimizeOption(.{}),
+        .root_module = b.createModule(.{
+            .root_source_file = b.path("src/main.zig"),
+            .target = target,
+            .optimize = optimize,
+        }),
     });
+    b.installArtifact(exe);
+    const exe_run = b.addRunArtifact(exe);
+    exe_run.step.dependOn(&exe.step);
+    const run_step = b.step("run", "Run the local executable");
+    run_step.dependOn(&exe_run.step);
 
-    const local_exe_install = b.addInstallArtifact(local_exe, .{});
-    const local_step = b.step("local", "Build the local executable");
-    local_step.dependOn(&local_exe_install.step);
+    // expose module for dependees
+    const mod = b.addModule("tinylisp", .{
+        .root_source_file = b.path("src/tinylisp.zig"),
+        .target = target,
+        .optimize = optimize,
+    });
 
-    const local_exe_run_cmd = b.addRunArtifact(local_exe);
-    local_exe_run_cmd.step.dependOn(&local_exe_install.step);
-    const run_step = b.step("run", "Run the local executable");
-    run_step.dependOn(&local_exe_run_cmd.step);
+    const tests = b.addTest(.{ .root_module = mod });
+    const test_step = b.step("test", "Run tests");
+    const run_tests = b.addRunArtifact(tests);
+    test_step.dependOn(&run_tests.step);
 }

build.zig.zon

@@ -1,86 +1,18 @@
 .{
-    // This is the default name used by packages depending on this one. For
-    // example, when a user runs `zig fetch --save <url>`, 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 = .tinylisp,
-
-    // 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",
-
-    // Together with name, this represents a globally unique package
-    // identifier. This field is generated by the Zig toolchain when the
-    // package is first created, and then *never changes*. This allows
-    // unambiguous detection of one package being an updated version of
-    // another.
-    //
-    // When forking a Zig project, this id should be regenerated (delete the
-    // field and run `zig build`) if the upstream project is still maintained.
-    // Otherwise, the fork is *hostile*, attempting to take control over the
-    // original project's identity. Thus it is recommended to leave the comment
-    // on the following line intact, so that it shows up in code reviews that
-    // modify the field.
     .fingerprint = 0xf7cb46bc1eba0aec, // Changing this has security and trust implications.
-
-    // Tracks the earliest Zig version that the package considers to be a
-    // supported use case.
-    .minimum_zig_version = "0.14.0",
-
-    // 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 <url>` 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. If the contents of a URL change this will result in a hash mismatch
-        //    // which will prevent zig from using it.
-        //    .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.
+    .minimum_zig_version = "0.15.0",
+    .dependencies = .{},
     .paths = .{
         "build.zig",
         "build.zig.zon",
         "src",
-        // For example...
-        //"LICENSE",
-        //"README.md",
+        "LICENSE",
+        "README.md",
+        "index.html",
+        "script.js",
+        "styles.css",
+        "favicon.ico",
     },
 }

src/JS.zig

@@ -1,4 +1,5 @@
 const std = @import("std");
+const Io = std.Io;
 
 pub const Imports = struct {
     extern fn jsTerminalWriteBuffer(ptr: [*]const u8, len: usize) void;
@@ -8,20 +9,17 @@ pub const Imports = struct {
 };
 
 pub const Terminal = struct {
-    pub const Error = error{};
-    pub const Writer = std.io.GenericWriter(
-        void,
-        Error,
-        writeFn,
-    );
-
-    pub fn writer() Writer {
-        return Terminal.Writer{ .context = {} };
+    pub fn writer() Io.Writer {
+        return .{
+            .buffer = &.{},
+            .end = 0,
+            .vtable = &.{ .drain = writeFn },
+        };
     }
 
-    fn writeFn(_: void, bytes: []const u8) Error!usize {
-        Imports.jsTerminalWriteBuffer(bytes.ptr, bytes.len);
-        return bytes.len;
+    fn writeFn(_: *Io.Writer, bytes: []const []const u8, _: usize) Io.Writer.Error!usize {
+        Imports.jsTerminalWriteBuffer(bytes[0].ptr, bytes[0].len);
+        return bytes[0].len;
     }
 };
 

src/main.zig

@@ -3,10 +3,10 @@ const std = @import("std");
 const tinylisp = @import("tinylisp.zig");
 
 pub fn main() anyerror!void {
-    const reader = std.io.getStdIn().reader().any();
-    const writer = std.io.getStdOut().writer().any();
+    var writer = std.fs.File.stdout().writer(&.{});
 
-    var lisp = tinylisp.Lisp{};
-    lisp.init(writer);
-    try lisp.repl(reader);
+    var lisp: tinylisp.Lisp = undefined;
+    var stack: [1024]f64 = undefined;
+    lisp.initPinned(&writer.interface, &stack);
+    try lisp.repl(std.fs.File.stdin());
 }