sonolus.py 0.10.8__tar.gz → 0.11.0__tar.gz

{sonolus_py-0.10.8 → sonolus_py-0.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sonolus.py
-Version: 0.10.8
+Version: 0.11.0
 Summary: Sonolus engine development in Python
 Project-URL: Documentation, https://sonolus.py.qwewqa.xyz/
 Project-URL: Repository, https://github.com/qwewqa/sonolus.py

{sonolus_py-0.10.8 → sonolus_py-0.11.0}/docs/changelog/index.md

@@ -1,3 +1,15 @@
+### 0.11.0
+
+- Added basic support for set literals of numbers, with support for membership checks (`in`, `not in`) and iteration
+- Added support for membership checks (`in`, `not in`) of tuples
+- Fixed some instances where error messages for archetype declarations were not shown correctly
+- Reduced memory usage slightly
+
+### 0.10.9
+
+- Added [`Vec2.normalize_or_zero()`][sonolus.script.vec.Vec2.normalize_or_zero]
+- Added `--gc`/`--no-gc` to cli commands and made no-gc the default behavior to improve performance
+
 ### 0.10.8
 
 - Fixed issue when parameterizing the `type` built-in as a generic type

{sonolus_py-0.10.8 → sonolus_py-0.11.0}/docs/concepts/overview.md

@@ -195,6 +195,9 @@ assert record_1 == array_1[0] == MyRecord(4, 5.6)
 Sonolus.py has limited support for other types of values such as strings, tuples, and functions. These have restrictions
 such as not being valid as Record field types or Array element types.
 
+Support for `dict` is limited, and they are immutable and can only be accessed via compile-time constant keys. `set`
+literals of numeric values are supported, and they are immutable after creation.
+
 ## Modules
 
 Sonolus.py provides a number of built-in modules that can be used in Sonolus engines. These include:

{sonolus_py-0.10.8 → sonolus_py-0.11.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sonolus.py"
-version = "0.10.8"
+version = "0.11.0"
 description = "Sonolus engine development in Python"
 readme = "README.md"
 requires-python = ">=3.12"

{sonolus_py-0.10.8 → sonolus_py-0.11.0}/sonolus/backend/finalize.py

@@ -65,7 +65,15 @@ def cfg_to_engine_node(entry: BasicBlock):
                     statements.append(FunctionNode(Op.SwitchWithDefault, args))
         block_statements.append(FunctionNode(Op.Execute, statements))
     block_statements.append(ConstantNode(value=0))
-    return FunctionNode(Op.Block, [FunctionNode(Op.JumpLoop, block_statements)])
+    result = FunctionNode(Op.Block, [FunctionNode(Op.JumpLoop, block_statements)])
+    for block in block_indexes:
+        # Clean up without relying on gc
+        del block.incoming
+        del block.outgoing
+        del block.phis
+        del block.statements
+        del block.test
+    return result
 
 
 def ir_to_engine_node(stmt) -> EngineNode:

{sonolus_py-0.10.8 → sonolus_py-0.11.0}/sonolus/backend/optimize/liveness.py

@@ -24,15 +24,18 @@ class LivenessAnalysis(CompilerPass):
             block.live_phi_targets = set()
             block.array_defs_in = set()
             block.array_defs_out = None
+            last_live_set = set()
             for statement in block.statements:
-                statement.live = set()
+                if isinstance(statement, IRSet):
+                    last_live_set = set()
+                statement.live = last_live_set
                 statement.visited = False
                 statement.uses = self.get_uses(statement, set())
                 statement.defs = self.get_defs(statement)
                 statement.is_array_init = False  # True if this may be the first assignment to an array
                 statement.array_defs = self.get_array_defs(statement)
             if not isinstance(block.test, IRConst):
-                block.test.live = set()
+                block.test.live = last_live_set
                 block.test.uses = self.get_uses(block.test, set())
         self.preprocess_arrays(entry)
 

{sonolus_py-0.10.8 → sonolus_py-0.11.0}/sonolus/backend/visitor.py

@@ -319,7 +319,6 @@ class Visitor(ast.NodeVisitor):
             with using_ctx(before_ctx):
                 state_var._set_(0)
             with using_ctx(return_ctx):
-                state_var._set_(len(self.return_ctxs) + 1)
                 is_present_var._set_(0)
             del before_ctx.outgoing[None]  # Unlink the state machine body from the call site
             entry = before_ctx.new_empty_disconnected()
@@ -1007,7 +1006,9 @@ class Visitor(ast.NodeVisitor):
         return validate_value({self.visit(k): self.visit(v) for k, v in zip(node.keys, node.values, strict=True)})
 
     def visit_Set(self, node):
-        raise NotImplementedError("Set literals are not supported")
+        from sonolus.script.containers import FrozenNumSet
+
+        return self.handle_call(node, FrozenNumSet.of, *(self.visit(elt) for elt in node.elts))
 
     def visit_ListComp(self, node):
         raise NotImplementedError("List comprehensions are not supported")

{sonolus_py-0.10.8 → sonolus_py-0.11.0}/sonolus/build/cli.py

@@ -1,4 +1,5 @@
 import argparse
+import gc
 import importlib
 import json
 import shutil
@@ -164,6 +165,10 @@ def main():
             help="Runtime error checking mode (default: none for build, notify for dev)",
         )
 
+        gc_group = parser.add_mutually_exclusive_group()
+        gc_group.add_argument("--no-gc", action="store_true", default=True, help="Disable garbage collection (default)")
+        gc_group.add_argument("--gc", action="store_true", help="Enable garbage collection")
+
         build_components = parser.add_argument_group("build components")
         build_components.add_argument("--play", action="store_true", help="Build play component")
         build_components.add_argument("--watch", action="store_true", help="Build watch component")
@@ -219,6 +224,12 @@ def main():
         else:
             parser.error("Module argument is required when multiple or no modules are found")
 
+    if args.command in {"build", "check", "dev"}:
+        if hasattr(args, "gc") and args.gc:
+            gc.enable()
+        elif hasattr(args, "no_gc") and args.no_gc:
+            gc.disable()
+
     if no_gil():
         print("Multithreading is enabled")
     if hasattr(sys, "_jit") and sys._jit.is_enabled():

{sonolus_py-0.10.8 → sonolus_py-0.11.0}/sonolus/build/dev_server.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import argparse
 import contextlib
+import gc
 import http.server
 import importlib
 import queue
@@ -331,6 +332,7 @@ def run_server(
                     cmd = command_queue.get()
                     try:
                         cmd.execute(server_state)
+                        gc.collect()
                     except Exception:
                         print(f"{traceback.format_exc()}\n")
                     prompt_event.set()

{sonolus_py-0.10.8 → sonolus_py-0.11.0}/sonolus/script/bucket.py

@@ -75,7 +75,7 @@ class JudgmentWindow(Record):
     @perf_meta_fn
     def __mul__(self, other: float | int) -> JudgmentWindow:
         """Multiply the intervals by a scalar."""
-        return JudgmentWindow._quick_construct(
+        return JudgmentWindow._unchecked(
             perfect=self.perfect * other,
             great=self.great * other,
             good=self.good * other,
@@ -84,7 +84,7 @@ class JudgmentWindow(Record):
     @perf_meta_fn
     def __add__(self, other: float | int) -> JudgmentWindow:
         """Add a scalar to the intervals."""
-        return JudgmentWindow._quick_construct(
+        return JudgmentWindow._unchecked(
             perfect=self.perfect + other,
             great=self.great + other,
             good=self.good + other,

{sonolus_py-0.10.8 → sonolus_py-0.11.0}/sonolus/script/containers.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from collections.abc import Callable
 from typing import Any, Protocol, Self
 
+from sonolus.backend.visitor import compile_and_call
 from sonolus.script.archetype import AnyArchetype, EntityRef
 from sonolus.script.array import Array
 from sonolus.script.array_like import ArrayLike, get_positive_index
@@ -441,6 +442,55 @@ class ArraySet[T, Capacity](Record):
         self._values.clear()
 
 
+class FrozenNumSet[Size](Record):
+    _values: Array[Num, Size]
+
+    @classmethod
+    @meta_fn
+    def of(cls, *values: Num) -> Self:
+        if ctx():
+            try:
+                num_values = [Num._accept_(v) for v in values]
+            except TypeError:
+                raise TypeError("Only sets of numeric values are supported") from None
+            if all(v._is_py_() for v in num_values):
+                const_values = [v._as_py_() for v in num_values]
+                arr = Array[Num, len(const_values)]._with_value([Num(v) for v in sorted(const_values)])
+                return cls(arr)
+            else:
+                arr = Array[Num, len(values)](*values)
+                compile_and_call(arr.sort)
+        else:
+            arr = Array[Num, len(values)](*sorted(values))
+        return cls(arr)
+
+    def __len__(self) -> int:
+        return len(self._values)
+
+    def __contains__(self, value: Num) -> bool:
+        if len(self) < 15:
+            for i in range(len(self)):  # noqa: SIM110
+                if self._values.get_unchecked(i) == value:
+                    return True
+            return False
+        else:
+            left = 0
+            right = len(self) - 1
+            while left <= right:
+                mid = (left + right) // 2
+                mid_value = self._values.get_unchecked(mid)
+                if mid_value == value:
+                    return True
+                elif mid_value < value:
+                    left = mid + 1
+                else:
+                    right = mid - 1
+            return False
+
+    def __iter__(self) -> SonolusIterator[Num]:
+        return self._values.__iter__()
+
+
 class _ArrayMapEntry[K, V](Record):
     key: K
     value: V

{sonolus_py-0.10.8 → sonolus_py-0.11.0}/sonolus/script/debug.py

@@ -143,8 +143,9 @@ def assert_true(value: int | float | bool, message: str | None = None):
     require(value, message)
 
 
+@meta_fn
 def assert_false(value: int | float | bool, message: str | None = None):
-    assert_true(not value, message)
+    assert_true(value == 0, message)
 
 
 def static_assert(value: int | float | bool, message: str | None = None):

{sonolus_py-0.10.8 → sonolus_py-0.11.0}/sonolus/script/internal/context.py

@@ -551,7 +551,11 @@ def context_to_cfg(context: Context) -> BasicBlock:
             edge = FlowEdge(src=blocks[current], dst=blocks[target], cond=condition)
             blocks[current].outgoing.add(edge)
             blocks[target].incoming.add(edge)
-    return blocks[context]
+    result = blocks[context]
+    for current in tuple(iter_contexts(context)):
+        # Break cycles so memory can be cleaned without gc
+        del current.outgoing
+    return result
 
 
 def unique[T](iterable: Iterable[T]) -> list[T]:

{sonolus_py-0.10.8 → sonolus_py-0.11.0}/sonolus/script/internal/impl.py

@@ -77,6 +77,10 @@ def try_validate_value(value: Any) -> Value | None:
             return TupleImpl._accept_(value)
         case dict():
             return DictImpl._accept_(value)
+        case set() | frozenset():
+            from sonolus.script.containers import FrozenNumSet
+
+            return FrozenNumSet.of(*value)
         case (
             PartialGeneric()
             | TypeVar()
@@ -90,11 +94,7 @@ def try_validate_value(value: Any) -> Value | None:
             | super()
         ):
             return BasicConstantValue.of(value)
-        case special_form if value in {
-            Literal,
-            Annotated,
-            Union,
-        }:
+        case special_form if value == Literal or value == Annotated or value == Union:  # noqa: PLR1714, SIM109
             return TypingSpecialFormConstant.of(special_form)
         case other_type if get_origin(value) in {Literal, Annotated, UnionType, tuple, type}:
             return BasicConstantValue.of(other_type)

{sonolus_py-0.10.8 → sonolus_py-0.11.0}/sonolus/script/internal/tuple_impl.py

@@ -91,6 +91,12 @@ class TupleImpl(TransientValue):
         other = TupleImpl._accept_(other)
         return TupleImpl._accept_(self.value + other.value)
 
+    def __contains__(self, item):
+        for element in self.value:  # noqa: SIM110
+            if element == item:
+                return True
+        return False
+
     @staticmethod
     @meta_fn
     def _is_tuple_impl(value: Any) -> bool:

{sonolus_py-0.10.8 → sonolus_py-0.11.0}/sonolus/script/interval.py

@@ -78,7 +78,7 @@ class Interval(Record):
         Returns:
             A new interval with the value added to both ends.
         """
-        return Interval._quick_construct(start=self.start + other, end=self.end + other)
+        return Interval._unchecked(start=self.start + other, end=self.end + other)
 
     @perf_meta_fn
     def __sub__(self, other: float | int) -> Interval:
@@ -90,7 +90,7 @@ class Interval(Record):
         Returns:
             A new interval with the value subtracted from both ends.
         """
-        return Interval._quick_construct(start=self.start - other, end=self.end - other)
+        return Interval._unchecked(start=self.start - other, end=self.end - other)
 
     @perf_meta_fn
     def __mul__(self, other: float | int) -> Interval:
@@ -102,7 +102,7 @@ class Interval(Record):
         Returns:
             A new interval with both ends multiplied by the value.
         """
-        return Interval._quick_construct(start=self.start * other, end=self.end * other)
+        return Interval._unchecked(start=self.start * other, end=self.end * other)
 
     @perf_meta_fn
     def __truediv__(self, other: float | int) -> Interval:
@@ -114,7 +114,7 @@ class Interval(Record):
         Returns:
             A new interval with both ends divided by the value.
         """
-        return Interval._quick_construct(start=self.start / other, end=self.end / other)
+        return Interval._unchecked(start=self.start / other, end=self.end / other)
 
     @perf_meta_fn
     def __floordiv__(self, other: float | int) -> Interval:
@@ -126,7 +126,7 @@ class Interval(Record):
         Returns:
             A new interval with both ends divided by the value and floored.
         """
-        return Interval._quick_construct(start=self.start // other, end=self.end // other)
+        return Interval._unchecked(start=self.start // other, end=self.end // other)
 
     def __and__(self, other: Interval) -> Interval:
         """Get the intersection of two intervals.

{sonolus_py-0.10.8 → sonolus_py-0.11.0}/sonolus/script/record.py

@@ -172,7 +172,8 @@ class Record(GenericValue, metaclass=RecordMeta):
         return result
 
     @classmethod
-    def _quick_construct(cls, **kwargs) -> Self:
+    def _unchecked(cls, **kwargs) -> Self:
+        # Skips most validation, generally for internal use in frequently-called methods for performance reasons
         result = object.__new__(cls)
         for k, v in kwargs.items():
             if isinstance(v, int | float):

{sonolus_py-0.10.8 → sonolus_py-0.11.0}/sonolus/script/runtime.py

@@ -1157,7 +1157,7 @@ def canvas() -> _PreviewRuntimeCanvas:
 @perf_meta_fn
 def screen() -> Rect:
     """Get the screen boundaries as a rectangle."""
-    return Rect._quick_construct(t=1, r=aspect_ratio(), b=-1, l=-aspect_ratio())
+    return Rect._unchecked(t=1, r=aspect_ratio(), b=-1, l=-aspect_ratio())
 
 
 def level_score() -> _LevelScore:

{sonolus_py-0.10.8 → sonolus_py-0.11.0}/sonolus/script/transform.py

@@ -326,15 +326,16 @@ class Transform2d(Record):
             A new normalized transform.
         """
         assert self.a22 != 0, "Cannot normalize transform with a22 == 0"
+        a22 = self.a22 + (self.a22 == 0)
         return Transform2d(
-            self.a00 / self.a22,
-            self.a01 / self.a22,
-            self.a02 / self.a22,
-            self.a10 / self.a22,
-            self.a11 / self.a22,
-            self.a12 / self.a22,
-            self.a20 / self.a22,
-            self.a21 / self.a22,
+            self.a00 / a22,
+            self.a01 / a22,
+            self.a02 / a22,
+            self.a10 / a22,
+            self.a11 / a22,
+            self.a12 / a22,
+            self.a20 / a22,
+            self.a21 / a22,
             1,
         )
 

{sonolus_py-0.10.8 → sonolus_py-0.11.0}/sonolus/script/vec.py

@@ -4,7 +4,7 @@ from math import pi
 
 from sonolus.script.array import Array
 from sonolus.script.array_like import ArrayLike
-from sonolus.script.debug import assert_true
+from sonolus.script.debug import assert_false
 from sonolus.script.internal.impl import perf_meta_fn
 from sonolus.script.internal.math_impls import _atan2, _cos, _sin
 from sonolus.script.num import Num
@@ -135,7 +135,7 @@ class Vec2(Record):
         Returns:
             A new vector rotated by the given angle.
         """
-        return Vec2._quick_construct(
+        return Vec2._unchecked(
             x=self.x * cos(angle) - self.y * sin(angle),
             y=self.x * sin(angle) + self.y * cos(angle),
         )
@@ -157,12 +157,25 @@ class Vec2(Record):
     def normalize(self) -> Vec2:
         """Normalize the vector (set the magnitude to 1) and return a new vector.
 
+        If the vector is a zero vector, an assertion error is raised if runtime checks are enabled.
+
         Returns:
             A new vector with magnitude 1.
         """
-        magnitude = (self.x**2 + self.y**2) ** 0.5
-        assert_true(magnitude != 0, "Cannot normalize a zero vector")
-        return Vec2._quick_construct(x=self.x / magnitude, y=self.y / magnitude)
+        assert_false((self.x == 0) * (self.y == 0), "Cannot normalize a zero vector")
+        return self.normalize_or_zero()
+
+    @perf_meta_fn
+    def normalize_or_zero(self) -> Vec2:
+        """Normalize the vector (set the magnitude to 1) and return a new vector.
+
+        If the vector is a zero vector, return a zero vector.
+
+        Returns:
+            A new vector with magnitude 1, or a zero vector if the original vector is zero.
+        """
+        magnitude = (self.x**2 + self.y**2) ** 0.5 + (self.x == 0) * (self.y == 0)  # prevent division by zero
+        return Vec2._unchecked(x=self.x / magnitude, y=self.y / magnitude)
 
     @perf_meta_fn
     def orthogonal(self) -> Vec2:
@@ -173,7 +186,7 @@ class Vec2(Record):
         Returns:
             A new vector orthogonal to this vector.
         """
-        return Vec2._quick_construct(x=-self.y, y=self.x)
+        return Vec2._unchecked(x=-self.y, y=self.x)
 
     @property
     def tuple(self) -> tuple[float, float]:
@@ -194,7 +207,7 @@ class Vec2(Record):
         Returns:
             A new vector resulting from the addition.
         """
-        return Vec2._quick_construct(x=self.x + other.x, y=self.y + other.y)
+        return Vec2._unchecked(x=self.x + other.x, y=self.y + other.y)
 
     @perf_meta_fn
     def __sub__(self, other: Vec2) -> Vec2:
@@ -206,7 +219,7 @@ class Vec2(Record):
         Returns:
             A new vector resulting from the subtraction.
         """
-        return Vec2._quick_construct(x=self.x - other.x, y=self.y - other.y)
+        return Vec2._unchecked(x=self.x - other.x, y=self.y - other.y)
 
     @perf_meta_fn
     def __mul__(self, other: Vec2 | float) -> Vec2:
@@ -220,9 +233,9 @@ class Vec2(Record):
         """
         match other:
             case Vec2(x, y):
-                return Vec2._quick_construct(x=self.x * x, y=self.y * y)
+                return Vec2._unchecked(x=self.x * x, y=self.y * y)
             case Num(factor):
-                return Vec2._quick_construct(x=self.x * factor, y=self.y * factor)
+                return Vec2._unchecked(x=self.x * factor, y=self.y * factor)
             case _:
                 return NotImplemented
 
@@ -230,7 +243,7 @@ class Vec2(Record):
     def __rmul__(self, other):
         match other:
             case Num(factor):
-                return Vec2._quick_construct(x=self.x * factor, y=self.y * factor)
+                return Vec2._unchecked(x=self.x * factor, y=self.y * factor)
             case _:
                 return NotImplemented
 
@@ -246,9 +259,9 @@ class Vec2(Record):
         """
         match other:
             case Vec2(x, y):
-                return Vec2._quick_construct(x=self.x / x, y=self.y / y)
+                return Vec2._unchecked(x=self.x / x, y=self.y / y)
             case Num(factor):
-                return Vec2._quick_construct(x=self.x / factor, y=self.y / factor)
+                return Vec2._unchecked(x=self.x / factor, y=self.y / factor)
             case _:
                 return NotImplemented
 
@@ -259,7 +272,7 @@ class Vec2(Record):
         Returns:
             A new vector with inverted direction.
         """
-        return Vec2._quick_construct(x=-self.x, y=-self.y)
+        return Vec2._unchecked(x=-self.x, y=-self.y)
 
 
 def pnpoly(vertices: ArrayLike[Vec2] | tuple[Vec2, ...], test: Vec2) -> bool:

{sonolus_py-0.10.8 → sonolus_py-0.11.0}/tests/regressions/data/pydori_play_directional_flick_touch_cfg

@@ -210,7 +210,6 @@
 76:
   goto 77
 77:
-  v40 <- 1.0
   v41 <- 0
   goto 78
 78:
@@ -290,7 +289,6 @@
 102:
   goto 103
 103:
-  v64 <- 1.0
   v65 <- 0
   goto 104
 104:
@@ -835,7 +833,6 @@
 259:
   goto 260
 260:
-  v277 <- 1.0
   v278 <- 0
   goto 261
 261:
@@ -2295,7 +2292,6 @@
 671:
   goto 672
 672:
-  v855 <- 1.0
   v856 <- 0
   goto 673
 673:
@@ -4106,7 +4102,6 @@
 1174:
   goto 1175
 1175:
-  v1586 <- 1.0
   v1587 <- 0
   goto 1176
 1176:
@@ -5921,7 +5916,6 @@
 1680:
   goto 1681
 1681:
-  v2311 <- 1.0
   v2312 <- 0
   goto 1682
 1682:
@@ -6464,7 +6458,6 @@
 1836:
   goto 1837
 1837:
-  v2510 <- 1.0
   v2511 <- 0
   goto 1838
 1838:

{sonolus_py-0.10.8 → sonolus_py-0.11.0}/tests/regressions/data/pydori_play_directional_flick_touch_dev_cfg

@@ -216,7 +216,6 @@
 78:
   goto 79
 79:
-  v42 <- 1.0
   v43 <- 0
   goto 80
 80:
@@ -296,7 +295,6 @@
 104:
   goto 105
 105:
-  v66 <- 1.0
   v67 <- 0
   goto 106
 106:
@@ -849,7 +847,6 @@
 264:
   goto 265
 265:
-  v283 <- 1.0
   v284 <- 0
   goto 266
 266:
@@ -2389,7 +2386,6 @@
 702:
   goto 703
 703:
-  v889 <- 1.0
   v890 <- 0
   goto 704
 704:
@@ -4328,7 +4324,6 @@
 1247:
   goto 1248
 1248:
-  v1664 <- 1.0
   v1665 <- 0
   goto 1249
 1249:
@@ -6271,7 +6266,6 @@
 1795:
   goto 1796
 1796:
-  v2433 <- 1.0
   v2434 <- 0
   goto 1797
 1797:
@@ -6880,7 +6874,6 @@
 1973:
   goto 1974
 1974:
-  v2654 <- 1.0
   v2655 <- 0
   goto 1975
 1975: