openscad-cpp-evaluator 0.40.0__tar.gz → 0.42.0__tar.gz

{openscad_cpp_evaluator-0.40.0 → openscad_cpp_evaluator-0.42.0}/CLAUDE.md

@@ -481,7 +481,10 @@ 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). `evalFunctionCall`'s
+  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`). `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.40.0 → openscad_cpp_evaluator-0.42.0}/PKG-INFO

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

{openscad_cpp_evaluator-0.40.0 → openscad_cpp_evaluator-0.42.0}/external/openscad_cpp_parser/include/openscad_cpp_parser/ast/expression.hpp

@@ -80,14 +80,22 @@ public:
 class RangeLiteral : public Primary {
 public:
     RangeLiteral(Position position, std::unique_ptr<Expression> start, std::unique_ptr<Expression> end,
-                 std::unique_ptr<Expression> step)
+                 std::unique_ptr<Expression> step, bool implicitStep = false)
         : Primary(NodeKind::RangeLiteral, std::move(position)), start(std::move(start)), end(std::move(end)),
-          step(std::move(step)) {}
+          step(std::move(step)), implicitStep(implicitStep) {}
 
     std::unique_ptr<Expression> start;
     std::unique_ptr<Expression> end;
     std::unique_ptr<Expression> step;
 
+    // True when the source wrote the two-argument form `[a:b]` and the step
+    // node below is the literal 1.0 this parser synthesized for it. Consumers
+    // that only need the value can ignore this and read `step` as always
+    // present; it exists because "the author did not choose a step" is not
+    // recoverable from the synthesized node, and the evaluator's backwards-range
+    // warning fires only for that case (an explicit step is taken as deliberate).
+    bool implicitStep = false;
+
     std::string toString() const override;
     void buildScope(Scope& parentScope) override;
 };

{openscad_cpp_evaluator-0.40.0 → openscad_cpp_evaluator-0.42.0}/external/openscad_cpp_parser/src/ast/expression.cpp

@@ -22,6 +22,10 @@ std::string NumberLiteral::toString() const {
 }
 
 std::string RangeLiteral::toString() const {
+    // Print back the form that was written. Emitting the synthesized step for
+    // a two-argument range would round-trip `[5:0]` into `[5 : 1 : 0]`, which
+    // reads identically but suppresses the evaluator's backwards-range warning.
+    if (implicitStep) return "[" + start->toString() + " : " + end->toString() + "]";
     return "[" + start->toString() + " : " + step->toString() + " : " + end->toString() + "]";
 }
 

{openscad_cpp_evaluator-0.40.0 → openscad_cpp_evaluator-0.42.0}/external/openscad_cpp_parser/src/grammar/driver.cpp

@@ -46,11 +46,13 @@ NodePtr makeUndefinedLiteral(ParserDriver& driver, const OscadLocation& loc) {
 }
 
 NodePtr makeRangeLiteral(ParserDriver& driver, const OscadLocation& loc, NodePtr start, NodePtr end, NodePtr step) {
-    if (!step) {
+    const bool implicitStep = !step;
+    if (implicitStep) {
         step = std::make_unique<NumberLiteral>(driver.toPosition(loc), 1.0);
     }
     return std::make_unique<RangeLiteral>(driver.toPosition(loc), nodeCast<Expression>(std::move(start)),
-                                           nodeCast<Expression>(std::move(end)), nodeCast<Expression>(std::move(step)));
+                                           nodeCast<Expression>(std::move(end)), nodeCast<Expression>(std::move(step)),
+                                           implicitStep);
 }
 
 NodePtr makePositionalArgument(ParserDriver& driver, const OscadLocation& loc, NodePtr expr) {

{openscad_cpp_evaluator-0.40.0 → openscad_cpp_evaluator-0.42.0}/external/openscad_cpp_parser/src/serialization/json_io.cpp

@@ -112,6 +112,7 @@ json toJsonImpl(const ASTNode& node, bool includePos) {
             j["start"] = valueToJson(n.start.get(), includePos);
             j["end"] = valueToJson(n.end.get(), includePos);
             j["step"] = valueToJson(n.step.get(), includePos);
+            if (n.implicitStep) j["implicitStep"] = true;
             break;
         }
         case NodeKind::ParameterDeclaration: {
@@ -410,7 +411,8 @@ const std::unordered_map<std::string, Builder>& registry() {
         {"RangeLiteral",
          [](const json& j, Position pos) -> std::unique_ptr<ASTNode> {
              return std::make_unique<RangeLiteral>(std::move(pos), childFromJson<Expression>(j, "start"),
-                                                    childFromJson<Expression>(j, "end"), childFromJson<Expression>(j, "step"));
+                                                    childFromJson<Expression>(j, "end"), childFromJson<Expression>(j, "step"),
+                                                    j.value("implicitStep", false));
          }},
         {"ParameterDeclaration",
          [](const json& j, Position pos) -> std::unique_ptr<ASTNode> {

{openscad_cpp_evaluator-0.40.0 → openscad_cpp_evaluator-0.42.0}/external/openscad_cpp_parser/tests/test_pretty_print.cpp

@@ -515,3 +515,16 @@ TEST(PrettyPrint, AssignmentRhsWithLeadingCommentAndTrailingLineComment) {
 // no other translation unit -- including this test file -- can name them.
 // Left as a known, permanent coverage ceiling rather than weakening the
 // encapsulation just to reach 100%.
+
+// The two-argument range keeps its shape through a print/reparse cycle.
+// It would be easy to always print the synthesized step, and the result
+// would still be a correct program -- but `[5:0]` and `[5:1:0]` mean
+// different things to the evaluator's backwards-range warning, so
+// reformatting a file must not quietly convert one into the other.
+TEST(PrettyPrint, ImplicitRangeStepSurvivesRoundTrip) {
+    auto ast = parseAst("a = [5:0];\nb = [5:1:0];\n");
+    const std::string printed = toOpenscad(ast);
+    EXPECT_NE(printed.find("[5 : 0]"), std::string::npos) << printed;
+    EXPECT_NE(printed.find("[5 : 1 : 0]"), std::string::npos) << printed;
+    expectStablePrint("a = [5:0];\nb = [5:1:0];\n");
+}

{openscad_cpp_evaluator-0.40.0 → openscad_cpp_evaluator-0.42.0}/include/openscad_cpp_evaluator/bytecode_vm.hpp

@@ -219,6 +219,10 @@ 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.40.0 → openscad_cpp_evaluator-0.42.0}/include/openscad_cpp_evaluator/csg_node.hpp

@@ -34,6 +34,16 @@ 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
     // like `node`. nullptr for a node resolved at top level.
@@ -73,4 +83,12 @@ 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.40.0 → openscad_cpp_evaluator-0.42.0}/include/openscad_cpp_evaluator/evaluator.hpp

@@ -190,6 +190,30 @@ 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
     // concatenating children's bodies for a kind with none registered).
@@ -342,6 +366,11 @@ 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.
+        bool separate = false;
     };
     std::optional<ChildrenForward> prepareChildrenForward(const CallArgs& args, EvalContext& ctx);
 
@@ -392,7 +421,12 @@ public:
     Value applyUnaryOp(oscad::NodeKind kind, const Value& v, const oscad::Position& pos);
     Value applyIndexAccess(const Value& obj, const Value& idx);
     Value applyMemberAccess(const Value& obj, const std::string& member);
-    Value applyRange(const Value& startV, const Value& endV, const Value& stepV);
+    // `implicitStep` is the RangeLiteral's own flag: true when the source
+    // wrote `[a:b]` and the parser supplied the 1.0. It only affects whether
+    // the backwards-range warning fires; the resulting value is the same
+    // either way. `pos` locates that warning.
+    Value applyRange(const Value& startV, const Value& endV, const Value& stepV, bool implicitStep = false,
+                     const oscad::Position* pos = nullptr);
 
     // Entry point for a call site resolved INSIDE compiled bytecode (the
     // CALL_FN opcode, bytecode_vm.cpp): `bound` is already fully evaluated

{openscad_cpp_evaluator-0.40.0 → openscad_cpp_evaluator-0.42.0}/include/openscad_cpp_evaluator/value.hpp

@@ -355,20 +355,6 @@ private:
 // it, keeping expandIterable() itself free of any Evaluator/echo coupling.
 using RangeTooManyFn = std::function<void(size_t count)>;
 
-// Called when a range's step points AWAY from its end -- begin > end with a
-// positive step, or begin < end with a negative step. Such a range is
-// naturally empty, and the reference warns rather than iterating zero times
-// in silence. `stepPositive` picks which of its two messages applies; use
-// rangeDirectionWarning() to build the text.
-//
-// Separate from RangeTooManyFn for the same reason that one exists: it
-// keeps expandIterable() free of any Evaluator/echo coupling.
-using RangeDirectionFn = std::function<void(bool stepPositive)>;
-
-// The reference's own wording, quoted verbatim, for a range whose step
-// points away from its end. Shared so the five call sites cannot drift.
-std::string rangeDirectionWarning(bool stepPositive);
-
 // Converts a for()/intersection_for() loop assignment's evaluated RHS into
 // the sequence of values to iterate: undef -> empty, range -> a LAZY
 // sequence (matching OscRange's own start/step/end iteration, half-open
@@ -394,8 +380,7 @@ std::string rangeDirectionWarning(bool stepPositive);
 // one with a live consumer (BelfrySCAD) that surfaced it. The count is
 // computed in closed form (not IterableValues::size()'s O(n) walk) so a
 // legitimate huge-but-under-the-limit range never pays an eager pass.
-IterableValues expandIterable(const Value& v, const RangeTooManyFn& onTooMany = nullptr,
-                               const RangeDirectionFn& onWrongDirection = nullptr);
+IterableValues expandIterable(const Value& v, const RangeTooManyFn& onTooMany = nullptr);
 
 // `each <body>`'s own flatten-one-level rule, shared by the AST interpreter
 // (evalListLiteral/evalListElement's ListCompEach handling, expr_eval.cpp)

{openscad_cpp_evaluator-0.40.0 → openscad_cpp_evaluator-0.42.0}/pyproject.toml

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

{openscad_cpp_evaluator-0.40.0 → openscad_cpp_evaluator-0.42.0}/src/builtins/booleans.cpp

@@ -68,7 +68,12 @@ std::optional<manifold::CrossSection> toCrossSection(const std::vector<ColoredBo
 // operand (unioned together), and each subsequent statement's bodies are
 // unioned then subtracted -- a flat evaluation would lose this grouping and
 // misbehave when e.g. BOSL2's attachable() returns multiple bodies (parent
-// + attached children) as one operand. Mirrors _resolve_csg/_generate_csg,
+// + 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
+// how `difference() children(separate=true)` subtracts children 1..n from
+// child 0. See Evaluator::appendGroupSizes, which both engines share. 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
@@ -101,8 +106,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);
-        const size_t after = ev.currentTreeFrameSize();
-        groupSizes.push_back(Value{static_cast<double>(after - before)});
+        ev.appendGroupSizes(groupSizes, before);
     }
 
     CSGParams params;

{openscad_cpp_evaluator-0.40.0 → openscad_cpp_evaluator-0.42.0}/src/builtins/control.cpp

@@ -119,8 +119,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);
-            const size_t after = ev.currentTreeFrameSize();
-            groupSizes.push_back(Value{static_cast<double>(after - before)});
+            ev.appendGroupSizes(groupSizes, before);
             return;
         }
         const auto& assign = node.assignments[depth];
@@ -128,8 +127,6 @@ CSGParams resolveIntersectionFor(Evaluator& ev, const oscad::ModularIntersection
         const oscad::Position* pos = &assign->position();
         IterableValues iter = expandIterable(values, [&](size_t count) {
             ev.warn("Bad range parameter in for statement: too many elements (" + std::to_string(count) + ")", pos);
-        }, [&](bool stepPositive) {
-            ev.warn(rangeDirectionWarning(stepPositive), pos);
         });
         for (const Value& val : iter) {
             EvalContext childCtx = parentCtx.childCtx(nullptr, std::nullopt, ctx.childrenNodes, ctx.childrenCallerCtx);

{openscad_cpp_evaluator-0.40.0 → openscad_cpp_evaluator-0.42.0}/src/builtins/function_builtins.cpp

@@ -952,11 +952,7 @@ Value evalBuiltinFunction(Evaluator& ev, const std::string& name, const CallArgs
                 }
                 if (const OscRange* r = std::get_if<OscRange>(&c)) {
                     std::string out;
-                    // The reference warns here too -- chr([70:1:65]) is
-                    // as much a typo as for(i=[70:1:65]) would be.
-                    const IterableValues seq = expandIterable(Value{*r}, nullptr, [&](bool stepPositive) {
-                        ev.warn(rangeDirectionWarning(stepPositive), &node.position());
-                    });
+                    const IterableValues seq = expandIterable(Value{*r});
                     for (const Value& item : seq) out += encode(item);
                     return out;
                 }

{openscad_cpp_evaluator-0.40.0 → openscad_cpp_evaluator-0.42.0}/src/builtins/registry.cpp

@@ -112,7 +112,7 @@ const std::vector<std::string>* builtinParamNames(const std::string& name) {
         {"intersection", {}},
         {"hull", {}},
         {"minkowski", {"convexity"}},
-        {"children", {"index"}},
+        {"children", {"index", "separate"}},
         {"render", {"convexity"}},
         // "repair" is this port's own addition, not an upstream parameter.
         {"import",

{openscad_cpp_evaluator-0.40.0 → openscad_cpp_evaluator-0.42.0}/src/bytecode_compiler.cpp

@@ -466,7 +466,7 @@ public:
                 compileExpr(*n.start, out, scope);
                 compileExpr(*n.end, out, scope);
                 compileExpr(*n.step, out, scope);
-                out.push_back({Op::Range, 0, 0, &n.position()});
+                out.push_back({Op::Range, n.implicitStep ? 1 : 0, 0, &n.position()});
                 return;
             }
             case NodeKind::PrimaryIndex: {

{openscad_cpp_evaluator-0.40.0 → openscad_cpp_evaluator-0.42.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) {
+                               std::uint64_t randsBefore, const oscad::ASTNode& callNode, bool separate) {
     if (ev.vmCallStack_.size() >= Evaluator::kMaxVmCallStackDepth) {
         ev.error("Recursion too deep while forwarding children()", callNode);
     }
@@ -381,6 +381,7 @@ 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);
 }
@@ -505,6 +506,7 @@ 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"
@@ -514,6 +516,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();
+                    if (separateChildren) markSeparateOperands(children, 0);
                     ev.spliceModuleChildren(std::move(children), moduleRandsBefore, *moduleSpliceCallNode);
                 }
                 if (isFloorFrame) {
@@ -634,7 +637,7 @@ Value driveVm(Evaluator& ev, size_t floor) {
                     f.stack.pop_back();
                     Value start = std::move(f.stack.back());
                     f.stack.pop_back();
-                    f.stack.push_back(ev.applyRange(start, end, step));
+                    f.stack.push_back(ev.applyRange(start, end, step, ins.a != 0, ins.pos));
                     ++f.pc;
                     break;
                 }
@@ -740,8 +743,6 @@ Value driveVm(Evaluator& ev, size_t floor) {
                     il.values = expandIterable(v, [&](size_t count) {
                         ev.warn("Bad range parameter in for statement: too many elements (" + std::to_string(count) + ")",
                                 ins.pos);
-                    }, [&](bool stepPositive) {
-                        ev.warn(rangeDirectionWarning(stepPositive), ins.pos);
                     });
                     il.index = 0;
                     il.total = il.values.size();
@@ -1025,6 +1026,11 @@ Value driveVm(Evaluator& ev, size_t floor) {
                         static_cast<const oscad::ModularCall*>(f.chunk->nativeStatements[static_cast<size_t>(ins.a)]);
                     EvalContext scopedCtx = ctx.withScope(callNode->scope() ? callNode->scope() : ctx.scope);
                     ev.checkDebug(*callNode, scopedCtx);
+                    // Same order as evalModularCall's own (csg_resolve.cpp):
+                    // warn, then resolve. Without this a children() typo
+                    // warns only under the interpreter, so no test for that
+                    // warning could run under both engines.
+                    warnUnexpectedBuiltinArgs(ev, *callNode);
                     const std::uint64_t randsBefore = ev.randsCallCount();
                     auto [args, effCtx] = resolveCallArgs(ev, callNode->arguments, scopedCtx);
                     std::optional<Evaluator::ChildrenForward> fwd = ev.prepareChildrenForward(args, effCtx);
@@ -1041,9 +1047,11 @@ 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);
+                        pushChildrenForwardFrame(ev, *chunk, std::move(fwd->evalCtx), randsBefore, *callNode, separate);
                         // f.pc deliberately NOT advanced -- resumes when
                         // the pushed frame completes; driveVm's completion
                         // branch runs the splice (isModule &&
@@ -1067,6 +1075,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);
                         ++f.pc;
                     }
@@ -1306,8 +1315,7 @@ Value driveVm(Evaluator& ev, size_t floor) {
                 }
                 case Op::CsgGroupEnd: {
                     PendingCsgWrap& pending = f.csgWrapStack.back();
-                    const size_t after = ev.treeStack_.back().size();
-                    pending.groupSizes.push_back(Value{static_cast<double>(after - pending.groupStartSize)});
+                    ev.appendGroupSizes(pending.groupSizes, pending.groupStartSize);
                     ++f.pc;
                     break;
                 }
@@ -1466,8 +1474,6 @@ Value driveVm(Evaluator& ev, size_t floor) {
                     il.values = expandIterable(v, [&](size_t count) {
                         ev.warn("Bad range parameter in for statement: too many elements (" + std::to_string(count) + ")",
                                 ins.pos);
-                    }, [&](bool stepPositive) {
-                        ev.warn(rangeDirectionWarning(stepPositive), ins.pos);
                     });
                     il.index = 0;
                     il.total = il.values.size();

{openscad_cpp_evaluator-0.40.0 → openscad_cpp_evaluator-0.42.0}/src/csg_resolve.cpp

@@ -158,7 +158,12 @@ void Evaluator::spliceModuleChildren(std::vector<std::unique_ptr<CSGNode>> child
         // landed on.
         for (auto& c : children) c->uncacheable = true;
     }
-    if (children.size() > 1) {
+    // 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.
+    const bool anySeparate =
+        std::any_of(children.begin(), children.end(), [](const auto& c) { return c->separateOperand; });
+    if (children.size() > 1 && !anySeparate) {
         auto unionNode = std::make_unique<CSGNode>();
         unionNode->kind = "union";
         unionNode->node = &callNode;

{openscad_cpp_evaluator-0.40.0 → openscad_cpp_evaluator-0.42.0}/src/expr_eval.cpp

@@ -177,8 +177,6 @@ void Evaluator::evalListElement(const oscad::ASTNode& elem, EvalContext& ctx, st
                 const oscad::Position* pos = &assign->position();
                 IterableValues iter = expandIterable(values, [&](size_t count) {
                     warn("Bad range parameter in for statement: too many elements (" + std::to_string(count) + ")", pos);
-                }, [&](bool stepPositive) {
-                    warn(rangeDirectionWarning(stepPositive), pos);
                 });
                 for (const Value& val : iter) {
                     EvalContext childCtx = parentCtx.letChildCtx();
@@ -294,16 +292,38 @@ Value Evaluator::evalListLiteral(const oscad::ListComprehension& node, EvalConte
 }
 
 Value Evaluator::evalRangeLiteral(const oscad::RangeLiteral& node, EvalContext& ctx) {
-    return applyRange(evalExpr(*node.start, ctx), evalExpr(*node.end, ctx), evalExpr(*node.step, ctx));
+    return applyRange(evalExpr(*node.start, ctx), evalExpr(*node.end, ctx), evalExpr(*node.step, ctx),
+                      node.implicitStep, &node.position());
 }
 
 // Shared with the bytecode VM's RANGE opcode -- see applyBinaryOp's own
 // comment on why these are factored out as plain Value x Value x Value ->
 // Value functions.
-Value Evaluator::applyRange(const Value& startV, const Value& endV, const Value& stepV) {
+Value Evaluator::applyRange(const Value& startV, const Value& endV, const Value& stepV, bool implicitStep,
+                            const oscad::Position* pos) {
     double start = std::holds_alternative<std::monostate>(startV) ? 0.0 : toDoubleLenient(startV);
     double end = std::holds_alternative<std::monostate>(endV) ? 0.0 : toDoubleLenient(endV);
     double step = std::holds_alternative<std::monostate>(stepV) ? 1.0 : toDoubleLenient(stepV);
+    // A range whose begin is already past its end iterates zero times, which
+    // is almost always a typo -- [5:0] where [5:-1:0] was meant. Reported
+    // here, at construction, because that is where the reference reports it:
+    // `r = [5:0];` warns even if nothing ever iterates r.
+    //
+    // ponytail: only an IMPLICIT step is checked -- a deliberate divergence
+    // from the reference, which warns for [5:1:0] and [0:-1:5] as well.
+    // Writing the step out is taken as a statement of intent; the warning is
+    // for the author who wrote [5:0] meaning [5:-1:0] and got a silent empty
+    // loop. An implicit step is always exactly 1, so the reference's other
+    // wording ("begin is smaller than the end, but step is negative") cannot
+    // arise here and no longer exists in this port -- if it is ever needed
+    // again, this gate has been widened back to explicit steps.
+    //
+    // The epsilon matches the one the iteration path used before this check
+    // moved here, so a range built from float arithmetic that lands a hair
+    // past its end is still treated as empty-but-fine rather than a typo.
+    if (implicitStep && (start - end) > 1e-10) {
+        warn("begin is greater than the end, but step is positive", pos);
+    }
     return Value{OscRange{start, step, end}};
 }
 

{openscad_cpp_evaluator-0.40.0 → openscad_cpp_evaluator-0.42.0}/src/stmt_eval.cpp

@@ -112,8 +112,6 @@ void Evaluator::evalFor(const oscad::ModularFor& node, EvalContext& ctx) {
         const oscad::Position* pos = &assign->position();
         IterableValues iter = expandIterable(values, [&](size_t count) {
             warn("Bad range parameter in for statement: too many elements (" + std::to_string(count) + ")", pos);
-        }, [&](bool stepPositive) {
-            warn(rangeDirectionWarning(stepPositive), pos);
         });
         for (const Value& val : iter) {
             EvalContext childCtx = parentCtx.childCtx(nullptr, std::nullopt, ctx.childrenNodes, ctx.childrenCallerCtx);

{openscad_cpp_evaluator-0.40.0 → openscad_cpp_evaluator-0.42.0}/src/user_calls.cpp

@@ -179,6 +179,7 @@ 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));
 }
 
@@ -932,6 +933,11 @@ Value Evaluator::parentModuleName(int idx) const {
 
 std::optional<Evaluator::ChildrenForward> Evaluator::prepareChildrenForward(const CallArgs& args, EvalContext& ctx) {
     Value idxArg = getArg(args, 0, "index", Value{});
+    // Positional slot 1 is accepted as well as the name: adding "separate"
+    // to the builtin's parameter list already suppresses the "Too many
+    // unnamed arguments" warning for children(0, true), so reading it
+    // named-only would silently ignore an argument the author wrote.
+    const bool separate = truthy(getArg(args, 1, "separate", Value{false}));
     if (!ctx.childrenNodes || ctx.childrenNodes->empty()) return std::nullopt;
     const EvalContext* callerCtx = ctx.childrenCallerCtx;
     if (!callerCtx) return std::nullopt;
@@ -977,7 +983,7 @@ std::optional<Evaluator::ChildrenForward> Evaluator::prepareChildrenForward(cons
     }
 
     if (std::holds_alternative<std::monostate>(idxArg)) {
-        return ChildrenForward{std::move(evalCtx), *ctx.childrenNodes};
+        return ChildrenForward{std::move(evalCtx), *ctx.childrenNodes, separate};
     }
 
     // children(N) indexes child *statements*, not output bodies -- a
@@ -1006,9 +1012,7 @@ std::optional<Evaluator::ChildrenForward> Evaluator::prepareChildrenForward(cons
     if (std::holds_alternative<double>(idxArg)) {
         indexValues.push_back(idxArg);
     } else if (std::holds_alternative<ListPtr>(idxArg) || std::holds_alternative<OscRange>(idxArg)) {
-        const IterableValues iter = expandIterable(idxArg, nullptr, [&](bool stepPositive) {
-            warn(rangeDirectionWarning(stepPositive), currentWarnEntry());
-        });
+        const IterableValues iter = expandIterable(idxArg);
         for (const Value& v : iter) indexValues.push_back(v);
     } else {
         warn("Bad parameter type (" + fmtValue(idxArg) +
@@ -1043,13 +1047,15 @@ std::optional<Evaluator::ChildrenForward> Evaluator::prepareChildrenForward(cons
         picked.push_back(geoNodes[static_cast<size_t>(idx)]);
     }
     if (picked.empty()) return std::nullopt;
-    return ChildrenForward{std::move(evalCtx), std::move(picked)};
+    return ChildrenForward{std::move(evalCtx), std::move(picked), separate};
 }
 
 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

{openscad_cpp_evaluator-0.40.0 → openscad_cpp_evaluator-0.42.0}/src/value.cpp

@@ -490,30 +490,18 @@ std::optional<size_t> rangeElementCount(const OscRange& r) {
     return static_cast<size_t>(std::floor(n + 1e-10)) + 1;
 }
 
-std::string rangeDirectionWarning(bool stepPositive) {
-    return stepPositive ? "begin is greater than the end, but step is positive"
-                        : "begin is smaller than the end, but step is negative";
-}
-
-IterableValues expandIterable(const Value& v, const RangeTooManyFn& onTooMany,
-                               const RangeDirectionFn& onWrongDirection) {
+IterableValues expandIterable(const Value& v, const RangeTooManyFn& onTooMany) {
     if (std::holds_alternative<std::monostate>(v)) return IterableValues{};
     if (const OscRange* r = std::get_if<OscRange>(&v)) {
         if (const std::optional<size_t> count = rangeElementCount(*r); count && *count >= 1'000'000) {
             if (onTooMany) onTooMany(*count);
             return IterableValues{};
         }
-        // A step pointing away from the end yields nothing. That is almost
-        // always a typo -- [1:0] where [1:-1:0] was meant -- so the
-        // reference says so rather than silently running zero times.
-        //
-        // A zero step is deliberately NOT reported here: it is a different
-        // failure (the reference calls it "too many elements") and shares
-        // rangeElementCount's nullopt with this case only by coincidence.
-        if (onWrongDirection && r->step != 0.0) {
-            const double n = (r->end - r->start) / r->step;
-            if (n < -1e-10) onWrongDirection(r->step > 0.0);
-        }
+        // A step pointing away from the end yields nothing, and that is
+        // almost always a typo -- but the warning for it belongs to the
+        // range's CONSTRUCTION, not its iteration: only the range literal
+        // knows whether the author chose the step or the parser supplied
+        // it. See Evaluator::applyRange.
         // Lazy -- IterableValues itself reproduces this exact
         // termination condition (a zero step is naturally empty: neither
         // `x <= end` nor `x >= end` branch ever fires for it) without

{openscad_cpp_evaluator-0.40.0 → openscad_cpp_evaluator-0.42.0}/tests/CMakeLists.txt

@@ -20,6 +20,7 @@ add_executable(oscad_eval_tests
   test_transforms.cpp
   test_render_expr.cpp
   test_booleans.cpp
+  test_children_separate.cpp
   test_control_flow.cpp
   test_tail_calls.cpp
   test_function_builtins.cpp