openscad-cpp-evaluator 1.49.3__tar.gz → 1.49.4__tar.gz

{openscad_cpp_evaluator-1.49.3 → openscad_cpp_evaluator-1.49.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openscad_cpp_evaluator
-Version: 1.49.3
+Version: 1.49.4
 Summary: C++ OpenSCAD evaluator with Python bindings
 Author: NeuSCAD Contributors
 License-Expression: MIT AND OFL-1.1

{openscad_cpp_evaluator-1.49.3 → openscad_cpp_evaluator-1.49.4}/pyproject.toml

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

{openscad_cpp_evaluator-1.49.3 → openscad_cpp_evaluator-1.49.4}/src/user_calls.cpp

@@ -1043,9 +1043,12 @@ std::optional<Evaluator::ChildrenForward> Evaluator::prepareChildrenForward(cons
     // subsequent body-index lookup, so the Nth statement is evaluated
     // directly instead.
     std::vector<const oscad::ASTNode*> geoNodes;
+    std::vector<const oscad::ASTNode*> assignments;
     for (const oscad::ASTNode* c : *ctx.childrenNodes) {
-        if (c->kind() != oscad::NodeKind::Assignment && c->kind() != oscad::NodeKind::ModuleDeclaration &&
-            c->kind() != oscad::NodeKind::FunctionDeclaration) {
+        if (c->kind() == oscad::NodeKind::Assignment) {
+            assignments.push_back(c);
+        } else if (c->kind() != oscad::NodeKind::ModuleDeclaration &&
+                   c->kind() != oscad::NodeKind::FunctionDeclaration) {
             geoNodes.push_back(c);
         }
     }
@@ -1112,6 +1115,14 @@ std::optional<Evaluator::ChildrenForward> Evaluator::prepareChildrenForward(cons
         pickedIndices.push_back(static_cast<size_t>(idx));
     }
     if (picked.empty()) return std::nullopt;
+    // The picked statement runs in its block's scope, so the block's
+    // assignments must be in it: `m() { n = 2; for (i=[0:n]) ...; }` with
+    // `children(0)` in m() read n as unknown (#815, BOSL2's attachable()).
+    // evalChildren runs them into evalCtx's let_, which the picked
+    // statements' scopes share (withScope).
+    // ponytail: a children(i, separate=true) expansion prepares twice, so a
+    // side effect in one of these assignments (echo, rands) runs twice there.
+    if (!assignments.empty()) evalChildren(assignments, evalCtx);
     return ChildrenForward{std::move(evalCtx), std::move(picked), separate, std::move(pickedIndices)};
 }
 

{openscad_cpp_evaluator-1.49.3 → openscad_cpp_evaluator-1.49.4}/tests/test_scoping.cpp

@@ -212,3 +212,18 @@ TEST(Scoping, ReassignedVariableTakesItsLastValueAtItsFirstPosition) {
     for (const auto& m : out) warnings += m.find("but was overwritten") != std::string::npos;
     EXPECT_EQ(warnings, 3u) << "one per reassignment, even though m() could run again";
 }
+
+// #815: BOSL2's attachable() runs its children by index, and children(N)
+// used to skip the child block's assignments, so `last` was unknown.
+TEST(Scoping, IndexedChildrenSeeTheirBlocksAssignments) {
+    std::vector<std::string> out;
+    evaluateSrc("module one() children(0);\n"
+                "module both() { children(1); children([0:1]); }\n"
+                "one() { n = 2; for (i = [0:n]) echo(a = i); }\n"
+                "both() { k = 3; echo(b = k); echo(c = k + 1); }\n",
+                [&](const std::string& m) { out.push_back(m); });
+    EXPECT_TRUE(anyContains(out, "ECHO: a = 2"));
+    EXPECT_TRUE(anyContains(out, "ECHO: b = 3"));
+    EXPECT_TRUE(anyContains(out, "ECHO: c = 4"));
+    EXPECT_FALSE(anyContains(out, "unknown variable"));
+}

{openscad_cpp_evaluator-1.49.3 → openscad_cpp_evaluator-1.49.4}/uv.lock

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