openscad-cpp-evaluator 0.42.1__tar.gz → 0.43.0__tar.gz

{openscad_cpp_evaluator-0.42.1 → openscad_cpp_evaluator-0.43.0}/CLAUDE.md

@@ -481,13 +481,19 @@ grep for `ponytail:`.
   lexically nested inside an already-active call," picking `childCtx()` vs `callCtx()`
   accordingly; read its doc comment before touching it, it's the second-trickiest mechanism in this
   codebase after the CSG tree stack), `evalUserModule`/`evalUserFunction`/`evalFunctionLiteral`,
-  and `builtinChildren` (children()/children(N), deferred evaluation; `children(separate=true)`
-  additionally marks each forwarded node `separateOperand` so the enclosing
-  union/difference/intersection treats them as separate operands rather than one grouped one --
-  a BelfrySCAD extension, see `Evaluator::appendGroupSizes`. The marks stop at a user-module
-  boundary: only the children() call's own splice honours them
-  (`spliceModuleChildren`'s `honorSeparateMarks`), so a module wrapping such a call wraps its
-  children as usual and its own caller sees one operand). `evalFunctionCall`'s
+  and `builtinChildren` (children()/children(N), deferred evaluation).
+  **`children(..., separate=true)`** is a BelfrySCAD extension handled *before* any of that, by
+  `expandChildStatements`: a block is read with each separating forward replaced by one synthetic
+  `children(k)` statement per child it selects (`makeChildrenIndexCall`, owned by
+  `syntheticNodes_` and cleared with `idToNode` at `resolveTreeImpl` entry). Everything the
+  feature does follows from their being real statements -- `$children` counts them,
+  `children(i)` indexes them, and `union`/`difference`/`intersection` give each its own operand
+  group -- with no flag on `CSGNode` and nothing to leak. Called from `buildModuleChildCtx`,
+  `resolveCsg`, `resolveIntersectionFor`, and the VM's `Op::CsgGroupChildren`, which exists
+  because the compiler fixes group boundaries long before `$children` (and so the expansion size)
+  is knowable; it shares `expandSeparatingChildren` with the interpreter so the engines cannot
+  drift. Synthetic calls carry the author's own `Position` and no scope, so they resolve in the
+  evaluating context (`evalChildren`'s `runAll`). `evalFunctionCall`'s
   precedence order (checked in this exact sequence): `import` (special-cased, its own
   module/expression-context split) → `isBuiltinFunctionName` (function_builtins.hpp — always wins
   if true) → user function lookup → function-literal *value* probe → "unknown function" warning.

{openscad_cpp_evaluator-0.42.1 → openscad_cpp_evaluator-0.43.0}/PKG-INFO

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

{openscad_cpp_evaluator-0.42.1 → openscad_cpp_evaluator-0.43.0}/include/openscad_cpp_evaluator/bytecode.hpp

@@ -426,6 +426,21 @@ enum class Op {
     // own `groupSizes.push_back(Value{...})` loop.
     CsgGroupEnd,
 
+    // One `children(..., separate=true)` statement inside a CSG bracket.
+    // `a` interns the ModularCall in nativeStatements.
+    //
+    // A statement of its own, rather than a CsgGroupStart/End pair around
+    // compiled code, because how many groups it contributes is only known
+    // at RUNTIME -- `children([2:$children-1], separate=true)` reads
+    // $children, and the compiler emits its group boundaries long before
+    // any of that exists. So this op expands the call (the same
+    // Evaluator::expandSeparatingChildren the interpreter uses, so the two
+    // engines cannot drift) and records one group per expanded statement.
+    //
+    // Not an interpreter bail: the forwarded statements go through
+    // evalChildren, which self-gates and retries its own compiled chunks.
+    CsgGroupChildren,
+
     // Closes the matching Op::PushCsgWrap bracket: pops
     // VmFrame::csgWrapStack's own top entry FIRST (before anything that can
     // itself throw, e.g. setTreeDepthOrThrow below -- same "exception-

{openscad_cpp_evaluator-0.42.1 → openscad_cpp_evaluator-0.43.0}/include/openscad_cpp_evaluator/bytecode_vm.hpp

@@ -219,10 +219,6 @@ struct VmFrame {
     // mirrors evalModularCall's own `&node` (csg_resolve.cpp). Only
     // meaningful when ownsModuleSplice is true.
     const oscad::ASTNode* moduleSpliceCallNode = nullptr;
-    // children(separate=true) on the call this frame is forwarding for.
-    // Only meaningful while ownsModuleSplice is true, same as the two
-    // fields above; reset in releaseVmFrame for the same pooling reason.
-    bool separateChildren = false;
 
     // Whether callStack_.back() (at push time) genuinely IS this frame's
     // own logical call, and therefore safe for a tail hop inside this

{openscad_cpp_evaluator-0.42.1 → openscad_cpp_evaluator-0.43.0}/include/openscad_cpp_evaluator/csg_node.hpp

@@ -34,15 +34,6 @@ struct CSGNode {
     CSGParams params;                      // resolve step's plain-data output
     bool uncacheable = false;              // set by a later phase (ManifoldCache, Phase 8)
 
-    // Set only by children(separate=true): this node begins its OWN operand
-    // group in an enclosing union/difference/intersection/intersection_for,
-    // instead of merging into the single group its enclosing statement
-    // would otherwise form. See Evaluator::appendGroupSizes.
-    //
-    // Deliberately absent from cacheKey()'s allowlist (manifold_cache.cpp):
-    // it changes the PARENT's hashed "group_sizes" param, never this node's
-    // own geometry, so the parent already re-keys and this node must not.
-    bool separateOperand = false;
 
     // The call site that entered this node's call chain from the top
     // level, captured at RESOLVE time -- non-owning, AST-lifetime-bound
@@ -83,12 +74,5 @@ struct CSGNode {
     std::optional<std::string> cachedKey;
 };
 
-// Marks every node from `from` onward as starting its own operand group --
-// what children(separate=true) does to the geometry it just forwarded.
-// A free function, not a member, so all three splice sites (user_calls.cpp
-// and bytecode_vm.cpp's two) can reach it from this header alone.
-inline void markSeparateOperands(std::vector<std::unique_ptr<CSGNode>>& nodes, size_t from) {
-    for (size_t i = from; i < nodes.size(); ++i) nodes[i]->separateOperand = true;
-}
 
 } // namespace oscadeval

{openscad_cpp_evaluator-0.42.1 → openscad_cpp_evaluator-0.43.0}/include/openscad_cpp_evaluator/evaluator.hpp

@@ -190,29 +190,6 @@ public:
     // statement.
     size_t currentTreeFrameSize() const { return treeStack_.back().size(); }
 
-    // Records the group(s) one child statement contributed, given the frame
-    // size captured before it ran. Normally that is exactly one group, of
-    // however many nodes the statement pushed -- including a group of size
-    // ZERO for a statement that produced no geometry (a disabled `*cube()`),
-    // which generateCsg relies on to reset intersection() and to bail
-    // difference(). Only children(separate=true) produces more than one:
-    // each node it marked starts a fresh group, so its forwarded children
-    // reach the enclosing operator as separate operands.
-    //
-    // Shared by all four group builders -- resolveCsg, resolveIntersectionFor
-    // and the VM's Op::CsgGroupEnd (which serves both) -- because
-    // "group_sizes" is otherwise built twice, once per engine, and would
-    // drift.
-    void appendGroupSizes(std::vector<Value>& groupSizes, size_t before) const {
-        const std::vector<std::unique_ptr<CSGNode>>& frame = treeStack_.back();
-        size_t start = before;
-        for (size_t i = before + 1; i < frame.size(); ++i) {
-            if (!frame[i]->separateOperand) continue;
-            groupSizes.push_back(Value{static_cast<double>(i - start)});
-            start = i;
-        }
-        groupSizes.push_back(Value{static_cast<double>(frame.size() - start)});
-    }
 
     // Generate pass: walks `tree` bottom-up (children before their own
     // node), calling each node's registered GenerateFn (falling back to
@@ -366,14 +343,49 @@ public:
     struct ChildrenForward {
         EvalContext evalCtx;
         std::vector<const oscad::ASTNode*> nodes;
-        // children(separate=true): hand these to the enclosing union/
-        // difference/intersection as SEPARATE operands rather than as one
-        // grouped operand. Acted on after the nodes are evaluated, by
-        // marking the CSGNodes they produced -- see markSeparateOperands.
+        // The `separate` flag as written at the call. Read by
+        // expandSeparatingChildren, which turns the forward into one
+        // statement per child; builtinChildren itself ignores it, since by
+        // the time a forward runs the expansion has already happened.
         bool separate = false;
+        // Which of the caller's geometry statements `nodes` came from, in
+        // the same order. Needed by expandChildStatements, which turns each
+        // one back into its own `children(k)` statement.
+        std::vector<size_t> pickedIndices;
     };
     std::optional<ChildrenForward> prepareChildrenForward(const CallArgs& args, EvalContext& ctx);
 
+    // A child-statement block with every `children(..., separate=true)`
+    // replaced by one synthetic `children(k)` statement per child it
+    // selects. That is the whole of what separate=true does: the forwarded
+    // children become real, countable statements at this call site, so
+    // $children sees them, children(i) indexes them, and a boolean operator
+    // gives each its own operand group -- all for free, because they ARE
+    // statements rather than nodes wearing a flag.
+    //
+    // Called wherever a block is consumed: a module call's children
+    // (buildModuleChildCtx), and union/difference/intersection/
+    // intersection_for's own child list.
+    std::vector<const oscad::ASTNode*> expandChildStatements(
+        const std::vector<std::unique_ptr<oscad::ASTNode>>& block, EvalContext& ctx);
+
+    // One synthetic `children(index)` statement, owned by syntheticNodes_.
+    const oscad::ASTNode* makeChildrenIndexCall(const oscad::ModularCall& origin, size_t index);
+
+    // Syntactic gate: is this statement a `children(..., separate=true)`?
+    // Cheap and side-effect-free, so the bytecode compiler can ask it at
+    // COMPILE time to decide which opcode to emit, long before the flag's
+    // value (or the child count it selects) is knowable.
+    static bool isSeparatingChildrenCall(const oscad::ASTNode& stmt);
+
+    // The runtime half: the statements `call` expands to. nullopt means the
+    // `separate` flag resolved falsey after all, and the caller should run
+    // the original statement unchanged. Shared by expandChildStatements
+    // (interpreter) and Op::CsgGroupChildren (VM) so the engines cannot
+    // drift on what expansion means.
+    std::optional<std::vector<const oscad::ASTNode*>> expandSeparatingChildren(const oscad::ModularCall& call,
+                                                                               EvalContext& ctx);
+
     // "WARNING: {message}{locSuffix(position)}" via echoFn_, no-op if unset.
     // Public: builtins/import.cpp's not-manifold warning is emitted from a
     // free function, same reasoning as tagGenerated()/builtinChildren().
@@ -999,13 +1011,8 @@ public:
     // (evalModularCall's OWN "is this splice or wrap-as-a-tagged-node"
     // branch already decided `splice` before ever reaching a user module,
     // so this helper never needs that decision itself).
-    // `honorSeparateMarks` is true only for a children() call's OWN splice.
-    // A user module's splice passes false, so it wraps its marked children
-    // as usual and the marks stop there -- children(separate=true) applies
-    // to the operator enclosing that call, not to whatever encloses the
-    // module the call happens to sit in.
     void spliceModuleChildren(std::vector<std::unique_ptr<CSGNode>> children, std::uint64_t randsBefore,
-                               const oscad::ASTNode& callNode, bool honorSeparateMarks = false);
+                               const oscad::ASTNode& callNode);
 private:
     Value evalUserFunction(const std::string& name, const oscad::FunctionDeclaration& decl,
                             const std::vector<std::unique_ptr<oscad::Argument>>& arguments, EvalContext& ctx,
@@ -1661,6 +1668,12 @@ public:
     // is on top *at that moment* -- the frame this node's own build call
     // pushed just before resolving. See csg_resolve.cpp for the full
     // push/call/pop sequence.
+    // Synthetic `children(k)` calls built by expandChildStatements. Owned
+    // here because CSGNode::node and idToNode hold non-owning pointers into
+    // them, so they must outlive the pass; cleared with those maps at
+    // resolveTreeImpl entry.
+    std::vector<std::unique_ptr<oscad::ASTNode>> syntheticNodes_;
+
     std::vector<std::vector<std::unique_ptr<CSGNode>>> treeStack_;
 
 private:

{openscad_cpp_evaluator-0.42.1 → openscad_cpp_evaluator-0.43.0}/pyproject.toml

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

{openscad_cpp_evaluator-0.42.1 → openscad_cpp_evaluator-0.43.0}/src/builtins/booleans.cpp

@@ -70,10 +70,11 @@ std::optional<manifold::CrossSection> toCrossSection(const std::vector<ColoredBo
 // misbehave when e.g. BOSL2's attachable() returns multiple bodies (parent
 // + attached children) as one operand.
 //
-// One statement can contribute MORE than one group: children(separate=true)
-// marks the nodes it forwards so each starts its own operand group, which is
+// One statement can still turn into several: children(separate=true) is
+// expanded into one `children(k)` statement per child it forwards, before
+// this loop ever sees the block (Evaluator::expandChildStatements), which is
 // how `difference() children(separate=true)` subtracts children 1..n from
-// child 0. See Evaluator::appendGroupSizes, which both engines share. Mirrors _resolve_csg/_generate_csg,
+// child 0. Nothing special happens here -- they are simply statements. Mirrors _resolve_csg/_generate_csg,
 // minus _attach_tri_colors' multi-color-merge provenance (ponytail: a
 // merged body always takes its first contributing child's color, matching
 // this evaluator's own pre-tri_colors baseline behavior -- revisit
@@ -92,11 +93,11 @@ CSGParams resolveCsg(Evaluator& ev, const oscad::ModularCall& node, EvalContext&
 
     std::vector<const oscad::ASTNode*> assignNodes;
     std::vector<const oscad::ASTNode*> geoNodes;
-    for (const auto& c : node.children) {
+    for (const oscad::ASTNode* c : ev.expandChildStatements(node.children, effCtx)) {
         if (c->kind() == oscad::NodeKind::Assignment) {
-            assignNodes.push_back(c.get());
+            assignNodes.push_back(c);
         } else if (c->kind() != oscad::NodeKind::ModuleDeclaration && c->kind() != oscad::NodeKind::FunctionDeclaration) {
-            geoNodes.push_back(c.get());
+            geoNodes.push_back(c);
         }
     }
     if (!assignNodes.empty()) ev.evalChildren(assignNodes, effCtx);
@@ -106,7 +107,7 @@ CSGParams resolveCsg(Evaluator& ev, const oscad::ModularCall& node, EvalContext&
     for (const oscad::ASTNode* geoNode : geoNodes) {
         const size_t before = ev.currentTreeFrameSize();
         ev.evalChildren(std::vector<const oscad::ASTNode*>{geoNode}, effCtx);
-        ev.appendGroupSizes(groupSizes, before);
+        groupSizes.push_back(Value{static_cast<double>(ev.currentTreeFrameSize() - before)});
     }
 
     CSGParams params;

{openscad_cpp_evaluator-0.42.1 → openscad_cpp_evaluator-0.43.0}/src/builtins/control.cpp

@@ -97,9 +97,10 @@ ColoredBody combineBodies(const std::vector<ColoredBody>& bodies) {
 // children) -- same rationale as booleans.cpp's own group_sizes. Mirrors
 // _resolve_intersection_for/_generate_intersection_for.
 CSGParams resolveIntersectionFor(Evaluator& ev, const oscad::ModularIntersectionFor& node, EvalContext& ctx) {
-    std::vector<const oscad::ASTNode*> bodyNodes;
-    bodyNodes.reserve(node.body.size());
-    for (const auto& b : node.body) bodyNodes.push_back(b.get());
+    // Expanded for the same reason resolveCsg expands its own block: a
+    // children(..., separate=true) here contributes one statement -- and so
+    // one operand group per iteration -- per child it selects.
+    const std::vector<const oscad::ASTNode*> bodyNodes = ev.expandChildStatements(node.body, ctx);
 
     std::vector<Value> groupSizes;
 
@@ -119,7 +120,7 @@ CSGParams resolveIntersectionFor(Evaluator& ev, const oscad::ModularIntersection
             if (!bodyNodes.empty()) ev.checkDebug(*bodyNodes.front(), parentCtx, /*forced=*/false, /*exprLevel=*/true);
             const size_t before = ev.currentTreeFrameSize();
             ev.evalChildren(bodyNodes, parentCtx);
-            ev.appendGroupSizes(groupSizes, before);
+            groupSizes.push_back(Value{static_cast<double>(ev.currentTreeFrameSize() - before)});
             return;
         }
         const auto& assign = node.assignments[depth];

{openscad_cpp_evaluator-0.42.1 → openscad_cpp_evaluator-0.43.0}/src/bytecode_compiler.cpp

@@ -2,6 +2,7 @@
 
 #include "openscad_cpp_evaluator/call_args.hpp"
 #include "openscad_cpp_evaluator/dispatch.hpp"
+#include "openscad_cpp_evaluator/evaluator.hpp"
 #include "openscad_cpp_evaluator/function_builtins.hpp"
 
 #include "builtins/builtins.hpp"
@@ -1292,6 +1293,12 @@ public:
         }
         compileStatementList(assignNodes, out);
         for (const oscad::ASTNode* geoNode : geoNodes) {
+            // A separating children() forward contributes a runtime-decided
+            // NUMBER of groups, so it cannot be bracketed at compile time.
+            if (Evaluator::isSeparatingChildrenCall(*geoNode)) {
+                out.push_back({Op::CsgGroupChildren, internNativeStatement(geoNode), 0, &geoNode->position()});
+                continue;
+            }
             out.push_back({Op::CsgGroupStart, 0, 0, nullptr});
             compileStatementList(std::vector<const oscad::ASTNode*>{geoNode}, out);
             out.push_back({Op::CsgGroupEnd, 0, 0, nullptr});

{openscad_cpp_evaluator-0.42.1 → openscad_cpp_evaluator-0.43.0}/src/bytecode_vm.cpp

@@ -360,7 +360,7 @@ void pushBracketedModuleFrame(Evaluator& ev, const CompiledChunk& chunk, const o
 // because module chunks never contain tail-call opcodes); don't inherit
 // a pooled function frame's stale true here either.
 void pushChildrenForwardFrame(Evaluator& ev, const CompiledChunk& chunk, EvalContext evalCtx,
-                               std::uint64_t randsBefore, const oscad::ASTNode& callNode, bool separate) {
+                               std::uint64_t randsBefore, const oscad::ASTNode& callNode) {
     if (ev.vmCallStack_.size() >= Evaluator::kMaxVmCallStackDepth) {
         ev.error("Recursion too deep while forwarding children()", callNode);
     }
@@ -381,7 +381,6 @@ void pushChildrenForwardFrame(Evaluator& ev, const CompiledChunk& chunk, EvalCon
     frame->ownsModuleSplice = true;
     frame->moduleRandsBefore = randsBefore;
     frame->moduleSpliceCallNode = &callNode;
-    frame->separateChildren = separate;
     ev.vmCallStack_.push_back(std::move(frame));
     ev.vmCallBrackets_.emplace_back(std::nullopt);
 }
@@ -506,7 +505,6 @@ Value driveVm(Evaluator& ev, size_t floor) {
                 const bool ownsModuleSplice = finished->ownsModuleSplice;
                 const std::uint64_t moduleRandsBefore = finished->moduleRandsBefore;
                 const oscad::ASTNode* moduleSpliceCallNode = finished->moduleSpliceCallNode;
-                const bool separateChildren = finished->separateChildren;
                 while (!finished->ctxChain.empty()) finished->ctxChain.pop_back();
                 // Module frames never fire returnHook (native evalUserModule
                 // never did either -- a module call has no "return value"
@@ -516,12 +514,7 @@ Value driveVm(Evaluator& ev, size_t floor) {
                 if (isModule && ownsModuleSplice) {
                     std::vector<std::unique_ptr<CSGNode>> children = std::move(ev.treeStack_.back());
                     ev.treeStack_.pop_back();
-                    // separateChildren is set only by pushChildrenForwardFrame,
-                    // so it also answers "is this a children() splice?" -- a
-                    // user module's frame always passes false and wraps.
-                    if (separateChildren) markSeparateOperands(children, 0);
-                    ev.spliceModuleChildren(std::move(children), moduleRandsBefore, *moduleSpliceCallNode,
-                                            /*honorSeparateMarks=*/separateChildren);
+                    ev.spliceModuleChildren(std::move(children), moduleRandsBefore, *moduleSpliceCallNode);
                 }
                 if (isFloorFrame) {
                     finalResult = std::move(result); // unused by a module caller (runCompiledModuleBody ignores it)
@@ -1051,11 +1044,9 @@ Value driveVm(Evaluator& ev, size_t floor) {
                     const CompiledChunk* chunk = (ev.useBytecodeVm() && ev.inResolvePass())
                                                      ? ev.lookupOrCompileChildrenListChunk(fwd->nodes)
                                                      : nullptr;
-                    // Read before fwd->evalCtx is moved from.
-                    const bool separate = fwd->separate;
                     if (chunk) {
                         ev.treeStack_.emplace_back();
-                        pushChildrenForwardFrame(ev, *chunk, std::move(fwd->evalCtx), randsBefore, *callNode, separate);
+                        pushChildrenForwardFrame(ev, *chunk, std::move(fwd->evalCtx), randsBefore, *callNode);
                         // f.pc deliberately NOT advanced -- resumes when
                         // the pushed frame completes; driveVm's completion
                         // branch runs the splice (isModule &&
@@ -1079,9 +1070,7 @@ Value driveVm(Evaluator& ev, size_t floor) {
                         }
                         std::vector<std::unique_ptr<CSGNode>> children = std::move(ev.treeStack_.back());
                         ev.treeStack_.pop_back();
-                        if (separate) markSeparateOperands(children, 0);
-                        ev.spliceModuleChildren(std::move(children), randsBefore, *callNode,
-                                                /*honorSeparateMarks=*/true);
+                        ev.spliceModuleChildren(std::move(children), randsBefore, *callNode);
                         ++f.pc;
                     }
                     break;
@@ -1318,9 +1307,30 @@ Value driveVm(Evaluator& ev, size_t floor) {
                     ++f.pc;
                     break;
                 }
+                case Op::CsgGroupChildren: {
+                    const auto& call =
+                        static_cast<const oscad::ModularCall&>(*f.chunk->nativeStatements[static_cast<size_t>(ins.a)]);
+                    PendingCsgWrap& pending = f.csgWrapStack.back();
+                    std::optional<std::vector<const oscad::ASTNode*>> expanded =
+                        ev.expandSeparatingChildren(call, ctx);
+                    // nullopt = `separate` resolved falsey: one group, the
+                    // original statement, exactly as CsgGroupStart/End would
+                    // have done for it.
+                    const std::vector<const oscad::ASTNode*> stmts =
+                        expanded ? *expanded : std::vector<const oscad::ASTNode*>{&call};
+                    for (const oscad::ASTNode* stmt : stmts) {
+                        const size_t before = ev.treeStack_.back().size();
+                        ev.evalChildren(std::vector<const oscad::ASTNode*>{stmt}, ctx);
+                        pending.groupSizes.push_back(
+                            Value{static_cast<double>(ev.treeStack_.back().size() - before)});
+                    }
+                    ++f.pc;
+                    break;
+                }
                 case Op::CsgGroupEnd: {
                     PendingCsgWrap& pending = f.csgWrapStack.back();
-                    ev.appendGroupSizes(pending.groupSizes, pending.groupStartSize);
+                    const size_t after = ev.treeStack_.back().size();
+                    pending.groupSizes.push_back(Value{static_cast<double>(after - pending.groupStartSize)});
                     ++f.pc;
                     break;
                 }

{openscad_cpp_evaluator-0.42.1 → openscad_cpp_evaluator-0.43.0}/src/csg_resolve.cpp

@@ -126,10 +126,9 @@ void Evaluator::evalModularCall(const oscad::ModularCall& node, EvalContext& ctx
     // under a synthetic (display-only, is_builtin=false) "union" node so
     // the tree still reads as one shape at this call site. Mirrors
     // _eval_statement's splice branch exactly.
-    const bool isChildrenCall = (name == "children" && isBuiltin);
-    const bool splice = isChildrenCall || !isBuiltin;
+    const bool splice = (name == "children" && isBuiltin) || !isBuiltin;
     if (splice) {
-        spliceModuleChildren(std::move(children), randsBefore, node, isChildrenCall);
+        spliceModuleChildren(std::move(children), randsBefore, node);
         return;
     }
 
@@ -148,7 +147,7 @@ void Evaluator::evalModularCall(const oscad::ModularCall& node, EvalContext& ctx
 }
 
 void Evaluator::spliceModuleChildren(std::vector<std::unique_ptr<CSGNode>> children, std::uint64_t randsBefore,
-                                      const oscad::ASTNode& callNode, bool honorSeparateMarks) {
+                                      const oscad::ASTNode& callNode) {
     if (randsCallCount_ != randsBefore) {
         // rands() fired directly during *this* call's own resolve (e.g. an
         // assignment before any geometry statement in a user module's
@@ -159,23 +158,7 @@ void Evaluator::spliceModuleChildren(std::vector<std::unique_ptr<CSGNode>> child
         // landed on.
         for (auto& c : children) c->uncacheable = true;
     }
-    // children(separate=true) marked these to start their own operand
-    // groups, and the group walk only inspects the enclosing frame's top
-    // level -- so the wrapper would hide the marks. Splice instead.
-    //
-    // Only for the children() call's own splice. A USER MODULE wrapping
-    // such a call wraps as usual, which hides the marks and is exactly what
-    // makes separateness stop at the module boundary:
-    //
-    //     module pass() { children(separate=true); }
-    //     difference() pass() { a; b; }   // a | b, not a - b
-    //
-    // pass() is its own shape; that it happens to forward its children
-    // separately is its business, not its caller's.
-    const bool anySeparate =
-        honorSeparateMarks &&
-        std::any_of(children.begin(), children.end(), [](const auto& c) { return c->separateOperand; });
-    if (children.size() > 1 && !anySeparate) {
+    if (children.size() > 1) {
         auto unionNode = std::make_unique<CSGNode>();
         unionNode->kind = "union";
         unionNode->node = &callNode;
@@ -224,6 +207,7 @@ template <typename NodeList>
 std::vector<std::unique_ptr<CSGNode>> Evaluator::resolveTreeImpl(const NodeList& nodes, EvalContext& ctx) {
     idToNode.clear();
     idToColor.clear();
+    syntheticNodes_.clear();
     cacheProducer_.clear(); // holds AST pointers, same lifetime as idToNode's
     treeStack_.clear();
     treeStack_.emplace_back();

{openscad_cpp_evaluator-0.42.1 → openscad_cpp_evaluator-0.43.0}/src/user_calls.cpp

@@ -179,7 +179,6 @@ void Evaluator::releaseVmFrame(std::unique_ptr<VmFrame> frame) {
     frame->ownsModuleSplice = false;
     frame->moduleRandsBefore = 0;
     frame->moduleSpliceCallNode = nullptr;
-    frame->separateChildren = false;
     vmFramePool_.push_back(std::move(frame));
 }
 
@@ -340,9 +339,10 @@ EvalContext Evaluator::buildModuleChildCtx(const oscad::ModuleDeclaration& decl,
                                             EvalContext& ctx, BoundArgs bound) {
     const oscad::Scope* childScope = decl.scope() ? decl.scope() : ctx.scope;
 
-    auto childrenNodes = std::make_shared<ChildrenNodeList>();
-    childrenNodes->reserve(call.children.size());
-    for (const auto& c : call.children) childrenNodes->push_back(c.get());
+    // Expanded, so a children(..., separate=true) in this block becomes one
+    // real statement per child it selects -- which is what makes $children
+    // below count them and children(i) index them.
+    auto childrenNodes = std::make_shared<ChildrenNodeList>(expandChildStatements(call.children, ctx));
 
     EvalContext childCtx = callCtxFor(decl, ctx, childScope, childrenNodes, &ctx);
     // callCtx reset this to false; carry the CALLER's value across so
@@ -353,7 +353,7 @@ EvalContext Evaluator::buildModuleChildCtx(const oscad::ModuleDeclaration& decl,
     // `{}`, not the number of geometries they produce -- e.g. children()
     // counts as one child even if it forwards zero bodies.
     int childrenCount = 0;
-    for (const auto& c : call.children) {
+    for (const oscad::ASTNode* c : *childrenNodes) {
         if (c->kind() != oscad::NodeKind::Assignment && c->kind() != oscad::NodeKind::ModuleDeclaration &&
             c->kind() != oscad::NodeKind::FunctionDeclaration) {
             ++childrenCount;
@@ -983,7 +983,15 @@ std::optional<Evaluator::ChildrenForward> Evaluator::prepareChildrenForward(cons
     }
 
     if (std::holds_alternative<std::monostate>(idxArg)) {
-        return ChildrenForward{std::move(evalCtx), *ctx.childrenNodes, separate};
+        std::vector<size_t> allIndices;
+        size_t geoIdx = 0;
+        for (const oscad::ASTNode* c : *ctx.childrenNodes) {
+            if (c->kind() != oscad::NodeKind::Assignment && c->kind() != oscad::NodeKind::ModuleDeclaration &&
+                c->kind() != oscad::NodeKind::FunctionDeclaration) {
+                allIndices.push_back(geoIdx++);
+            }
+        }
+        return ChildrenForward{std::move(evalCtx), *ctx.childrenNodes, separate, std::move(allIndices)};
     }
 
     // children(N) indexes child *statements*, not output bodies -- a
@@ -1025,6 +1033,7 @@ std::optional<Evaluator::ChildrenForward> Evaluator::prepareChildrenForward(cons
     // does evaluate child 2 three times, and the order shows through in the
     // CSG tree even though a union usually hides it.
     std::vector<const oscad::ASTNode*> picked;
+    std::vector<size_t> pickedIndices;
     picked.reserve(indexValues.size());
     for (const Value& v : indexValues) {
         if (!std::holds_alternative<double>(v)) {
@@ -1045,17 +1054,93 @@ std::optional<Evaluator::ChildrenForward> Evaluator::prepareChildrenForward(cons
             continue;
         }
         picked.push_back(geoNodes[static_cast<size_t>(idx)]);
+        pickedIndices.push_back(static_cast<size_t>(idx));
     }
     if (picked.empty()) return std::nullopt;
-    return ChildrenForward{std::move(evalCtx), std::move(picked), separate};
+    return ChildrenForward{std::move(evalCtx), std::move(picked), separate, std::move(pickedIndices)};
+}
+
+// Syntactic only -- whether the flag is actually TRUE still needs the
+// argument evaluated, but gating on its presence first means an ordinary
+// children() call never has its arguments resolved twice.
+bool Evaluator::isSeparatingChildrenCall(const oscad::ASTNode& stmt) {
+    if (stmt.kind() != oscad::NodeKind::ModularCall) return false;
+    const auto& call = static_cast<const oscad::ModularCall&>(stmt);
+    if (!call.name || call.name->name != "children") return false;
+    size_t positional = 0;
+    for (const auto& arg : call.arguments) {
+        if (arg->kind() == oscad::NodeKind::NamedArgument) {
+            if (static_cast<const oscad::NamedArgument&>(*arg).name->name == "separate") return true;
+        } else if (++positional == 2) {
+            return true;  // children(index, separate) positionally
+        }
+    }
+    return false;
+}
+
+std::optional<std::vector<const oscad::ASTNode*>> Evaluator::expandSeparatingChildren(const oscad::ModularCall& call,
+                                                                                       EvalContext& ctx) {
+    auto [args, effCtx] = resolveCallArgs(*this, call.arguments, ctx);
+    std::optional<ChildrenForward> fwd = prepareChildrenForward(args, effCtx);
+    if (!fwd) return std::vector<const oscad::ASTNode*>{};  // selects nothing -> no statements at all
+    if (!fwd->separate) {
+        // ponytail: `separate` written but falsey -- tell the caller to run
+        // the original statement, which resolves its arguments a second
+        // time. Only observable if an argument expression has side effects
+        // (echo/rands inside `children(0, someFalseFlag)`); building a
+        // faithful single-statement equivalent instead would cost a
+        // synthetic vector-literal node for a shape nobody writes.
+        return std::nullopt;
+    }
+    std::vector<const oscad::ASTNode*> out;
+    out.reserve(fwd->pickedIndices.size());
+    for (size_t idx : fwd->pickedIndices) out.push_back(makeChildrenIndexCall(call, idx));
+    return out;
+}
+
+const oscad::ASTNode* Evaluator::makeChildrenIndexCall(const oscad::ModularCall& origin, size_t index) {
+    std::vector<std::unique_ptr<oscad::Argument>> args;
+    args.push_back(std::make_unique<oscad::PositionalArgument>(
+        origin.position(), std::make_unique<oscad::NumberLiteral>(origin.position(), static_cast<double>(index))));
+    auto call = std::make_unique<oscad::ModularCall>(
+        origin.position(), std::make_unique<oscad::Identifier>(origin.position(), "children"), std::move(args),
+        std::vector<std::unique_ptr<oscad::ASTNode>>{});
+    // Position copied from the call the author actually wrote, so a warning
+    // or a click-to-source lands on that line rather than nowhere.
+    //
+    // No scope is set: every consumer falls back to the evaluating
+    // context's own scope for a node without one (see evalChildren's runAll
+    // in stmt_eval.cpp), which is exactly where this call should resolve.
+    const oscad::ASTNode* raw = call.get();
+    syntheticNodes_.push_back(std::move(call));
+    return raw;
+}
+
+std::vector<const oscad::ASTNode*> Evaluator::expandChildStatements(
+    const std::vector<std::unique_ptr<oscad::ASTNode>>& block, EvalContext& ctx) {
+    std::vector<const oscad::ASTNode*> out;
+    out.reserve(block.size());
+    for (const auto& stmtPtr : block) {
+        const oscad::ASTNode* stmt = stmtPtr.get();
+        if (!isSeparatingChildrenCall(*stmt)) {
+            out.push_back(stmt);
+            continue;
+        }
+        std::optional<std::vector<const oscad::ASTNode*>> expanded =
+            expandSeparatingChildren(static_cast<const oscad::ModularCall&>(*stmt), ctx);
+        if (!expanded) {
+            out.push_back(stmt);
+            continue;
+        }
+        for (const oscad::ASTNode* n : *expanded) out.push_back(n);
+    }
+    return out;
 }
 
 void Evaluator::builtinChildren(const CallArgs& args, EvalContext& ctx) {
     std::optional<ChildrenForward> fwd = prepareChildrenForward(args, ctx);
     if (!fwd) return;
-    const size_t before = currentTreeFrameSize();
     evalChildren(fwd->nodes, fwd->evalCtx);
-    if (fwd->separate) markSeparateOperands(treeStack_.back(), before);
 }
 
 } // namespace oscadeval