@pkmn/engine 0.1.0-dev.ce4c0b2a → 0.1.0-dev.d127cb34

package/src/lib/common/array.zig

@@ -3,19 +3,12 @@ const std = @import("std");
 const expectEqual = std.testing.expectEqual;
 const assert = std.debug.assert;
 
-const Int = if (@hasField(std.builtin.Type, "int")) .int else .Int;
-const Enum = if (@hasField(std.builtin.Type, "enum")) .@"enum" else .Enum;
-
 /// Helpers for working with bit-packed arrays of non-powers-of-2 types.
 /// NOTE: ziglang/zig#12547
 pub fn Array(comptime n: comptime_int, comptime U: type) type {
     return struct {
         const size = @bitSizeOf(U);
-        const options = .{ .signedness = .unsigned, .bits = size * n };
-        pub const T = @Type(if (@hasField(std.builtin.Type, "int"))
-            .{ .int = options }
-        else
-            .{ .Int = options });
+        pub const T = @Int(.unsigned, size * n);
 
         /// Returns the value stored at index `i` in the array `a`.
         pub fn get(a: T, i: usize) U {
@@ -24,8 +17,8 @@ pub fn Array(comptime n: comptime_int, comptime U: type) type {
             const mask: T = (1 << size) - 1;
             const result = (a >> @intCast(shift)) & mask;
             return switch (@typeInfo(U)) {
-                Enum => @enumFromInt(result),
-                Int => @intCast(result),
+                .@"enum" => @enumFromInt(result),
+                .int => @intCast(result),
                 else => unreachable,
             };
         }
@@ -34,8 +27,8 @@ pub fn Array(comptime n: comptime_int, comptime U: type) type {
         pub fn set(a: T, i: usize, val: U) T {
             assert(i < n);
             const v: T = switch (@typeInfo(U)) {
-                Enum => @intFromEnum(val),
-                Int => @intCast(val),
+                .@"enum" => @intFromEnum(val),
+                .int => @intCast(val),
                 else => unreachable,
             };
             const shift = i * size;

package/src/lib/common/debug.zig

@@ -1,22 +1,20 @@
+const builtin = @import("builtin");
 const std = @import("std");
 
 const debug = std.debug;
-const io = std.io;
-
-const Array = if (@hasField(std.builtin.Type, "array")) .array else .Array;
-const Optional = if (@hasField(std.builtin.Type, "optional")) .optional else .Optional;
-const Pointer = if (@hasField(std.builtin.Type, "pointer")) .pointer else .Pointer;
-const Struct = if (@hasField(std.builtin.Type, "struct")) .@"struct" else .Struct;
 
 pub fn print(value: anytype) void {
-    debug.lockStdErr();
-    defer debug.unlockStdErr();
-    const stderr = io.getStdErr().writer();
+    if (builtin.target.os.tag == .freestanding) return;
+
+    var buffer: [4096]u8 = undefined;
+    const stderr = debug.lockStderr(&buffer);
+    defer debug.unlockStderr();
+    var fw = stderr.file_writer;
 
     nosuspend {
-        stderr.writeAll("\x1b[41m") catch return;
+        fw.interface.writeAll("\x1b[41m") catch return;
         if (@TypeOf(@src()) == @TypeOf(value)) {
-            stderr.print("{s} ({s}:{d}:{d})", .{
+            fw.interface.print("{s} ({s}:{d}:{d})", .{
                 value.fn_name,
                 value.file,
                 value.line,
@@ -24,56 +22,69 @@ pub fn print(value: anytype) void {
             }) catch return;
         } else {
             switch (@typeInfo(@TypeOf(value))) {
-                Struct => |info| {
+                .@"struct" => |info| {
                     if (info.is_tuple) {
-                        inline for (info.fields, 0..) |f, i| {
-                            inspect(@field(value, f.name));
-                            if (i < info.fields.len - 1) stderr.writeAll(" ") catch return;
+                        if (@hasField(@TypeOf(info), "fields")) {
+                            inline for (info.fields, 0..) |f, i| {
+                                inspect(fw, @field(value, f.name));
+                                if (i < info.fields.len - 1) {
+                                    fw.interface.writeAll(" ") catch return;
+                                }
+                            }
+                        } else {
+                            inline for (info.field_names, 0..) |name, i| {
+                                inspect(fw, @field(value, name));
+                                if (i < info.field_names.len - 1) {
+                                    fw.interface.writeAll(" ") catch return;
+                                }
+                            }
                         }
                     } else {
-                        inspect(value);
+                        inspect(fw, value);
                     }
                 },
-                else => inspect(value),
+                else => inspect(fw, value),
             }
         }
-        stderr.writeAll("\x1b[K\x1b[0m\n") catch return;
+        fw.interface.writeAll("\x1b[K\x1b[0m\n") catch return;
     }
 }
 
-fn inspect(value: anytype) void {
-    const stderr = io.getStdErr().writer();
-
+fn inspect(w: anytype, value: anytype) void {
     nosuspend {
         const err = "Unable to format type '" ++ @typeName(@TypeOf(value)) ++ "'";
         switch (@typeInfo(@TypeOf(value))) {
-            Array => |info| {
-                if (info.child == u8) return stderr.print("{s}", .{value}) catch return;
+            .array => |info| {
+                if (info.child == u8) return w.interface.print("{s}", .{value}) catch return;
                 @compileError(err);
             },
-            Pointer => |ptr_info| switch (ptr_info.size) {
-                .One => switch (@typeInfo(ptr_info.child)) {
-                    .Array => |info| {
-                        if (info.child == u8) return stderr.print("{s}", .{value}) catch return;
+            .pointer => |ptr_info| switch (ptr_info.size) {
+                .one => switch (@typeInfo(ptr_info.child)) {
+                    .array => |info| {
+                        if (info.child == u8) {
+                            return w.interface.print("{s}", .{value}) catch return;
+                        }
                         @compileError(err);
                     },
-                    .Enum, .Union, .Struct => return inspect(value.*),
+                    .@"enum", .@"union", .@"struct" => return inspect(value.*),
                     else => @compileError(err),
                 },
-                .Many, .C => {
+                .many, .c => {
                     if (ptr_info.sentinel) |_| return inspect(std.mem.span(value));
                     if (ptr_info.child == u8) {
-                        return stderr.print("{s}", .{std.mem.span(value)}) catch return;
+                        return w.interface.print("{s}", .{std.mem.span(value)}) catch return;
                     }
                     @compileError(err);
                 },
-                .Slice => {
-                    if (ptr_info.child == u8) return stderr.print("{s}", .{value}) catch return;
+                .slice => {
+                    if (ptr_info.child == u8) {
+                        return w.interface.print("{s}", .{value}) catch return;
+                    }
                     @compileError(err);
                 },
             },
-            Optional => stderr.print("{?}", .{value}) catch return,
-            else => stderr.print("{}", .{value}) catch return,
+            .optional => w.interface.print("{?}", .{value}) catch return,
+            else => w.interface.print("{}", .{value}) catch return,
         }
     }
 }

package/src/lib/common/js.zig

@@ -1,14 +1,8 @@
 const std = @import("std");
+const c = @import("napi");
 
 const assert = std.debug.assert;
 
-const Int = if (@hasField(std.builtin.Type, "int")) .int else .Int;
-
-const c = @cImport({
-    @cDefine("NAPI_VERSION", "8");
-    @cInclude("node_api.h");
-});
-
 pub const Array = struct {
     pub fn init(env: c.napi_env, o: struct { length: ?usize }) c.napi_value {
         var result: c.napi_value = undefined;
@@ -37,7 +31,7 @@ pub const Number = struct {
         const T = @TypeOf(value);
         var result: c.napi_value = undefined;
         assert(c.napi_ok == switch (@typeInfo(T)) {
-            Int => |info| switch (info.bits) {
+            .int => |info| switch (info.bits) {
                 0...32 => switch (info.signedness) {
                     .signed => c.napi_create_int32(env, @as(i32, value), &result),
                     .unsigned => c.napi_create_uint32(env, @as(u32, value), &result),
@@ -52,7 +46,7 @@ pub const Number = struct {
 
     pub fn get(env: c.napi_env, value: c.napi_value, comptime T: type) T {
         switch (@typeInfo(T)) {
-            Int => |info| switch (info.bits) {
+            .int => |info| switch (info.bits) {
                 0...32 => switch (info.signedness) {
                     .signed => {
                         var result: i32 = undefined;

package/src/lib/common/optional.zig

@@ -3,38 +3,38 @@ const std = @import("std");
 const expect = std.testing.expect;
 const assert = std.debug.assert;
 
-const Bool = if (@hasField(std.builtin.Type, "bool")) .bool else .Bool;
-
-// TODO: ziglang/zig#104
+/// Optimized optional representation which stores the empty None value as a sentinel.
+/// NOTE: ziglang/zig#104
 pub fn Optional(comptime T: type) type {
-    const fields = std.meta.fields(switch (@typeInfo(T)) {
-        Bool => enum { false, true },
-        else => T,
-    });
+    const names = if (@hasDecl(std.meta, "fieldNames"))
+        std.meta.fieldNames(switch (@typeInfo(T)) {
+            .bool => enum { false, true },
+            else => T,
+        })
+    else blk: {
+        const fields = std.meta.fields(switch (@typeInfo(T)) {
+            .bool => enum { false, true },
+            else => T,
+        });
+        var ns: [fields.len][:0]const u8 = undefined;
+        inline for (fields, 0..) |f, i| ns[i] = f.name;
+        break :blk &ns;
+    };
 
-    var enumFields: [fields.len + 1]std.builtin.Type.EnumField = undefined;
-    var decls = [_]std.builtin.Type.Declaration{};
+    const TagType = std.math.IntFittingRange(0, names.len);
+    var fieldNames: [names.len + 1][]const u8 = undefined;
+    var fieldValues: [names.len + 1]TagType = undefined;
 
-    enumFields[0] = .{ .name = "None", .value = 0 };
+    fieldNames[0] = "None";
+    fieldValues[0] = 0;
 
-    inline for (fields, 1..) |field, i| {
-        assert(!std.mem.eql(u8, field.name, "None"));
-        enumFields[i] = .{
-            .name = field.name,
-            .value = i,
-        };
+    inline for (names, 1..) |name, i| {
+        assert(!std.mem.eql(u8, name, "None"));
+        fieldNames[i] = name;
+        fieldValues[i] = i;
     }
 
-    const options = .{
-        .tag_type = std.math.IntFittingRange(0, fields.len),
-        .fields = &enumFields,
-        .decls = &decls,
-        .is_exhaustive = true,
-    };
-    return @Type(if (@hasField(std.builtin.Type, "enum"))
-        .{ .@"enum" = options }
-    else
-        .{ .Enum = options });
+    return @Enum(TagType, .exhaustive, &fieldNames, &fieldValues);
 }
 
 test Optional {

package/src/lib/common/options.zig

@@ -7,6 +7,7 @@ pub const Options = struct {
     log: ?bool = null,
     chance: ?bool = null,
     calc: ?bool = null,
+    mod: ?bool = null,
     advance: ?bool = null,
     ebc: ?bool = null,
     key: ?bool = null,
@@ -24,6 +25,7 @@ pub const chance = get("chance", false);
 /// Whether or not damage calculator support is enabled.
 pub const calc = get("calc", false);
 
+pub const mod = showdown or get("mod", false);
 pub const advance = get("advance", true);
 pub const ebc = get("ebc", true);
 pub const key = get("key", false);