openscad-cpp-evaluator 1.28.0__tar.gz → 1.28.1__tar.gz

{openscad_cpp_evaluator-1.28.0 → openscad_cpp_evaluator-1.28.1}/PKG-INFO

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

{openscad_cpp_evaluator-1.28.0 → openscad_cpp_evaluator-1.28.1}/pyproject.toml

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

{openscad_cpp_evaluator-1.28.0 → openscad_cpp_evaluator-1.28.1}/src/builtins/primitives_3d.cpp

@@ -102,18 +102,25 @@ std::string describeEdge(const M& mesh, std::pair<uint32_t, uint32_t> edge) {
 
 CSGParams resolveCube(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx) {
     auto [args, effCtx] = resolveCallArgs(ev, node.arguments, ctx);
-    Value sizeArg = getArg(args, 0, "size", Value{1.0});
+    const Value sizeArg = getArg(args, 0, "size", Value{});
     const bool center = truthy(getArg(args, 1, "center", Value{false}));
 
-    std::vector<Value> sizeVec;
+    // As OpenSCAD reads it: undef (absent or explicit) is the default of 1, a
+    // number or three numbers are the size, and anything else warns and
+    // falls back to 1. Explicit undef built a zero-size cube -- nothing --
+    // and a 2-vector or a string was converted leniently, without a word.
+    std::vector<Value> sizeVec(3, Value{1.0});
+    const ListPtr* l = std::get_if<ListPtr>(&sizeArg);
     if (const double* s = std::get_if<double>(&sizeArg)) {
         sizeVec = {Value{*s}, Value{*s}, Value{*s}};
-    } else if (const ListPtr* l = std::get_if<ListPtr>(&sizeArg); l && *l) {
-        for (size_t i = 0; i < 3; ++i) {
-            sizeVec.push_back(Value{i < (*l)->items.size() ? toDoubleLenient((*l)->items[i]) : 0.0});
-        }
-    } else {
-        sizeVec = {Value{0.0}, Value{0.0}, Value{0.0}};
+    } else if (l && *l && (*l)->items.size() == 3 &&
+               std::all_of((*l)->items.begin(), (*l)->items.end(),
+                           [](const Value& v) { return std::holds_alternative<double>(v); })) {
+        sizeVec = (*l)->items;
+    } else if (!std::holds_alternative<std::monostate>(sizeArg)) {
+        ev.warn("Unable to convert cube(size=" + fmtValue(sizeArg) +
+                    ", ...) parameter to a number or a vec3 of numbers",
+                &node.position());
     }
 
     CSGParams params;

{openscad_cpp_evaluator-1.28.0 → openscad_cpp_evaluator-1.28.1}/tests/test_primitives.cpp

@@ -438,3 +438,32 @@ TEST(SphereStyle, StyleRespectsFnAndRadius) {
     const double v20 = sphereStats("sphere(r=20, style=\"aligned\", $fn=24);").volume;
     EXPECT_NEAR(v20 / v10, 8.0, 1e-6);   // volume goes as r^3
 }
+
+// cube()'s size as OpenSCAD 2026.02.01 reads it: undef, absent or explicit,
+// is the default of 1; anything but a number or three numbers warns and
+// falls back to 1. Explicit undef built a zero-size cube -- nothing at all.
+TEST(Primitives, CubeBadSizeIsAUnitCube) {
+    const std::pair<const char*, const char*> cases[] = {
+        {"undef", ""},
+        {"\"a\"", "size=\"a\""},
+        {"[1,2]", "size=[1, 2]"},
+        {"[1,2,undef]", "size=[1, 2, undef]"},
+        {"true", "size=true"},
+        {"[1,\"a\",3]", "size=[1, \"a\", 3]"},
+    };
+    for (const auto& [arg, shown] : cases) {
+        std::vector<std::string> log;
+        Evaluated e = evalSrc(std::string("cube(") + arg + ");", [&](const std::string& m) { log.push_back(m); });
+        ASSERT_EQ(e.bodies.size(), 1u) << arg;
+        ASSERT_TRUE(e.bodies[0].body.has_value()) << arg;
+        EXPECT_NEAR(e.bodies[0].body->Volume(), 1.0, 1e-9) << arg;
+        if (*shown == '\0') {
+            EXPECT_TRUE(log.empty()) << arg;
+        } else {
+            ASSERT_EQ(log.size(), 1u) << arg;
+            EXPECT_EQ(log[0], std::string("WARNING: Unable to convert cube(") + shown +
+                                  ", ...) parameter to a number or a vec3 of numbers in file <string>, line 1")
+                << arg;
+        }
+    }
+}

{openscad_cpp_evaluator-1.28.0 → openscad_cpp_evaluator-1.28.1}/uv.lock

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