zig-zon 0.0.3__tar.gz → 0.0.4__tar.gz

{zig_zon-0.0.3 → zig_zon-0.0.4}/CPython.zig

@@ -7,34 +7,49 @@ const mem = std.mem;
 pub const CPython = @This();
 
 exe: Build.LazyPath,
+version: ?[]const u8 = null,
 
 /// adds a `python` option to the build. if not provided, tries to find `python` in PATH
-pub fn findAddOption(b: *Build) @This() {
-    return .{
-        .exe = b.option(
-            Build.LazyPath,
-            "python",
-            "path to the cpython interpreter executable",
-        ) orelse {
-            return find(b);
-        },
-    };
+pub fn findAddOption(b: *Build) *CPython {
+    if (b.option(
+        Build.LazyPath,
+        "python",
+        "path to the cpython interpreter executable",
+    )) |opt| {
+        const self = b.allocator.create(CPython) catch @panic("OOM");
+        self.* = .{
+            .exe = opt,
+        };
+        return self;
+    } else return find(b);
 }
 
-pub fn find(b: *Build) @This() {
-    return .{
+pub fn find(b: *Build) *CPython {
+    const self = b.allocator.create(CPython) catch @panic("OOM");
+    const exe_path = FindExeWindowsCompat.findProgram(b, &.{
+        "python",
+        "python3",
+    }, &.{}) catch {
+        const err_wf = b.addWriteFiles();
+        const err_step = b.addFail("finding python failed. please provide a path to the exe using -Dpython=");
+        err_wf.step.dependOn(&err_step.step);
+        self.* = .{ .exe = err_wf.getDirectory() };
+        return self;
+    };
+    self.* = .{
         .exe = .{
-            .cwd_relative = FindExeWindowsCompat.findProgram(b, &.{
-                "python",
-                "python3",
-            }, &.{}) catch {
-                const err_wf = b.addWriteFiles();
-                const err_step = b.addFail("finding python failed. please provide a path to the exe using -Dpython=");
-                err_wf.step.dependOn(&err_step.step);
-                return .{ .exe = err_wf.getDirectory() };
-            },
+            .cwd_relative = exe_path,
         },
     };
+    return self;
+}
+
+pub fn addVersionOption(self: *CPython, b: *Build, fallback: []const u8) void {
+    self.version = b.option(
+        []const u8,
+        "version",
+        "set a version string",
+    ) orelse fallback;
 }
 
 pub const LinkOptions = struct {
@@ -46,7 +61,7 @@ pub const LinkOptions = struct {
     };
 };
 
-pub fn generateIncludeDir(self: @This(), b: *Build) Build.LazyPath {
+pub fn generateIncludeDir(self: CPython, b: *Build) Build.LazyPath {
     const extract_link_info = Build.Step.Run.create(b, "python header extraction run");
     extract_link_info.addFileArg(self.exe);
     extract_link_info.addFileArg(b.path("src/extract_link_info.py"));
@@ -59,7 +74,7 @@ pub fn installExtLib(b: *Build, lib: *Build.Step.Compile) void {
     b.getInstallStep().dependOn(&lib_install.step);
 }
 
-pub fn link(self: @This(), b: *Build, opt: LinkOptions) void {
+pub fn link(self: CPython, b: *Build, opt: LinkOptions) void {
     const target = Build.ResolvedTarget{
         .query = .{},
         .result = opt.lib.rootModuleTarget(),
@@ -73,19 +88,32 @@ pub fn link(self: @This(), b: *Build, opt: LinkOptions) void {
         .target = target,
         .link_libc = true,
     });
+    cpython.addIncludePath(python_inc);
+
+    const wf = b.addWriteFiles();
+    const pymod_lp = wf.add("python.zig",
+        \\pub const c = @import("c");
+        \\pub const version = @embedFile("version.txt");
+    );
+    const pymod = b.createModule(.{ .root_source_file = pymod_lp });
+    pymod.addImport("c", cpython.createModule());
+
+    _ = wf.add(
+        "version.txt",
+        if (self.version) |version| version else "",
+    );
+
     for (opt.macros) |macro| {
         cpython.defineCMacro(macro[0], macro[1]);
     }
 
-    cpython.addIncludePath(python_inc);
-
     if (target.result.os.tag == .windows) {
         opt.lib.root_module.addLibraryPath(python_inc);
         opt.lib.linkSystemLibrary("python");
     }
     opt.lib.root_module.addImport(
         "cpython",
-        cpython.createModule(),
+        pymod,
     );
 }
 
@@ -98,7 +126,7 @@ pub fn lib_ext_name(b: *Build, lib: *Build.Step.Compile) []const u8 {
 }
 
 pub fn run_test(
-    self: @This(),
+    self: CPython,
     b: *Build,
     lib: *Build.Step.Compile,
     test_py_file: Build.LazyPath,
@@ -112,7 +140,7 @@ pub fn run_test(
         }),
     });
     const run_step = b.addRunArtifact(runner);
-    const python_ext = writeExtFile(b, lib);
+    const python_ext = writeExtensionFile(b, lib);
     run_step.addFileArg(self.exe);
     run_step.addDirectoryArg(python_ext.dirname());
     run_step.addFileArg(test_py_file);
@@ -120,7 +148,7 @@ pub fn run_test(
     return run_step;
 }
 
-pub fn writeExtFile(b: *Build, lib: *Build.Step.Compile) Build.LazyPath {
+pub fn writeExtensionFile(b: *Build, lib: *Build.Step.Compile) Build.LazyPath {
     const ext_lib_name = lib_ext_name(b, lib);
     const wf = b.addWriteFiles();
     return wf.addCopyFile(lib.getEmittedBin(), ext_lib_name);

zig_zon-0.0.4/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (Expat)
+
+Copyright (c) Zig contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

zig_zon-0.0.4/PKG-INFO

@@ -0,0 +1,53 @@
+Metadata-Version: 2.4
+Name: zig-zon
+Version: 0.0.4
+Summary: a native cpython extension to parse zig object notation strings
+Author-email: Tobias Simetsreiter <dasimmet@gmail.com>
+Maintainer-email: Tobias Simetsreiter <dasimmet@gmail.com>
+License-Expression: MIT
+Project-URL: Homepage, https://gitlab.com/dasimmet/python-zig-zon
+Project-URL: Issues, https://gitlab.com/dasimmet/python-zig-zon/-/issues
+Keywords: zig,ziglang,zon,cpython
+Classifier: Development Status :: 4 - Beta
+Classifier: Programming Language :: Python
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+
+# Python Zig Zon Parser
+
+A native python extension built with zig to parse zig-object-notation strings
+into python objects.
+
+On PyPi it is only distributed in source, and built during install.
+It therefore needs to download the `ziglang` python package.
+
+# Usage
+
+install:
+
+```bash
+python3 -m pip install zig-zon
+```
+
+running:
+
+```python
+import zig_zon
+parsed = zig_zon.parse('.{.allyourcode = .are_belong_to_us, .asd = 123}')
+print(parsed)
+```
+
+or, look at the [test](https://gitlab.com/dasimmet/python-zig-zon/-/blob/main/src/test_zig_zon.py)
+
+# Developing
+
+as opposed to other solutions, i want to develop using:
+
+```
+zig build test
+```
+
+so this command runs a python script that imports and uses the module
+using the system `python` interpreter found in `PATH`. When the module is built using `pip`,
+zig will get a `-Dpython=` option pointing to the right executable,
+as well as a `-Dversion=` option for the pip package version.

zig_zon-0.0.4/README.md

@@ -0,0 +1,38 @@
+# Python Zig Zon Parser
+
+A native python extension built with zig to parse zig-object-notation strings
+into python objects.
+
+On PyPi it is only distributed in source, and built during install.
+It therefore needs to download the `ziglang` python package.
+
+# Usage
+
+install:
+
+```bash
+python3 -m pip install zig-zon
+```
+
+running:
+
+```python
+import zig_zon
+parsed = zig_zon.parse('.{.allyourcode = .are_belong_to_us, .asd = 123}')
+print(parsed)
+```
+
+or, look at the [test](https://gitlab.com/dasimmet/python-zig-zon/-/blob/main/src/test_zig_zon.py)
+
+# Developing
+
+as opposed to other solutions, i want to develop using:
+
+```
+zig build test
+```
+
+so this command runs a python script that imports and uses the module
+using the system `python` interpreter found in `PATH`. When the module is built using `pip`,
+zig will get a `-Dpython=` option pointing to the right executable,
+as well as a `-Dversion=` option for the pip package version.

{zig_zon-0.0.3 → zig_zon-0.0.4}/build.zig

@@ -7,16 +7,7 @@ pub fn build(b: *Build) void {
     const target = b.standardTargetOptions(.{});
     const optimize = b.standardOptimizeOption(.{});
     const python = CPython.findAddOption(b);
-
-    const exe = b.addExecutable(.{
-        .name = "zigwheeler",
-        .root_module = b.addModule("zigwheeler", .{
-            .root_source_file = b.path("src/zigwheeler.zig"),
-            .target = target,
-            .optimize = optimize,
-        }),
-    });
-    b.installArtifact(exe);
+    python.addVersionOption(b, @import("build.zig.zon").version);
 
     const lib = b.addLibrary(.{
         .name = "zig_zon",
@@ -35,14 +26,9 @@ pub fn build(b: *Build) void {
     });
 
     const install_test = b.addInstallFile(b.path("src/test_zig_zon.py"), "lib/test_zig_zon.py");
-    b.default_step.dependOn(&install_test.step);
-    const run = b.addRunArtifact(exe);
-    if (b.args) |args| {
-        run.addArgs(args);
-    }
-    b.step("run", "run the wheeler").dependOn(&run.step);
+    b.step("install-test", "install the python test script alongside the built modules").dependOn(&install_test.step);
 
-    const test_run = python.run_test(b, lib, b.path("src/test_zig_zon.py"));
+    const run_test = python.run_test(b, lib, b.path("src/test_zig_zon.py"));
 
-    b.step("test", "run the python test script").dependOn(&test_run.step);
+    b.step("test", "run the python test script").dependOn(&run_test.step);
 }

{zig_zon-0.0.3 → zig_zon-0.0.4}/build.zig.zon

@@ -1,7 +1,7 @@
 .{
     .name = .python_zig_zon,
     .fingerprint = 0x3d332656a3644fc9,
-    .version = "0.0.3",
+    .version = "0.0.4",
     .minimum_zig_version = "0.15.1",
     .dependencies = .{},
     .paths = .{

zig_zon-0.0.4/pyproject.toml

@@ -0,0 +1,25 @@
+[project]
+name = "zig-zon"
+authors = [{ name = "Tobias Simetsreiter", email = "dasimmet@gmail.com" }]
+maintainers = [{ name = "Tobias Simetsreiter", email = "dasimmet@gmail.com" }]
+description = "a native cpython extension to parse zig object notation strings"
+readme = "README.md"
+requires-python = ">=3.8"
+dynamic = ["version"]
+license = "MIT"
+license-files = ["LICEN[CS]E.*"]
+keywords = ["zig", "ziglang", "zon", "cpython"]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Programming Language :: Python",
+]
+
+[project.urls]
+Homepage = "https://gitlab.com/dasimmet/python-zig-zon"
+Issues = "https://gitlab.com/dasimmet/python-zig-zon/-/issues"
+
+[build-system]
+requires = ["setuptools", "setuptools-scm", "ziglang==0.15.1"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools_scm]

{zig_zon-0.0.3 → zig_zon-0.0.4}/setup.py

@@ -6,23 +6,22 @@ import os
 # In this package the setuptools_zig_build cannot be imported as a dependency.
 # on another package zig_build should be passed to setup()
 sys.path.insert(0, os.path.normpath(os.path.join(__file__, '..')))  # nopep8
-from setuptools_zig_build import ZigBuildExtension  # nopep8
+from setuptools_zig_build import ZigBuildExtension, ZigBuild  # nopep8
 
-zig_build = {
-    "use_zig_python_package": True,
-    "optimize": "ReleaseSmall",
+zig_build = ZigBuild(**{
+    "use_ziglang_python_package": True,
+    "optimize": "ReleaseSmall",  # passes -Doptimize= to zig build
+    "pass_version_option": True,  # passes -Dversion=<pip package version> to zig build
     'test_step': 'test',  # this is failing on windows for now ;-/
-    'extra_args': [],
-}
+    'extra_args': [],  # extra arguments to zig build
+})
 
 setup(
     name='zig-zon',
+    packages=[],
     cmdclass={
         'build_ext': ZigBuildExtension(zig_build),
     },
     ext_modules=[Extension('zig_zon', [])],
-    setup_requires=[
-        "setuptools-scm",
-        "ziglang==0.15.1",
-    ],
+    setup_requires=[],
 )

{zig_zon-0.0.3 → zig_zon-0.0.4}/setuptools_zig_build.py

@@ -14,10 +14,43 @@ from setuptools.command.build_ext import build_ext as SetupToolsBuildExt
 class ZigCompilerError(Exception):
     """Some compile/link operation failed."""
 
+class ZigBuild:
+    '''the type of the custom "zig_build" argument to setup.py'''
+    OPTIMIZE = [
+        "Debug",
+        "ReleaseSafe",
+        "ReleaseFast",
+        "ReleaseSmall",
+    ]
+    def __init__(self,
+        use_ziglang_python_package: bool = False,
+        optimize: str = "ReleaseSafe",
+        pass_version_option: bool = False,
+        test_step: str =  None,
+        extra_args: list = [],
+        ):
+        assert isinstance(use_ziglang_python_package, bool)
+        self.use_ziglang_python_package = use_ziglang_python_package
+        assert test_step == None or (isinstance(test_step, str) and not test_step.startswith('-'))
+        self.test_step = test_step
+        assert optimize == None or (isinstance(optimize, str) and optimize in self.OPTIMIZE)
+        self.optimize = optimize
+        assert isinstance(pass_version_option, bool)
+        self.pass_version_option = pass_version_option
+        assert isinstance(extra_args, list)
+        for arg in extra_args:
+            assert isinstance(arg, str)
+        self.extra_args = extra_args
 
 class BuildExt(SetupToolsBuildExt):
     def __init__(self, dist, zig_value):
-        self._zig_value = zig_value
+        if isinstance(zig_value, dict):
+            self._zig_value = ZigBuild(**zig_value)
+        elif isinstance(zig_value, ZigBuild):
+            self._zig_value = zig_value
+        else:
+            raise ZigCompilerError('unknown type:', zig_value)
+
         super().__init__(dist)
 
     def build_extension(self, ext):
@@ -38,34 +71,27 @@ class BuildExt(SetupToolsBuildExt):
 
         zig_out = Path(self.build_temp) / "zig-out"
 
-        bld_cmd = [os.environ.get('PY_ZIG', 'zig'), 'build', 'install',
-                   '-Dpython={}'.format(sys.executable), '--prefix', str(zig_out.absolute())]
-
-        if isinstance(self._zig_value, dict):
-            if 'use_zig_python_package' in self._zig_value and self._zig_value['use_zig_python_package'] == True:
-                import ziglang
-                bld_cmd[0] = os.path.join(
-                    os.path.dirname(ziglang.__file__), "zig")
-
-            if 'test_step' in self._zig_value:
-                bld_cmd.append(self._zig_value['test_step'])
-
-            if 'optimize' in self._zig_value:
-                assert isinstance(self._zig_value['optimize'], str)
-                assert self._zig_value['optimize'] in [
-                    "Debug",
-                    "ReleaseSafe",
-                    "ReleaseFast",
-                    "ReleaseSmall",
-                ]
-                bld_cmd.append(
-                    '-Doptimize={}'.format(self._zig_value['optimize']))
-
-            if 'extra_args' in self._zig_value:
-                assert isinstance(self._zig_value['extra_args'], list)
-                for arg in self._zig_value['extra_args']:
-                    assert isinstance(arg, str)
-                    bld_cmd.append(arg)
+        zig_exe = os.environ.get('PY_ZIG', 'zig')
+        if self._zig_value.use_ziglang_python_package == True:
+            import ziglang
+            zig_exe = os.path.join(
+                os.path.dirname(ziglang.__file__), "zig")
+
+        bld_cmd = [zig_exe, 'build', 'install',
+                '-Dpython={}'.format(sys.executable), '--prefix', str(zig_out.absolute())]
+
+        if self._zig_value.test_step != None:
+            bld_cmd.append(self._zig_value.test_step)
+
+        if self._zig_value.optimize != None:
+            bld_cmd.append(
+                '-Doptimize={}'.format(self._zig_value.optimize))
+
+        if self._zig_value.pass_version_option == True:
+            bld_cmd.append(
+                '-Dversion={}'.format(self.distribution.get_version()))
+
+        bld_cmd.extend(self._zig_value.extra_args)
 
         os.makedirs(self.build_temp, exist_ok=True)
         print('\ncmd', shlex.join(bld_cmd))
@@ -102,6 +128,7 @@ class ZigBuildExtension:
 
 
 def setup_build_zig(dist, keyword, value):
+    '''our hook into setuptools '''
     assert isinstance(dist, Distribution)
     assert keyword == 'build_zig'
     be = dist.cmdclass.get('build_ext')

{zig_zon-0.0.3 → zig_zon-0.0.4}/src/extract_link_info.py

@@ -11,10 +11,6 @@ syspath = sysconfig.get_paths()
 lib_filename = 'python{}{}.lib'.format(
     sys.version_info.major, sys.version_info.minor)
 
-print("syspath:", syspath, file=sys.stderr)
-print("include:", syspath['include'], file=sys.stderr)
-print("data:", syspath['data'], file=sys.stderr)
-
 os.makedirs(output_dir, exist_ok=True)
 shutil.copytree(syspath['include'], output_dir, dirs_exist_ok=True)
 
@@ -46,9 +42,12 @@ for k, v in sysconfig.get_config_vars().items():
         lib_paths += vfl
 
 if sys.platform == 'windows' and not found_lib:
-    print("Did not find", lib_filename, "in:")
-    print(lib_paths)
+    print("Warning: Did not find", lib_filename, "in:", file=sys.stderr)
+    print(lib_paths, file=sys.stderr)
 
+python_h = os.path.join(output_dir, 'Python.h')
+if not os.path.isfile(python_h):
+    raise Exception("Python.h missing! syspath include: {}\n output: {}".format(syspath['include'], output_dir))
 
 with open(os.path.join(output_dir, 'Zig_Python_With_Hexver.h'), 'w') as fd:
     fd.write('''

{zig_zon-0.0.3 → zig_zon-0.0.4}/src/test_zig_zon.py

@@ -26,6 +26,13 @@ assert testzon['my_hex_int'] == 0xdeadbeef
 assert testzon['my_negative_int'] == -432_123_111
 assert testzon['my_negative_big_int'] == -4611686018427387904
 assert testzon['my_optional'] == None
+assert zig_zon.parse(str(2**63 - 1)) == 2**63 - 1
+assert zig_zon.parse(str(2**63)) == 2**63
+assert zig_zon.parse(str(2**64 - 1)) == 2**64 - 1
+
+# print("TODO: 2**64 ==", 2**64, ", zig_zon.parse(str(2**64)) ==",
+#       zig_zon.parse(str(2**64)))
+# assert zig_zon.parse(str(2**64)) == str(2**64)
 
 print('build.zig.zon:')
 with open('build.zig.zon') as fd:

{zig_zon-0.0.3 → zig_zon-0.0.4}/src/zig_zon.zig

@@ -4,7 +4,8 @@ const Allocator = std.mem.Allocator;
 const assert = std.debug.assert;
 const ZonGen = std.zig.ZonGen;
 
-const c = @import("cpython");
+const python = @import("cpython");
+const c = python.c;
 const PyObject = c.PyObject;
 
 const PyModuleDef_Base = extern struct {
@@ -15,13 +16,6 @@ const PyModuleDef_Base = extern struct {
     m_copy: [*c]PyObject = null,
 };
 
-const PyModuleDef_HEAD_INIT = PyModuleDef_Base{ .ob_base = PyObject{
-    .unnamed_0 = .{
-        .ob_refcnt = 1,
-    },
-    .ob_type = null,
-} };
-
 pub var methods = [_]c.PyMethodDef{
     c.PyMethodDef{
         .ml_name = "parse",
@@ -38,7 +32,36 @@ pub var zigmodule = c.PyModuleDef{
 };
 
 pub export fn PyInit_zig_zon() [*c]c.PyObject {
-    return c.PyModule_Create(&zigmodule);
+    const mod = c.PyModule_Create(&zigmodule);
+    const semver = std.SemanticVersion.parse(python.version) catch unreachable;
+    const version = c.PyDict_New();
+
+    _ = c.PyDict_SetItemString(version, "major", c.Py_BuildValue("n", semver.major));
+    _ = c.PyDict_SetItemString(version, "minor", c.Py_BuildValue("n", semver.minor));
+    _ = c.PyDict_SetItemString(version, "patch", c.Py_BuildValue("n", semver.patch));
+    if (semver.pre) |pre| {
+        _ = c.PyDict_SetItemString(version, "pre", c.Py_BuildValue("s#", pre.ptr, pre.len));
+    } else {
+        _ = c.PyDict_SetItemString(version, "pre", PyNone());
+    }
+    if (semver.build) |build| {
+        _ = c.PyDict_SetItemString(version, "build", c.Py_BuildValue("s#", build.ptr, build.len));
+    } else {
+        _ = c.PyDict_SetItemString(version, "build", PyNone());
+    }
+    _ = c.PyObject_SetAttrString(
+        mod,
+        "__version__",
+        version,
+    );
+
+    const version_str = c.Py_BuildValue("s#", python.version.ptr, python.version.len);
+    _ = c.PyObject_SetAttrString(
+        mod,
+        "__version_str__",
+        version_str,
+    );
+    return mod;
 }
 
 pub fn parse(self: [*]PyObject, args: [*]PyObject) callconv(.c) [*c]PyObject {
@@ -89,6 +112,10 @@ pub fn parse(self: [*]PyObject, args: [*]PyObject) callconv(.c) [*c]PyObject {
     };
 }
 
+inline fn PyNone() [*c]c.PyObject {
+    return c.Py_BuildValue("");
+}
+
 const ZonError = error{
     StructExpected,
     StructIdentifierExpected,
@@ -143,13 +170,13 @@ fn parseZon(arena: Allocator, tree: Ast, node: Ast.Node.Index) ZonError!*c.PyObj
             } else if (std.mem.eql(u8, token_slice, "false")) {
                 return c.PyBool_FromLong(@as(c_long, 0));
             } else if (std.mem.eql(u8, token_slice, "null")) {
-                return c.Py_BuildValue(""); // c.Py_None()
+                return PyNone();
             } else {
                 if (@errorReturnTrace()) |et| {
                     std.debug.dumpStackTrace(et.*);
                     std.debug.dumpCurrentStackTrace(null);
                 }
-                std.log.err("not implemented: {any} '{s}'", .{ node_tag, token_slice });
+                std.log.err("identifier not implemented: {any} '{s}'", .{ node_tag, token_slice });
                 return error.NotImplemented;
             }
         },
@@ -159,7 +186,7 @@ fn parseZon(arena: Allocator, tree: Ast, node: Ast.Node.Index) ZonError!*c.PyObj
                 std.debug.dumpCurrentStackTrace(null);
             }
             const token_slice = tree.tokenSlice(tree.firstToken(node));
-            std.log.err("not implemented: {any} '{s}'", .{ node_tag, token_slice });
+            std.log.err("zon ast token not implemented: {any} '{s}'", .{ node_tag, token_slice });
             return error.NotImplemented;
         },
     }
@@ -180,7 +207,13 @@ fn parseNumberLiteral(arena: Allocator, tree: Ast, node: Ast.Node.Index, negated
     switch (parsed) {
         .int => |n| {
             const factor: i64 = if (negated) -1 else 1;
-            return c.Py_BuildValue("n", factor * @as(i64, @bitCast(n)));
+            const neglim = 9223372036854775807; // 2**63 - 1
+            if (n <= neglim) {
+                return c.PyLong_FromSsize_t(factor * @as(i64, @intCast(n)));
+            } else {
+                if (factor == -1) return error.BigIntNotImplemented;
+                return c.PyLong_FromSize_t(n);
+            }
         },
         .big_int => return error.BigIntNotImplemented,
         .float => |n| {

zig_zon-0.0.4/zig_zon.egg-info/PKG-INFO

@@ -0,0 +1,53 @@
+Metadata-Version: 2.4
+Name: zig-zon
+Version: 0.0.4
+Summary: a native cpython extension to parse zig object notation strings
+Author-email: Tobias Simetsreiter <dasimmet@gmail.com>
+Maintainer-email: Tobias Simetsreiter <dasimmet@gmail.com>
+License-Expression: MIT
+Project-URL: Homepage, https://gitlab.com/dasimmet/python-zig-zon
+Project-URL: Issues, https://gitlab.com/dasimmet/python-zig-zon/-/issues
+Keywords: zig,ziglang,zon,cpython
+Classifier: Development Status :: 4 - Beta
+Classifier: Programming Language :: Python
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+
+# Python Zig Zon Parser
+
+A native python extension built with zig to parse zig-object-notation strings
+into python objects.
+
+On PyPi it is only distributed in source, and built during install.
+It therefore needs to download the `ziglang` python package.
+
+# Usage
+
+install:
+
+```bash
+python3 -m pip install zig-zon
+```
+
+running:
+
+```python
+import zig_zon
+parsed = zig_zon.parse('.{.allyourcode = .are_belong_to_us, .asd = 123}')
+print(parsed)
+```
+
+or, look at the [test](https://gitlab.com/dasimmet/python-zig-zon/-/blob/main/src/test_zig_zon.py)
+
+# Developing
+
+as opposed to other solutions, i want to develop using:
+
+```
+zig build test
+```
+
+so this command runs a python script that imports and uses the module
+using the system `python` interpreter found in `PATH`. When the module is built using `pip`,
+zig will get a `-Dpython=` option pointing to the right executable,
+as well as a `-Dversion=` option for the pip package version.

{zig_zon-0.0.3/src → zig_zon-0.0.4}/zig_zon.egg-info/SOURCES.txt

@@ -1,4 +1,5 @@
 CPython.zig
+LICENSE
 MANIFEST.in
 README.md
 build.zig
@@ -11,7 +12,7 @@ src/python-runner.zig
 src/test_zig_zon.py
 src/zig_zon.zig
 src/zigwheeler.zig
-src/zig_zon.egg-info/PKG-INFO
-src/zig_zon.egg-info/SOURCES.txt
-src/zig_zon.egg-info/dependency_links.txt
-src/zig_zon.egg-info/top_level.txt
+zig_zon.egg-info/PKG-INFO
+zig_zon.egg-info/SOURCES.txt
+zig_zon.egg-info/dependency_links.txt
+zig_zon.egg-info/top_level.txt

zig_zon-0.0.4/zig_zon.egg-info/top_level.txt

@@ -0,0 +1 @@
+zig_zon

zig_zon-0.0.3/PKG-INFO

@@ -1,30 +0,0 @@
-Metadata-Version: 2.4
-Name: zig-zon
-Version: 0.0.3
-Summary: My package description
-Author-email: Tobias Simetsreiter <dasimmet@gmail.com>
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-
-# Python Zig Zon Parser
-
-A native python extension built with zig to parse zig-object-notation strings
-into python objects.
-
-# Usage (so far only linux)
-
-install:
-
-```bash
-python3 -m pip install git+https://gitlab.com/dasimmet/python-zig-zon.git
-```
-
-running:
-
-```python
-import zig_zon
-parsed = zig_zon.parse('.{.allyourcode = .are_belong_to_us, .asd = 123}')
-print(parsed)
-```
-
-or, look at the [test](test.py)

zig_zon-0.0.3/README.md

@@ -1,22 +0,0 @@
-# Python Zig Zon Parser
-
-A native python extension built with zig to parse zig-object-notation strings
-into python objects.
-
-# Usage (so far only linux)
-
-install:
-
-```bash
-python3 -m pip install git+https://gitlab.com/dasimmet/python-zig-zon.git
-```
-
-running:
-
-```python
-import zig_zon
-parsed = zig_zon.parse('.{.allyourcode = .are_belong_to_us, .asd = 123}')
-print(parsed)
-```
-
-or, look at the [test](test.py)

zig_zon-0.0.3/pyproject.toml

@@ -1,13 +0,0 @@
-[project]
-name = "zig-zon"
-authors = [{ name = "Tobias Simetsreiter", email = "dasimmet@gmail.com" }]
-description = "My package description"
-readme = "README.md"
-requires-python = ">=3.8"
-dynamic = ["version"]
-
-[build-system]
-requires = ["setuptools"]
-build-backend = "setuptools.build_meta"
-
-[tool.setuptools_scm]

zig_zon-0.0.3/src/zig_zon.egg-info/PKG-INFO

@@ -1,30 +0,0 @@
-Metadata-Version: 2.4
-Name: zig-zon
-Version: 0.0.3
-Summary: My package description
-Author-email: Tobias Simetsreiter <dasimmet@gmail.com>
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-
-# Python Zig Zon Parser
-
-A native python extension built with zig to parse zig-object-notation strings
-into python objects.
-
-# Usage (so far only linux)
-
-install:
-
-```bash
-python3 -m pip install git+https://gitlab.com/dasimmet/python-zig-zon.git
-```
-
-running:
-
-```python
-import zig_zon
-parsed = zig_zon.parse('.{.allyourcode = .are_belong_to_us, .asd = 123}')
-print(parsed)
-```
-
-or, look at the [test](test.py)

zig_zon-0.0.3/src/zig_zon.egg-info/top_level.txt

@@ -1,3 +0,0 @@
-extract_link_info
-test_zig_zon
-zig_zon