openscad-cpp-evaluator 1.3.0__tar.gz → 1.3.1__tar.gz

{openscad_cpp_evaluator-1.3.0 → openscad_cpp_evaluator-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openscad_cpp_evaluator
-Version: 1.3.0
+Version: 1.3.1
 Summary: C++ OpenSCAD evaluator with Python bindings
 Author: NeuSCAD Contributors
 License-Expression: MIT

{openscad_cpp_evaluator-1.3.0 → openscad_cpp_evaluator-1.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "openscad_cpp_evaluator"
-version = "1.3.0"
+version = "1.3.1"
 description = "C++ OpenSCAD evaluator with Python bindings"
 readme = "README.md"
 requires-python = ">=3.12"

{openscad_cpp_evaluator-1.3.0 → openscad_cpp_evaluator-1.3.1}/src/value.cpp

@@ -493,10 +493,27 @@ std::string fmtValue(const Value& v) {
 // nullopt for a step of 0 or a direction that disagrees with start/end (a
 // naturally-empty range -- 0 elements, never "too many").
 std::optional<size_t> rangeElementCount(const OscRange& r) {
-    if (r.step == 0.0) return std::nullopt;
-    const double n = (r.end - r.start) / r.step;
-    if (n < -1e-10) return std::nullopt; // wrong direction -- naturally empty
-    return static_cast<size_t>(std::floor(n + 1e-10)) + 1;
+    // Zero step, wrong direction, or a NaN anywhere: nothing to iterate, and
+    // the reference says nothing about it -- `[for (i = [nan:1:-1]) i]` is
+    // [] with no warning there. BOSL2 reaches exactly that through
+    // list_rotate() on an empty list, where ((n % 0) + 0) % 0 is NaN.
+    if (r.isEmpty()) return std::nullopt;
+
+    const double count = std::floor((r.end - r.start) / r.step + 1e-10) + 1.0;
+
+    // Casting a double past size_t's range is undefined, and the platforms
+    // disagree about it in opposite directions: x86_64 wraps to 2^63 -- the
+    // "too many elements (9223372036854775809)" a CI run reported -- while
+    // arm64 produced something small enough that an INFINITE range iterated
+    // forever instead of being rejected. Neither is a wrong number so much
+    // as an unpredictable one.
+    //
+    // Clamp to what the reference reports for such a range, its own uint32
+    // ceiling: `[0:1:1/0]` warns "too many elements (4294967295)" there and
+    // yields [].
+    constexpr double kCap = 4294967295.0;
+    if (!(count < kCap)) return static_cast<size_t>(kCap);
+    return static_cast<size_t>(count);
 }
 
 IterableValues expandIterable(const Value& v, const RangeTooManyFn& onTooMany) {

{openscad_cpp_evaluator-1.3.0 → openscad_cpp_evaluator-1.3.1}/tests/test_python_bindings.py

@@ -600,3 +600,36 @@ def test_chr_of_a_multibyte_codepoint_has_length_one(tmp_path):
         echo(len(chr(65)));
     ''')
     assert got == ["1", "1", "1"], got
+
+
+def test_degenerate_ranges_do_not_overflow_the_element_count(tmp_path):
+    """A NaN range yields nothing, silently. An unbounded one is rejected with
+    the reference's own count.
+
+    Both used to go through a cast of an out-of-range double to size_t, which
+    is undefined and which the platforms disagreed about: x86_64 wrapped to
+    2^63 and warned "too many elements (9223372036854775809)", while arm64
+    produced a small enough number that an infinite range iterated forever.
+    BOSL2 reaches the NaN case through list_rotate() on an empty list, where
+    ((n % 0) + 0) % 0 is NaN -- so this failed on Linux CI while passing on a
+    developer's Mac.
+    """
+    from openscad_cpp_evaluator import Evaluator
+    src = tmp_path / "r.scad"
+    src.write_text('''
+        n = 0/0;
+        echo([for (i = [n : 1 : -1]) i]);
+        echo([for (i = [0 : 1 : n]) i]);
+        echo([for (i = [0 : 1 : 1/0]) 1]);
+        echo([for (i = [0 : 1 : 1e300]) 1]);
+        echo([for (i = [0 : 1 : 3]) i]);
+    ''')
+    msgs = []
+    Evaluator(echo_fn=msgs.append).evaluate(str(src), {})
+    echoes = [m[len("ECHO: "):] for m in msgs if m.startswith("ECHO: ")]
+    warnings = [m for m in msgs if m.startswith("WARNING:")]
+
+    assert echoes == ["[]", "[]", "[]", "[]", "[0, 1, 2, 3]"], echoes
+    # Silent for NaN; the unbounded pair warn, with the reference's number.
+    assert len(warnings) == 2, warnings
+    assert all("too many elements (4294967295)" in w for w in warnings), warnings

{openscad_cpp_evaluator-1.3.0 → openscad_cpp_evaluator-1.3.1}/uv.lock

@@ -55,7 +55,7 @@ wheels = [
 
 [[package]]
 name = "openscad-cpp-evaluator"
-version = "1.3.0"
+version = "1.3.1"
 source = { editable = "." }
 dependencies = [
     { name = "numpy" },