openscad-cpp-evaluator 0.13.4__tar.gz → 0.13.7__tar.gz

{openscad_cpp_evaluator-0.13.4 → openscad_cpp_evaluator-0.13.7}/PKG-INFO

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

{openscad_cpp_evaluator-0.13.4 → openscad_cpp_evaluator-0.13.7}/include/openscad_cpp_evaluator/bytecode.hpp

@@ -261,7 +261,9 @@ enum class Op {
     CallModule,
 
     // -- Builtin-wrap compilation (closes the "NativeStatement gap" for ----
-    // -- translate/rotate/scale/mirror/multmatrix/resize/color/#/%/!) ------
+    // -- translate/rotate/scale/mirror/multmatrix/resize/color/#/%/!, ------
+    // -- hull/minkowski/render/linear_extrude/rotate_extrude/projection/ ---
+    // -- offset/roof) --------------------------------------------------------
     // A builtin-with-children statement that isn't a "call" the way
     // Op::CallModule's target is (no callStack_/profiling participation,
     // no named scope with upvalue semantics -- see CompiledChunk::
@@ -284,31 +286,41 @@ enum class Op {
     // (mirrors Evaluator::buildTreeNode's own ordering exactly -- doing
     // this AFTER would silently drop uncacheable/ManifoldCache taint
     // tracking for a rands() call embedded in the wrapper's own
-    // arguments), computes this site's own params (and, for Transform/
-    // Color kinds, a possibly-$-scoped child EvalContext, pushed onto
-    // f.ctxChain unconditionally -- Modifier kind needs neither params
-    // nor a ctx push), pushes a fresh ev.treeStack_ frame, and stashes
-    // {params, randsBefore, siteIdx} onto VmFrame::builtinWrapStack (a
-    // real per-frame LIFO stack, not a single slot: Push/PopBuiltinWrap
-    // pairs can nest or sequence within one frame's own instruction
-    // stream, e.g. `translate(a) translate(b) recur();`). The compiler
-    // always emits a plain Op::CheckDebugStatement immediately before
-    // this (see emitBuiltinWrap, bytecode_compiler.cpp), mirroring
-    // ModularEcho/ModularAssert's own pattern -- NOT skipped the way
-    // Op::CallModule's own call site skips one: this is a genuine
-    // statement doing real work here, unlike a module call (which
-    // transfers control to a declaration whose OWN body statements each
-    // get their own check instead).
+    // arguments), computes this site's own params for every kind except
+    // Modifier (empty, no ctx push) and Roof (deferred to Pop -- see
+    // BuiltinWrapSite's own doc comment) via that kind's own native
+    // compute function (computeTransformParams/computeColorParams/etc.,
+    // builtins.hpp) -- always a possibly-$-scoped child EvalContext,
+    // pushed onto f.ctxChain unconditionally for every non-Modifier kind
+    // (Roof pushes it too, params or not) -- pushes a fresh ev.treeStack_
+    // frame, and stashes {params, randsBefore, siteIdx, (Roof only)
+    // deferredArgs} onto VmFrame::builtinWrapStack (a real per-frame LIFO
+    // stack, not a single slot: Push/PopBuiltinWrap pairs can nest or
+    // sequence within one frame's own instruction stream, e.g.
+    // `translate(a) translate(b) recur();`). The compiler always emits a
+    // plain Op::CheckDebugStatement immediately before this (see
+    // emitBuiltinWrap, bytecode_compiler.cpp), mirroring ModularEcho/
+    // ModularAssert's own pattern -- NOT skipped the way Op::CallModule's
+    // own call site skips one: this is a genuine statement doing real
+    // work here, unlike a module call (which transfers control to a
+    // declaration whose OWN body statements each get their own check
+    // instead).
     PushBuiltinWrap,
 
     // Closes the matching Op::PushBuiltinWrap bracket: pops
     // VmFrame::builtinWrapStack's own top entry FIRST (before anything
     // that can itself throw, e.g. Evaluator::setTreeDepthOrThrow below --
     // so the exception-teardown path's own pending count is already
-    // correct if THIS throws), pops the ctx push Push made (Transform/
-    // Color kinds only), pops ev.treeStack_ to retrieve the children this
-    // bracket's own body produced, and builds the tagged CSGNode exactly
-    // like Evaluator::buildTreeNode's own post-resolveBody() half does
+    // correct if THIS throws); for Roof only, computes `pending.params`
+    // HERE via computeRoofParams(ev, pending.deferredArgs, ctx) -- the one
+    // kind whose params computation has an observable side effect
+    // (ev.warn()) that must stay ordered AFTER children, unlike every
+    // other kind's params (computed at Push, before children, since
+    // nothing else in this group has an order-sensitive side effect); pops
+    // the ctx Push made (every kind except Modifier); pops ev.treeStack_
+    // to retrieve the children this bracket's own body produced, and
+    // builds the tagged CSGNode exactly like Evaluator::buildTreeNode's
+    // own post-resolveBody() half does
     // (kind/node/isBuiltin=true/children/params/uncacheable/
     // setTreeDepthOrThrow), pushing it onto the new top of treeStack_. a
     // = index into CompiledChunk::builtinWrapSites (same site Push used).
@@ -325,6 +337,112 @@ enum class Op {
     // same seam, now a counter).
     PopBuiltinWrap,
 
+    // -- CSG-wrap compilation (closes the LAST native-reentry source in ----
+    // -- the original NativeStatement gap: union()/difference()/           -
+    // -- intersection()/intersection_for) -----------------------------------
+    // union()/difference()/intersection() weren't covered by the original
+    // Op::PushBuiltinWrap (see that op's own doc comment) because they need
+    // bespoke bookkeeping PushBuiltinWrap's single all-children bracket
+    // doesn't do: Evaluator's own resolveCsg (booleans.cpp) evaluates each
+    // TOP-LEVEL child statement of the block SEPARATELY and records how
+    // many CSGNodes it individually contributed ("group_sizes") -- e.g.
+    // `difference(){ A; B; C; }` = A - (B u C), preserving A's own group
+    // even when A itself expands to more than one body (an attachable()-
+    // style call returning parent+children as one operand). A flat
+    // all-children bracket the way Transform/Color/Modifier use would lose
+    // that grouping entirely. This op pair (PushCsgWrap/PopCsgWrap) plus
+    // Op::CsgGroupStart/CsgGroupEnd (below) replicate resolveCsg's exact
+    // two-pass shape (all assignments first, THEN one evalChildren-per-
+    // geometry-statement) as inline compiled bytecode instead, exactly as
+    // PushBuiltinWrap already did for translate/rotate/scale/mirror/
+    // multmatrix/resize/color/#/%/! -- same rationale (a recursive
+    // union()/difference()/intersection()-wrapped module chain was still a
+    // real Windows native-reentry depth risk, just never independently
+    // fixed when PushBuiltinWrap's own set was).
+    //
+    // a = index into CompiledChunk::csgWrapSites. Runtime handler: captures
+    // ev.randsCallCount() BEFORE argument resolution (same rands-in-args
+    // taint reasoning as PushBuiltinWrap); for a `hasArgs` site (union/
+    // difference/intersection) resolves the (rare, $-only) arguments via
+    // resolveCallArgs exactly like resolveCsg itself does (discarding the
+    // positional/named result -- these take no real parameters -- keeping
+    // only the possibly-$-scoped child ctx) and pushes that ctx onto
+    // f.ctxChain unconditionally (mirrors Transform/Color's own
+    // unconditional push -- a bare `union() {...}` with no `$fn=...`
+    // override still pushes a ctx that's merely a copy, cheap and uniform
+    // rather than a special-cased branch); intersection_for (`hasArgs`
+    // false -- it isn't a call, has no `.arguments`) skips both entirely,
+    // matching resolveIntersectionFor's own use of its caller's ctx
+    // unchanged (its per-ITERATION child ctxs are a completely separate
+    // concern, handled by the compiled cartesian loop's own Op::
+    // ForIterNext, not by this bracket). Either way: pushes a fresh
+    // ev.treeStack_ frame (every child statement's/iteration's own
+    // CSGNode(s) land flat in this ONE frame -- mirrors Evaluator::
+    // buildTreeNode/evalModularCall's own single treeStack_.emplace_back()
+    // around the whole call, not one per group), and stashes {op,
+    // randsBefore, siteIdx, empty groupSizes} onto VmFrame::csgWrapStack (a
+    // real per-frame LIFO, same reasoning as builtinWrapStack: nested/
+    // sequenced CSG wraps within one frame's own instruction stream, e.g.
+    // `union() { difference() {...} }`). The compiler always emits a plain
+    // Op::CheckDebugStatement immediately before this (see emitCsgWrap/
+    // compileIntersectionForLoop, bytecode_compiler.cpp), mirroring
+    // emitBuiltinWrap's own pattern -- this is a genuine statement doing
+    // real work here, not a call transferring control to a declaration.
+    PushCsgWrap,
+
+    // Opens one "group" within an already-open Op::PushCsgWrap bracket --
+    // emitted immediately before each top-level GEOMETRY child statement's
+    // own inline-compiled bytecode (compileStatementList of exactly that
+    // one statement). Records ev.treeStack_.back().size() into
+    // csgWrapStack.back().groupStartSize -- always operates on the
+    // TOPMOST (innermost still-open) csgWrapStack entry, matching
+    // PopBuiltinWrap's own back()-is-always-mine LIFO discipline, so no
+    // operand is needed. Assignments among the block's children are
+    // compiled separately, BEFORE any CsgGroupStart/End pair at all (see
+    // emitCsgWrap) -- mirrors resolveCsg's own two-pass split exactly
+    // (Evaluator::evalChildren(assignNodes, effCtx) always runs to
+    // completion before the per-geoNode loop starts).
+    CsgGroupStart,
+
+    // Closes the matching Op::CsgGroupStart: computes
+    // ev.treeStack_.back().size() - csgWrapStack.back().groupStartSize
+    // (how many CSGNodes THIS one top-level statement just contributed,
+    // however many that turned out to be -- 0 for a statement whose own
+    // evaluation spliced nothing, e.g. a no-op unknown-module warning; >1
+    // for an attachable()-style multi-body operand) and appends it, as a
+    // Value, onto csgWrapStack.back().groupSizes -- exactly one entry per
+    // top-level geometry statement, in source order, mirroring resolveCsg's
+    // own `groupSizes.push_back(Value{...})` loop.
+    CsgGroupEnd,
+
+    // 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-
+    // teardown's own pending count must already be right" reasoning as
+    // PopBuiltinWrap), pops the ctx Push pushed (only when `hasArgs`),
+    // pops ev.treeStack_ to retrieve every group's own CSGNode(s) (flat,
+    // exactly like resolveCsg's own `children` result -- group boundaries
+    // live only in group_sizes, never in the CSGNode list's own shape), and
+    // builds the tagged CSGNode exactly like Evaluator::buildTreeNode's own
+    // post-resolveBody() half does, with params = {"group_sizes":
+    // ValueList(pending.groupSizes)} plus, only when `includeOpParam`,
+    // "op": site.op -- byte-for-byte what native resolveCsg returns for
+    // union/difference/intersection (generateCsg needs "op" to
+    // disambiguate the ONE function it shares across all 3) and what
+    // native resolveIntersectionFor returns (no "op" key at all --
+    // generateIntersectionFor is its own dedicated, separately-registered
+    // function, never needs one) -- pushing the result onto the new top of
+    // treeStack_. a = index into CompiledChunk::csgWrapSites (same site
+    // Push used).
+    //
+    // teardownVmCallStackDownTo's own exception path (bytecode_vm.cpp) pops
+    // frame->csgWrapStack.size() additional treeStack_ entries per
+    // torn-down frame, alongside its existing builtinWrapStack/
+    // ownsModuleSplice accounting -- same reasoning as PopBuiltinWrap's own
+    // doc comment: an exception can leave N of these brackets open in one
+    // frame.
+    PopCsgWrap,
+
     // A `children()` / `children(N)` statement -- the runtime-varying
     // sibling of Op::CallModule/Op::PushBuiltinWrap, closing the LAST
     // dominant native-reentry source (BOSL2's attachable() calls
@@ -367,38 +485,58 @@ enum class Op {
     // no separate site table needed).
     CallChildren,
 
-    // A single "native passthrough" statement -- intersection_for,
-    // union/difference/intersection and every other builtin
-    // module call NOT covered by Op::PushBuiltinWrap (see that op's own
-    // doc comment for exactly which builtins ARE covered), the `*`
-    // modifier's own no-op case, or a user-module call that didn't
-    // resolve at compile time (shadowed, forward-declared, or otherwise
-    // not statically known) -- anything compileStatementList doesn't give
-    // its own real bytecode. (Assignment/ModularEcho/ModularAssert/
-    // ModularLet used to fall here too; they now have their own real
-    // bytecode -- Op::StoreModuleVar/Op::Echo/Op::AssertStatement/
-    // Op::OpenLetScope+StoreLetVar -- purely a throughput change, since
-    // none of these were ever the recursion-depth risk this compiler
-    // targets. `#`/`%`/`!` modifiers and translate/rotate/scale/mirror/
-    // multmatrix/resize/color used to fall here too, for the SAME
-    // throughput reasoning -- WRONG in that one specific case: a
-    // recursive module call wrapped in one of these is exactly the
-    // pattern that made this op's own native reentry a genuine Windows
-    // crash risk in practice, not just a missed optimization. See
-    // Op::PushBuiltinWrap's own doc comment for the real story and the
-    // fix. children() fell here too, and was the LAST and largest such
-    // reentry source once PushBuiltinWrap's own set was covered -- it
-    // now has Op::CallChildren, above.)
+    // A single "native passthrough" statement -- every builtin module call
+    // not covered by Op::PushBuiltinWrap/Op::PushCsgWrap (see those ops'
+    // own doc comments for exactly which builtins ARE covered -- cube/
+    // sphere/import/text/surface/etc., the true LEAVES that never take a
+    // `children` block at all, so wrapping a recursive call inside one
+    // isn't even syntactically possible), the `*` modifier's own no-op
+    // case, or a user-module call that didn't resolve at compile time
+    // (shadowed, forward-declared, or otherwise not statically known) --
+    // anything compileStatementList doesn't give its own real bytecode.
+    // (Assignment/ModularEcho/ModularAssert/ModularLet used to fall here
+    // too; they now have their own real bytecode -- Op::StoreModuleVar/
+    // Op::Echo/Op::AssertStatement/Op::OpenLetScope+StoreLetVar -- purely
+    // a throughput change, since none of these were ever the recursion-
+    // depth risk this compiler targets. `#`/`%`/`!` modifiers and
+    // translate/rotate/scale/mirror/multmatrix/resize/color used to fall
+    // here too, for the SAME throughput reasoning -- WRONG in that one
+    // specific case: a recursive module call wrapped in one of these is
+    // exactly the pattern that made this op's own native reentry a
+    // genuine Windows crash risk in practice, not just a missed
+    // optimization. See Op::PushBuiltinWrap's own doc comment for the
+    // real story and the fix. children() fell here too, and was the LAST
+    // and largest such reentry source once PushBuiltinWrap's own set was
+    // covered -- it now has Op::CallChildren, above. union()/difference()/
+    // intersection() fell here too, and were the last remaining REAL
+    // native-reentry risk among ModularCall-shaped statements (bespoke
+    // group_sizes bookkeeping meant they couldn't just reuse
+    // PushBuiltinWrap's own bracket) -- they now have Op::PushCsgWrap,
+    // above. hull()/minkowski()/render()/linear_extrude()/rotate_extrude()/
+    // projection()/offset()/roof() fell here too, closing out every
+    // remaining non-leaf builtin whose OWN children can wrap a recursive
+    // call in an idiomatic script (a rounded-hull chain, a recursive
+    // extrude, etc.) -- they now share Op::PushBuiltinWrap's own bracket
+    // via 6 new Kind values (Passthrough/LinearExtrude/RotateExtrude/
+    // Projection/Offset/Roof), reusing the exact same mechanism rather
+    // than inventing another. intersection_for -- NOT a ModularCall at
+    // all, its own NodeKind -- fell here too and was the true LAST
+    // native-reentry gap; it now shares Op::PushCsgWrap's own bracket
+    // (CsgWrapSite::hasArgs/includeOpParam both false for it) wrapped
+    // around a compiled cartesian-product loop reusing Op::ForIterNext/
+    // ForIterEnd/NativeIterMaterialize verbatim (see
+    // compileIntersectionForLoop, bytecode_compiler.cpp) -- one Op::
+    // CsgGroupStart/CsgGroupEnd pair per full iteration instead of per
+    // source statement. Every non-leaf builtin construct is covered now.)
     // a = index into CompiledChunk::nativeStatements. Runtime just does
     // what Evaluator::evalChildren's own per-statement loop already does
     // for one node: derive childCtx via ctx.withScope(...), checkDebug,
     // evalStatement. These are still "leaf-shaped" for what's left here
-    // after Op::PushBuiltinWrap peeled off the proven-risky subset: real
-    // recursion safety for a recursive module chain is covered by
-    // CallModule/PushBuiltinWrap/ForIterNext/the Jump-based if/for control
-    // flow, not by how many of THESE sit alongside them in the same body
-    // -- true again now that the one construct that violated it
-    // (translate()-wrapped recursion) has its own real bytecode instead.
+    // now that Op::PushBuiltinWrap/Op::PushCsgWrap have peeled off every
+    // proven-risky construct: real recursion safety for a recursive module
+    // chain is covered by CallModule/PushBuiltinWrap/PushCsgWrap/
+    // ForIterNext/the Jump-based if/for control flow, not by how many of
+    // THESE sit alongside them in the same body.
     NativeStatement,
 
     // If/if-else's own condition, evaluated NATIVELY (Evaluator::
@@ -714,8 +852,8 @@ struct CompiledChunk {
     // replay the native param-resolution step and rebuild the tagged
     // CSGNode at Pop time.
     //
-    // `node`'s concrete type depends on `kind`: Transform/Color sites are
-    // genuine `ModularCall`s (down-cast to read `.name`/`.arguments`/
+    // `node`'s concrete type depends on `kind`: every kind except Modifier
+    // is a genuine `ModularCall` (down-cast to read `.name`/`.arguments`/
     // `.children`); Modifier sites are the wrapper node itself
     // (`ModularModifierHighlight`/`Background`/`ShowOnly` -- `!`/`#`/`%`;
     // `*`/Disable never reaches here, its child never evaluates at all,
@@ -727,10 +865,59 @@ struct CompiledChunk {
     // union of concrete pointers) because that's all Op::PopBuiltinWrap
     // itself ever needs `node` for: the resulting CSGNode's own
     // `node`/error-position field.
+    //
+    // Passthrough/LinearExtrude/RotateExtrude/Projection/Offset/Roof
+    // (added for hull()/minkowski()/render()/linear_extrude()/
+    // rotate_extrude()/projection()/offset()/roof()) share Transform/
+    // Color's exact push-time-computed-params shape, just via a different
+    // native compute function each (Op::PushBuiltinWrap's own runtime
+    // handler switches on `kind` to pick it) -- see that op's own doc
+    // comment for the one exception (Roof, whose params computation has
+    // to run at POP time instead, after children, to preserve an
+    // observable warn() ordering).
     struct BuiltinWrapSite {
-        enum class Kind { Transform, Color, Modifier };
+        enum class Kind {
+            Transform,
+            Color,
+            Modifier,
+            Passthrough,   // hull()/minkowski()/render() -- empty params, no compute function needed
+            LinearExtrude,
+            RotateExtrude,
+            Projection,
+            Offset,
+            Roof,          // computed at POP time, not PUSH -- see this struct's own doc comment
+        };
         Kind kind;
-        std::string tagName; // "translate"/"rotate"/.../"color"/"highlight"/"background"/"show_only"
+        std::string tagName; // "translate"/"rotate"/.../"color"/"highlight"/"background"/"show_only"/"hull"/...
+        const oscad::ASTNode* node = nullptr;
+    };
+
+    // One Op::PushCsgWrap/PopCsgWrap site pair -- see those ops' own doc
+    // comments for the full "why union/difference/intersection need
+    // bespoke group_sizes bookkeeping instead of just reusing
+    // BuiltinWrapSite" rationale. `op` is "union"/"difference"/
+    // "intersection" (the 3 names resolveDispatch() maps to resolveCsg,
+    // always a genuine ModularCall) OR "intersection_for" (NOT a
+    // ModularCall -- a distinct NodeKind/ModuleInstantiation subtype with
+    // its own `.assignments`/`.body`, see compileIntersectionForLoop,
+    // bytecode_compiler.cpp) -- `node` is therefore the generic ASTNode*
+    // BuiltinWrapSite's own Modifier kind already established this pattern
+    // for, down-cast to ModularCall only when `hasArgs` is true.
+    //
+    // `hasArgs`/`includeOpParam` are both true for union/difference/
+    // intersection, both false for intersection_for: it isn't a call at
+    // all (no `.arguments`, so Op::PushCsgWrap's handler must skip
+    // resolveCallArgs/the ctx push entirely -- matches native
+    // resolveIntersectionFor, which uses the SAME ctx its caller passed in
+    // unchanged, never a $-scoped child of its own), and its own
+    // CSGParams has no "op" key at all (generateIntersectionFor is a
+    // dedicated, separately-registered generate function, unlike
+    // generateCsg which needs "op" in params to disambiguate union/
+    // difference/intersection from ONE shared function).
+    struct CsgWrapSite {
+        std::string op;
+        bool hasArgs = true;
+        bool includeOpParam = true;
         const oscad::ASTNode* node = nullptr;
     };
 
@@ -796,6 +983,7 @@ struct CompiledChunk {
     // own doc comments, above) -- always empty for a function chunk.
     std::vector<ModuleCallSite> moduleCallSites;
     std::vector<BuiltinWrapSite> builtinWrapSites;
+    std::vector<CsgWrapSite> csgWrapSites;
     std::vector<AssertSite> assertSites;
     std::vector<const oscad::Expression*> nativeExprs;
     std::vector<const oscad::ASTNode*> nativeStatements;

{openscad_cpp_evaluator-0.13.4 → openscad_cpp_evaluator-0.13.7}/include/openscad_cpp_evaluator/bytecode_vm.hpp

@@ -2,6 +2,7 @@
 
 #include "openscad_cpp_evaluator/bound_args.hpp"
 #include "openscad_cpp_evaluator/bytecode.hpp"
+#include "openscad_cpp_evaluator/call_args.hpp"
 #include "openscad_cpp_evaluator/csg_node.hpp"
 #include "openscad_cpp_evaluator/eval_context.hpp"
 #include "openscad_cpp_evaluator/value.hpp"
@@ -28,6 +29,33 @@ struct PendingBuiltinWrap {
     CSGParams params;
     std::uint64_t randsBefore = 0;
     int siteIdx = -1;
+    // Only populated for BuiltinWrapSite::Kind::Roof -- the already-
+    // resolved call arguments, retained across the whole bracket so
+    // Op::PopBuiltinWrap's handler can compute roof()'s own params AFTER
+    // children finish (computeRoofParams needs them; re-running
+    // resolveCallArgs at Pop time instead would re-evaluate every argument
+    // expression a second time -- double rands()/side effects). Every
+    // other kind computes its params at Push time and leaves this default-
+    // empty.
+    CallArgs deferredArgs;
+};
+
+// One still-open Op::PushCsgWrap bracket's own state -- see that op's own
+// doc comment (bytecode.hpp) for the full contract. `groupSizes` is built
+// up incrementally, one entry per Op::CsgGroupStart/CsgGroupEnd pair (one
+// per top-level GEOMETRY child statement); `groupStartSize` is scratch
+// space for the CURRENTLY OPEN group only (set by CsgGroupStart, consumed
+// by the matching CsgGroupEnd) -- safe as a single scalar, not a stack of
+// its own, because groups within one CSG wrap are siblings in sequence,
+// never nested (unlike PushCsgWrap brackets themselves, which CAN nest,
+// e.g. `union() { difference() {...} }` -- that's what makes
+// VmFrame::csgWrapStack itself a real LIFO, below).
+struct PendingCsgWrap {
+    std::string op;
+    std::uint64_t randsBefore = 0;
+    int siteIdx = -1;
+    std::vector<Value> groupSizes;
+    size_t groupStartSize = 0;
 };
 
 // One ListCompFor/statement-for assignment's own materialized iteration
@@ -127,6 +155,15 @@ struct VmFrame {
     // existing invariant ("whoever pops this frame drains its own open
     // brackets first") already covers it.
     std::vector<PendingBuiltinWrap> builtinWrapStack;
+    // Op::PushCsgWrap's own per-frame LIFO -- same role/lifetime/teardown
+    // discipline as builtinWrapStack, just for union()/difference()/
+    // intersection() (see PendingCsgWrap's own doc comment, above, and
+    // Op::PushCsgWrap's, bytecode.hpp). Not explicitly cleared in
+    // releaseVmFrame, same as builtinWrapStack/accumStack/ctxChain -- the
+    // existing invariant ("whoever pops this frame drains its own open
+    // brackets first", normally via matched Push/Pop, or via
+    // teardownVmCallStackDownTo on the exception path) already covers it.
+    std::vector<PendingCsgWrap> csgWrapStack;
     // The ORIGINAL callee name at push time, used by
     // Evaluator::exitUserCallSuccess's own returnHook call when this frame
     // carries a bracket -- deliberately NOT updated by a later tail hop

{openscad_cpp_evaluator-0.13.4 → openscad_cpp_evaluator-0.13.7}/pyproject.toml

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

{openscad_cpp_evaluator-0.13.4 → openscad_cpp_evaluator-0.13.7}/src/builtins/builtins.hpp

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "openscad_cpp_evaluator/call_args.hpp"
 #include "openscad_cpp_evaluator/dispatch.hpp"
 
 #include <optional>
@@ -153,21 +154,30 @@ std::vector<ColoredBody> generateMinkowski(Evaluator& ev, const CSGParams& param
                                             const oscad::ASTNode& node);
 
 // linear_extrude()/rotate_extrude()/projection() -- extrude.cpp.
+// computeXParams: the pure "resolve args, build params" half, split out
+// like computeTransformParams/computeColorParams so Op::PushBuiltinWrap's
+// own runtime handler can call it directly (bytecode_vm.cpp) instead of
+// through the whole resolve function, whose OTHER half (evalChildren) is
+// exactly the native reentry that split exists to avoid.
+BuiltinWrapParams computeLinearExtrudeParams(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx);
 CSGParams resolveLinearExtrude(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx);
 std::vector<ColoredBody> generateLinearExtrude(Evaluator& ev, const CSGParams& params,
                                                 const std::vector<std::unique_ptr<CSGNode>>& children,
                                                 const oscad::ASTNode& node);
 
+BuiltinWrapParams computeRotateExtrudeParams(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx);
 CSGParams resolveRotateExtrude(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx);
 std::vector<ColoredBody> generateRotateExtrude(Evaluator& ev, const CSGParams& params,
                                                 const std::vector<std::unique_ptr<CSGNode>>& children,
                                                 const oscad::ASTNode& node);
 
+BuiltinWrapParams computeProjectionParams(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx);
 CSGParams resolveProjection(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx);
 std::vector<ColoredBody> generateProjection(Evaluator& ev, const CSGParams& params,
                                              const std::vector<std::unique_ptr<CSGNode>>& children,
                                              const oscad::ASTNode& node);
 
+BuiltinWrapParams computeOffsetParams(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx);
 CSGParams resolveOffset(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx);
 std::vector<ColoredBody> generateOffset(Evaluator& ev, const CSGParams& params,
                                          const std::vector<std::unique_ptr<CSGNode>>& children, const oscad::ASTNode& node);
@@ -176,6 +186,13 @@ std::vector<ColoredBody> generateOffset(Evaluator& ev, const CSGParams& params,
 // contour polygons) + Tier 3 (SDF/level-set fallback) only, per the plan --
 // Tier 2 (general multi-contour/hole straight skeleton) is a named,
 // documented follow-up, not silently dropped (see CLAUDE.md).
+// computeRoofParams: UNLIKE computeLinearExtrudeParams and friends above,
+// this is the params-computation half taken from AFTER evalChildren (it
+// calls ev.warn(), an observable side effect that must stay ordered after
+// any child's own echo/warn output) -- takes already-resolved CallArgs,
+// not a raw node+ctx, since Op::PushBuiltinWrap's own runtime handler
+// calls this at POP time. See its own doc comment (roof.cpp).
+CSGParams computeRoofParams(Evaluator& ev, const CallArgs& args, EvalContext& effCtx);
 CSGParams resolveRoof(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx);
 std::vector<ColoredBody> generateRoof(Evaluator& ev, const CSGParams& params,
                                        const std::vector<std::unique_ptr<CSGNode>>& children, const oscad::ASTNode& node);

{openscad_cpp_evaluator-0.13.4 → openscad_cpp_evaluator-0.13.7}/src/builtins/extrude.cpp

@@ -13,10 +13,21 @@ namespace oscadeval {
 // mirrors _resolve_linear_extrude/_generate_linear_extrude. `scale` is
 // either a single number (applied to both X/Y) or a [x,y] pair for the top
 // face; the bottom face is always full-size.
-
-CSGParams resolveLinearExtrude(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx) {
+//
+// Split into computeLinearExtrudeParams (pure, no children-evaluation side
+// effect) + resolveLinearExtrude (adds the evalChildren call) so Op::
+// PushBuiltinWrap's own runtime handler (bytecode_vm.cpp) can call the pure
+// half directly instead of going through the whole resolve function --
+// exactly the same split computeTransformParams/computeColorParams already
+// use, extended to this builtin. Params computation here has no observable
+// side effect of its own (no warn()/echo()/rands() call), so moving it
+// before evalChildren (unlike this function's own former single-body
+// shape, which computed params AFTER children like every other builtin
+// still not covered by PushBuiltinWrap) is behaviorally unobservable --
+// see computeRoofParams's own doc comment (roof.cpp) for the one builtin
+// in this group where that ISN'T true and a different split was needed.
+BuiltinWrapParams computeLinearExtrudeParams(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx) {
     auto [args, effCtx] = resolveCallArgs(ev, node.arguments, ctx);
-    ev.evalChildren(node.children, effCtx);
 
     const double height = toDoubleLenient(getArg(args, 0, "height", Value{1.0}));
     const bool center = truthy(getArg(args, std::nullopt, "center", Value{false}));
@@ -40,7 +51,13 @@ CSGParams resolveLinearExtrude(Evaluator& ev, const oscad::ModularCall& node, Ev
     params["scale_x"] = Value{scaleX};
     params["scale_y"] = Value{scaleY};
     params["color"] = colorToValue(effCtx.color);
-    return params;
+    return BuiltinWrapParams{std::move(params), std::move(effCtx)};
+}
+
+CSGParams resolveLinearExtrude(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx) {
+    BuiltinWrapParams result = computeLinearExtrudeParams(ev, node, ctx);
+    ev.evalChildren(node.children, result.ctx);
+    return std::move(result.params);
 }
 
 std::vector<ColoredBody> generateLinearExtrude(Evaluator& ev, const CSGParams& params,
@@ -65,9 +82,10 @@ std::vector<ColoredBody> generateLinearExtrude(Evaluator& ev, const CSGParams& p
 // so resolve only caches $fn/$fa/$fs for generate to call fnSegments()
 // with once the real max-x bound exists.
 
-CSGParams resolveRotateExtrude(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx) {
+// Split the same way as computeLinearExtrudeParams, above -- see its own
+// doc comment.
+BuiltinWrapParams computeRotateExtrudeParams(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx) {
     auto [args, effCtx] = resolveCallArgs(ev, node.arguments, ctx);
-    ev.evalChildren(node.children, effCtx);
 
     const double angle = toDoubleLenient(getArg(args, 0, "angle", Value{360.0}));
 
@@ -84,7 +102,13 @@ CSGParams resolveRotateExtrude(Evaluator& ev, const oscad::ModularCall& node, Ev
     params["fa"] = Value{dynOr("$fa", 12.0)};
     params["fs"] = Value{dynOr("$fs", 2.0)};
     params["color"] = colorToValue(effCtx.color);
-    return params;
+    return BuiltinWrapParams{std::move(params), std::move(effCtx)};
+}
+
+CSGParams resolveRotateExtrude(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx) {
+    BuiltinWrapParams result = computeRotateExtrudeParams(ev, node, ctx);
+    ev.evalChildren(node.children, result.ctx);
+    return std::move(result.params);
 }
 
 std::vector<ColoredBody> generateRotateExtrude(Evaluator& ev, const CSGParams& params,
@@ -108,12 +132,19 @@ std::vector<ColoredBody> generateRotateExtrude(Evaluator& ev, const CSGParams& p
 // FillRule::Positive to clean up self-intersections Manifold's own
 // Project() can produce.
 
-CSGParams resolveProjection(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx) {
+// Split the same way as computeLinearExtrudeParams, above -- see its own
+// doc comment.
+BuiltinWrapParams computeProjectionParams(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx) {
     auto [args, effCtx] = resolveCallArgs(ev, node.arguments, ctx);
-    ev.evalChildren(node.children, effCtx);
     CSGParams params;
     params["cut"] = Value{truthy(getArg(args, std::nullopt, "cut", Value{false}))};
-    return params;
+    return BuiltinWrapParams{std::move(params), std::move(effCtx)};
+}
+
+CSGParams resolveProjection(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx) {
+    BuiltinWrapParams result = computeProjectionParams(ev, node, ctx);
+    ev.evalChildren(node.children, result.ctx);
+    return std::move(result.params);
 }
 
 std::vector<ColoredBody> generateProjection(Evaluator&, const CSGParams& params,
@@ -145,9 +176,10 @@ std::vector<ColoredBody> generateProjection(Evaluator&, const CSGParams& params,
 // (JoinType::Square, or Miter if chamfer=true) are mutually exclusive;
 // neither given passes the first child through unchanged.
 
-CSGParams resolveOffset(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx) {
+// Split the same way as computeLinearExtrudeParams, above -- see its own
+// doc comment.
+BuiltinWrapParams computeOffsetParams(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx) {
     auto [args, effCtx] = resolveCallArgs(ev, node.arguments, ctx);
-    ev.evalChildren(node.children, effCtx);
 
     const Value rArg = getArg(args, std::nullopt, "r", Value{});
     const Value deltaArg = getArg(args, std::nullopt, "delta", Value{});
@@ -161,7 +193,13 @@ CSGParams resolveOffset(Evaluator& ev, const oscad::ModularCall& node, EvalConte
         params["segs"] = Value{static_cast<double>(fnSegmentsFromCtx(effCtx, std::fabs(toDoubleLenient(rArg))))};
     }
     params["color"] = colorToValue(effCtx.color);
-    return params;
+    return BuiltinWrapParams{std::move(params), std::move(effCtx)};
+}
+
+CSGParams resolveOffset(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx) {
+    BuiltinWrapParams result = computeOffsetParams(ev, node, ctx);
+    ev.evalChildren(node.children, result.ctx);
+    return std::move(result.params);
 }
 
 std::vector<ColoredBody> generateOffset(Evaluator&, const CSGParams& params, const std::vector<std::unique_ptr<CSGNode>>& children,