cpyte 4.3.0__tar.gz → 4.3.2__tar.gz

{cpyte-4.3.0/source/cpyte.egg-info → cpyte-4.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cpyte
-Version: 4.3.0
+Version: 4.3.2
 Summary: The Cpyte programming language compiler
 Author: Hoang Duy Tung
 License: MIT

{cpyte-4.3.0 → cpyte-4.3.2}/source/cpyte/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "4.3.0"
+__version__ = "4.3.2"
 
 # ---------------------------------------------------------------------------
 # Public library API.

{cpyte-4.3.0 → cpyte-4.3.2}/source/cpyte/bytecoding.py

@@ -2,7 +2,7 @@ import hashlib
 import hmac
 import os
 from traceback import print_exception
-from typing import Any, Optional, Protocol
+from typing import Any, Protocol
 
 from llvmlite import binding, ir
 from llvmlite.ir import instructions
@@ -253,9 +253,7 @@ class LLVM:
         t = _bc_array_norm(t)
         if t == "int":
             result = ir.IntType(32)
-        elif t == "int64":
-            result = ir.IntType(64)
-        elif t == "uint64":
+        elif t == "int64" or t == "uint64":
             result = ir.IntType(64)
         elif t == "size_t":
             # Pointer-sized unsigned integer (i64 on every 64-bit cpyte target,
@@ -273,11 +271,7 @@ class LLVM:
             result = ir.PointerType(ir.IntType(8))
         elif t == "char":
             result = ir.IntType(8)
-        elif t == "void*":
-            result = ir.PointerType(ir.IntType(8))
-        elif t == "big":
-            result = ir.PointerType(ir.IntType(8))
-        elif t == "ubig":
+        elif t == "void*" or t == "big" or t == "ubig":
             result = ir.PointerType(ir.IntType(8))
         elif t == "dynamic":
             # A runtime-typed value: (kind, data) tag pair. Mirrors DynValue.
@@ -288,10 +282,7 @@ class LLVM:
         elif t.endswith("[]"):
             base = self.llvm_type(t[:-2])
             result = ir.PointerType(base)
-        elif t.endswith("*"):
-            base = self.llvm_type(t[:-1])
-            result = ir.PointerType(base)
-        elif t.endswith("&"):
+        elif t.endswith("*") or t.endswith("&"):
             base = self.llvm_type(t[:-1])
             result = ir.PointerType(base)
         elif t in self.structs:
@@ -1656,7 +1647,7 @@ class LLVM:
             for table in (self.locals, self.local_types, self.ssa_values):
                 table.pop(name, None)
             self.const_vars.pop(name, None)
-            return None
+            return
         if kind == "dynamic":
             name = target.name
             if name in self.locals and getattr(
@@ -1679,15 +1670,15 @@ class LLVM:
                             ir.Constant(_i64, 0),
                         ],
                     )
-            return None
+            return
         if kind == "heap":
             self._emit_builtin_free(target)
-            return None
+            return
         if kind == "slot":
             slot = self._emit_lvalue(target)
             if isinstance(slot.type, ir.PointerType) and slot.type.pointee is not None:
                 self.builder.store(ir.Constant(slot.type.pointee, None), slot)
-            return None
+            return
         raise Exception(
             f"unhandled del_kind {kind!r} at L{node._token.line}:{node._token.column}"
         )
@@ -6409,7 +6400,7 @@ class LLVM:
         slot = self._emit_lvalue(target)
         cur = self.builder.load(slot, "append.cur")
 
-        elem_t = arr_t[:-2] if arr_t.endswith("[]") else arr_t
+        elem_t = arr_t.removesuffix("[]")
         if arr_t == "dynamic":
             # Element slot holds a DynValue; its i64 data is the inner list ptr.
             elem_llvm = _DynValue
@@ -6778,7 +6769,7 @@ class LLVM:
     def _is_const_var(self, name: str) -> bool:
         return name in self._const_prop
 
-    def _const_var_value(self, name: str) -> Optional[int]:
+    def _const_var_value(self, name: str) -> int | None:
         return self._const_prop.get(name)
 
     def _try_unroll_counted_loop(self, node: While, pending_ivs: dict) -> bool:

{cpyte-4.3.0 → cpyte-4.3.2}/source/cpyte/compiling.py

@@ -1806,8 +1806,33 @@ def _find_scorpion_tool(name, fallback):
     return fallback
 
 
+def _scorpion_tool(name):
+    """Locate a bundled Scorpion converter script (elf2sef.py / mksef.py).
+
+    Prefers the copy shipped inside the cpyte package so the installed wheel
+    works standalone; falls back to the WEW-scorpion sibling checkout for
+    source-tree development.
+    """
+    bundled = os.path.join(os.path.dirname(__file__), name)
+    if os.path.isfile(bundled):
+        return bundled
+    sibling = os.path.join(
+        os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(_RUNTIME_SCORPION_C)))),
+        "WEW-scorpion",
+        "tools" if name == "elf2sef.py" else "user",
+        name,
+    )
+    return sibling
+
+
 def run_scorpion(
-    module, output="program.sef", opt_level=3, src_files=None, pic=False, exports=None
+    module,
+    output="program.sef",
+    opt_level=3,
+    src_files=None,
+    pic=False,
+    exports=None,
+    auto_exports=None,
 ):
     """Compile a Cpyte module for Scorpion (RV32 bare-metal) producing a SEF file.
     Please use it good! :):)
@@ -1815,7 +1840,11 @@ def run_scorpion(
     With pic=True the module is compiled with -fPIC and the final ELF is linked
     with --emit-relocs so it can be converted to a dynamic (SEF v2) image via
     WEW-scorpion/tools/elf2sef.py. `exports` names the symbols to mark as
-    exported for dynamic linking (libraries).
+    exported for dynamic linking (libraries). `auto_exports` are additional
+    candidates discovered automatically (top-level `public` functions); only
+    those that actually resolve to a defined symbol in the emitted module are
+    added (elf2sef refuses unknown names). Returns (elf_file, [final exports])
+    so callers can report exactly what was published.
     """
     from llvmlite import binding
 
@@ -1829,6 +1858,18 @@ def run_scorpion(
     optimize(mod, opt_level)
     mod.verify()
 
+    defined = {
+        f.name for f in mod.functions if not getattr(f, "is_declaration", True)
+    }
+    final_exports = list(exports or [])
+    seen = set(final_exports)
+    if auto_exports:
+        for name in auto_exports:
+            if name in seen or name not in defined:
+                continue
+            seen.add(name)
+            final_exports.append(name)
+
     target = binding.Target.from_triple("riscv32-unknown-elf")
     if pic:
         target_machine = target.create_target_machine(reloc="pic")
@@ -1895,17 +1936,10 @@ def run_scorpion(
 
     if pic:
         # Dynamic SEF v2: relocation + import/export records
-        elf2sef = os.path.join(
-            os.path.dirname(os.path.dirname(_RUNTIME_SCORPION_C)),
-            "..",
-            "..",
-            "WEW-scorpion",
-            "tools",
-            "elf2sef.py",
-        )
+        elf2sef = _scorpion_tool("elf2sef.py")
         cmd = [sys.executable, elf2sef, elf_file, output]
-        if exports:
-            for name in exports:
+        if final_exports:
+            for name in final_exports:
                 cmd += ["--export", name]
         r = subprocess.run(cmd, capture_output=True, text=True)
         if r.returncode != 0:
@@ -1913,14 +1947,7 @@ def run_scorpion(
             raise SystemExit(1)
     else:
         # Static SEF v1 via mksef.py
-        mksef = os.path.join(
-            os.path.dirname(os.path.dirname(_RUNTIME_SCORPION_C)),
-            "..",
-            "..",
-            "WEW-scorpion",
-            "user",
-            "mksef.py",
-        )
+        mksef = _scorpion_tool("mksef.py")
         if not os.path.isfile(mksef):
             # Fallback: inline SEF generation using objdump/objcopy
             _elf_to_sef(elf_file, output, 0)
@@ -1935,7 +1962,7 @@ def run_scorpion(
                 raise SystemExit(1)
 
     print_ok(f"Wrote {os.path.getsize(output)} bytes to {output}")
-    return elf_file
+    return elf_file, final_exports
 
 
 def _elf_to_sef(elf_path, sef_output, flags=0):