openscad-cpp-evaluator 1.37.2__tar.gz → 1.38.1__tar.gz

{openscad_cpp_evaluator-1.37.2 → openscad_cpp_evaluator-1.38.1}/CLAUDE.md

@@ -1866,3 +1866,33 @@ A compiled function keeps its parameters in frame slots, which no `EvalContext`
 can see, and the children are statement opcodes that resolve names through the
 context — without this, `function f(w) = render() { cube(w); }.volume;` finds no
 `w` and silently measures nothing.
+
+## `profile_time()`
+
+`profile_time([label]) { ... }` prints `PROFILE: label: T ms (script S ms, geometry G ms)`;
+`x = profile_time([label]) expr;` prints `PROFILE: label: T ms` and evaluates to `expr`'s value.
+`supported_feature("profile-time")` is 1. The label is optional (default `line N of file`), and
+is evaluated before the clock starts. Times under 1 ms print in microseconds (`fmtMs`), so a fast part never reads `0.00 ms`.
+
+### Implementation notes
+
+- **Parser:** `profile_time` is a reserved keyword (`KW_PROFILE_TIME`) for the same reason as
+  `render`. The statement form is a plain `ModularCall` named `profile_time`; the expression form
+  is a `ProfileTimeOp` node shaped like `EchoOp`, with a required body.
+- **Script time** is taken around the resolve function's call in `Evaluator::evalModularCall`
+  (csg_resolve.cpp), not inside `resolveProfileTime`, so argument evaluation and every child
+  count. It is stored on `CSGNode::profileScriptMs`, which is deliberately not in `cacheKey()` --
+  a timing in the key would make every profiled subtree a permanent miss.
+- **Geometry time** is taken in `generateTreeImpl`, from *before* the cache lookup, and printed
+  when the node finishes, so a hit reports `geometry cached` rather than vanishing. A hit on an
+  **ancestor** never visits the profile_time() node at all; `reportCachedProfiles` walks the hit
+  subtree for them, but only when the run resolved any (`profileNodeCount_`), so a model without
+  profile_time() pays nothing on its hits.
+- **Resolve-only runs** (`evaluate(..., generate=false)`) print `script S ms (no geometry built)`
+  at resolve time instead (`generateRequested_`).
+- **Expression form** is interpreter-only: the bytecode compiler has no case for
+  `ProfileTimeOp`, so its `default:` throws `NotCompilable` and the containing function falls back
+  to the interpreter. It is also deliberately absent from `simplifyTailStep` -- the clock must stop
+  after the body, which a tail step would not wait for.
+- `PROFILE:` lines go straight to `echoFn_`, not through `emitWarning`, so the ManifoldCache never
+  stores or replays them (a replay would print a stale time as if it were current).

{openscad_cpp_evaluator-1.37.2 → openscad_cpp_evaluator-1.38.1}/PKG-INFO

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

{openscad_cpp_evaluator-1.37.2 → openscad_cpp_evaluator-1.38.1}/external/openscad_cpp_parser/include/openscad_cpp_parser/ast/ast_node.hpp

@@ -34,6 +34,7 @@ enum class NodeKind {
     LetOp,
     EchoOp,
     AssertOp,
+    ProfileTimeOp,
     FunctionLiteral,
     // Operators
     UnaryMinusOp,

{openscad_cpp_evaluator-1.37.2 → openscad_cpp_evaluator-1.38.1}/external/openscad_cpp_parser/include/openscad_cpp_parser/ast/expression.hpp

@@ -217,6 +217,20 @@ public:
     void buildScope(Scope& parentScope) override;
 };
 
+// `profile_time(arguments...) body` -- same shape as EchoOp; times the body.
+// Unlike echo/assert the body is required: timing nothing is meaningless.
+class ProfileTimeOp : public Expression {
+public:
+    ProfileTimeOp(Position position, std::vector<std::unique_ptr<Argument>> arguments, std::unique_ptr<Expression> body)
+        : Expression(NodeKind::ProfileTimeOp, std::move(position)), arguments(std::move(arguments)), body(std::move(body)) {}
+
+    std::vector<std::unique_ptr<Argument>> arguments;
+    std::unique_ptr<Expression> body;
+
+    std::string toString() const override;
+    void buildScope(Scope& parentScope) override;
+};
+
 // `assert(arguments...) body` -- same shape as EchoOp.
 class AssertOp : public Expression {
 public:

{openscad_cpp_evaluator-1.37.2 → openscad_cpp_evaluator-1.38.1}/external/openscad_cpp_parser/src/ast/ast_node.cpp

@@ -21,6 +21,7 @@ const char* nodeKindName(NodeKind kind) {
         case NodeKind::LetOp: return "LetOp";
         case NodeKind::EchoOp: return "EchoOp";
         case NodeKind::AssertOp: return "AssertOp";
+        case NodeKind::ProfileTimeOp: return "ProfileTimeOp";
         case NodeKind::FunctionLiteral: return "FunctionLiteral";
         case NodeKind::UnaryMinusOp: return "UnaryMinusOp";
         case NodeKind::AdditionOp: return "AdditionOp";

{openscad_cpp_evaluator-1.37.2 → openscad_cpp_evaluator-1.38.1}/external/openscad_cpp_parser/src/ast/expression.cpp

@@ -134,6 +134,18 @@ void EchoOp::buildScope(Scope& parentScope) {
     body->buildScope(parentScope);
 }
 
+std::string ProfileTimeOp::toString() const {
+    return "profile_time(" + joinToString(arguments, ", ") + ") " + body->toString();
+}
+
+void ProfileTimeOp::buildScope(Scope& parentScope) {
+    setScope(parentScope);
+    for (auto& a : arguments) {
+        a->buildScope(parentScope);
+    }
+    body->buildScope(parentScope);
+}
+
 std::string AssertOp::toString() const {
     return "assert(" + joinToString(arguments, ", ") + ") " + body->toString();
 }
@@ -219,6 +231,7 @@ int operatorPrecedence(NodeKind kind) {
         case NodeKind::LetOp:
         case NodeKind::EchoOp:
         case NodeKind::AssertOp:
+        case NodeKind::ProfileTimeOp:
         case NodeKind::FunctionLiteral:
             return 0;
         case NodeKind::LogicalOrOp:

{openscad_cpp_evaluator-1.37.2 → openscad_cpp_evaluator-1.38.1}/external/openscad_cpp_parser/src/grammar/driver.cpp

@@ -88,6 +88,11 @@ NodePtr makeEchoOp(ParserDriver& driver, const OscadLocation& loc, NodeList argu
                                      nodeCast<Expression>(std::move(body)));
 }
 
+NodePtr makeProfileTimeOp(ParserDriver& driver, const OscadLocation& loc, NodeList arguments, NodePtr body) {
+    return std::make_unique<ProfileTimeOp>(driver.toPosition(loc), nodeListCast<Argument>(std::move(arguments)),
+                                            nodeCast<Expression>(std::move(body)));
+}
+
 NodePtr makeAssertOp(ParserDriver& driver, const OscadLocation& loc, NodeList arguments, NodePtr body) {
     return std::make_unique<AssertOp>(driver.toPosition(loc), nodeListCast<Argument>(std::move(arguments)),
                                        nodeCast<Expression>(std::move(body)));

{openscad_cpp_evaluator-1.37.2 → openscad_cpp_evaluator-1.38.1}/external/openscad_cpp_parser/src/grammar/driver.hpp

@@ -104,6 +104,7 @@ NodePtr makeAssignment(ParserDriver& driver, const OscadLocation& loc, const Osc
 
 NodePtr makeLetOp(ParserDriver& driver, const OscadLocation& loc, NodeList assignments, NodePtr body);
 NodePtr makeEchoOp(ParserDriver& driver, const OscadLocation& loc, NodeList arguments, NodePtr body);
+NodePtr makeProfileTimeOp(ParserDriver& driver, const OscadLocation& loc, NodeList arguments, NodePtr body);
 NodePtr makeAssertOp(ParserDriver& driver, const OscadLocation& loc, NodeList arguments, NodePtr body);
 NodePtr makeFunctionLiteral(ParserDriver& driver, const OscadLocation& loc, NodeList parameters, NodePtr body);
 

{openscad_cpp_evaluator-1.37.2 → openscad_cpp_evaluator-1.38.1}/external/openscad_cpp_parser/src/grammar/lexer.l

@@ -52,6 +52,9 @@ const std::unordered_map<std::string, KeywordFactory>& keywordTable() {
         // apart from a function call. Note `$render` still lexes as NAME --
         // this table is keyed on the full IDENT text, including the `$`.
         {"render", [](const OscadLocation& l) { return yy::parser::make_KW_RENDER(l); }},
+        // Reserved for the same reason as `render`: its expression form
+        // (`x = profile_time("label") expr;`) starts like a function call.
+        {"profile_time", [](const OscadLocation& l) { return yy::parser::make_KW_PROFILE_TIME(l); }},
         {"undef", [](const OscadLocation& l) { return yy::parser::make_KW_UNDEF(l); }},
         {"true", [](const OscadLocation& l) { return yy::parser::make_KW_TRUE(l); }},
         {"false", [](const OscadLocation& l) { return yy::parser::make_KW_FALSE(l); }},

{openscad_cpp_evaluator-1.37.2 → openscad_cpp_evaluator-1.38.1}/external/openscad_cpp_parser/src/grammar/parser.y

@@ -93,6 +93,7 @@
   KW_INTERSECTION_FOR "intersection_for"
   KW_EACH "each"
   KW_RENDER "render"
+  KW_PROFILE_TIME "profile_time"
   KW_UNDEF "undef"
   KW_TRUE "true"
   KW_FALSE "false"
@@ -158,7 +159,7 @@
 %type <NodePtr> modifier_show_only modifier_highlight modifier_background modifier_disable
 %type <NodePtr> if_statement ifelse_statement
 %type <NodePtr> modular_for modular_intersection_for modular_let modular_assert modular_echo modular_call
-%type <NodePtr> render_stmt render_expr
+%type <NodePtr> render_stmt render_expr profile_time_stmt
 %type <NodePtr> expr opchain postfix primary
 %type <NodePtr> range_expr vector_expr vector_element
 %type <NodePtr> listcomp_elements listcomp_paren_expr listcomp_let listcomp_each
@@ -330,6 +331,7 @@ single_module_instantiation:
   | modular_echo                  { $$ = std::move($1); }
   | modular_call                   { $$ = std::move($1); }
   | render_stmt                     { $$ = std::move($1); }
+  | profile_time_stmt                { $$ = std::move($1); }
   ;
 
 modular_for:
@@ -378,6 +380,14 @@ render_stmt:
     }
   ;
 
+// Same arrangement as render_stmt: the keyword exists only for the
+// expression form, and the statement form is an ordinary builtin call.
+profile_time_stmt:
+    "profile_time" "(" arguments ")" child_statement {
+      $$ = makeModularCall(driver, @$, @1, "profile_time", std::move($3), std::move($5));
+    }
+  ;
+
 // -- Expressions ----------------------------------------------------------
 //
 // `expr` covers let/assert/echo/funclit_def/ternary plus the operator
@@ -393,6 +403,7 @@ expr:
   | "assert" "(" arguments ")"            { $$ = makeAssertOp(driver, @$, std::move($3), makeUndefinedLiteral(driver, @$)); }
   | "echo" "(" arguments ")" expr          { $$ = makeEchoOp(driver, @$, std::move($3), std::move($5)); }
   | "echo" "(" arguments ")"                { $$ = makeEchoOp(driver, @$, std::move($3), makeUndefinedLiteral(driver, @$)); }
+  | "profile_time" "(" arguments ")" expr    { $$ = makeProfileTimeOp(driver, @$, std::move($3), std::move($5)); }
   | "function" "(" parameters ")" expr        { $$ = makeFunctionLiteral(driver, @$, std::move($3), std::move($5)); }
   | opchain "?" expr ":" expr                  { $$ = makeTernaryOp(driver, @$, std::move($1), std::move($3), std::move($5)); }
   | opchain                                     { $$ = std::move($1); }

{openscad_cpp_evaluator-1.37.2 → openscad_cpp_evaluator-1.38.1}/external/openscad_cpp_parser/src/inline_comment_attach.cpp

@@ -180,6 +180,12 @@ void classifyNode(ASTNode& node, std::vector<ExprSlot>& exprFields, std::vector<
             addExpr(n.body, exprFields);
             break;
         }
+        case NodeKind::ProfileTimeOp: {
+            auto& n = static_cast<ProfileTimeOp&>(node);
+            addArgumentExprList(n.arguments, exprFields);
+            addExpr(n.body, exprFields);
+            break;
+        }
         case NodeKind::AssertOp: {
             auto& n = static_cast<AssertOp&>(node);
             addArgumentExprList(n.arguments, exprFields);

{openscad_cpp_evaluator-1.37.2 → openscad_cpp_evaluator-1.38.1}/external/openscad_cpp_parser/src/pretty_print.cpp

@@ -486,6 +486,9 @@ std::string fmtExpr(const ASTNode& exprNode, int indent, int w) {
         }
         return "echo(" + args + ")\n" + pad + fmtExpr(*e->body, indent, w);
     }
+    if (auto* p = dynamic_cast<const ProfileTimeOp*>(&exprNode)) {
+        return "profile_time(" + joinToString(p->arguments, ", ") + ")\n" + pad + fmtExpr(*p->body, indent, w);
+    }
     if (auto* l = dynamic_cast<const LetOp*>(&exprNode)) {
         return fmtLetOpExpr(*l, indent, w);
     }

{openscad_cpp_evaluator-1.37.2 → openscad_cpp_evaluator-1.38.1}/external/openscad_cpp_parser/src/serialization/json_io.cpp

@@ -150,6 +150,12 @@ json toJsonImpl(const ASTNode& node, bool includePos) {
             j["body"] = valueToJson(n.body.get(), includePos);
             break;
         }
+        case NodeKind::ProfileTimeOp: {
+            auto& n = static_cast<const ProfileTimeOp&>(node);
+            j["arguments"] = listToJson(n.arguments, includePos);
+            j["body"] = valueToJson(n.body.get(), includePos);
+            break;
+        }
         case NodeKind::AssertOp: {
             auto& n = static_cast<const AssertOp&>(node);
             j["arguments"] = listToJson(n.arguments, includePos);
@@ -446,6 +452,11 @@ const std::unordered_map<std::string, Builder>& registry() {
              return std::make_unique<EchoOp>(std::move(pos), listFromJson<Argument>(j, "arguments"),
                                               childFromJson<Expression>(j, "body"));
          }},
+        {"ProfileTimeOp",
+         [](const json& j, Position pos) -> std::unique_ptr<ASTNode> {
+             return std::make_unique<ProfileTimeOp>(std::move(pos), listFromJson<Argument>(j, "arguments"),
+                                                     childFromJson<Expression>(j, "body"));
+         }},
         {"AssertOp",
          [](const json& j, Position pos) -> std::unique_ptr<ASTNode> {
              return std::make_unique<AssertOp>(std::move(pos), listFromJson<Argument>(j, "arguments"),

{openscad_cpp_evaluator-1.37.2 → openscad_cpp_evaluator-1.38.1}/external/openscad_cpp_parser/tests/CMakeLists.txt

@@ -26,6 +26,7 @@ add_executable(oscad_tests
   test_ast_generation.cpp
   test_node_str.cpp
   test_render_expression.cpp
+  test_profile_time.cpp
   test_strict_commas.cpp
   test_concurrent_parse.cpp
 )

openscad_cpp_evaluator-1.38.1/external/openscad_cpp_parser/tests/test_profile_time.cpp

@@ -0,0 +1,86 @@
+// `profile_time()`: the statement form times its children, the expression
+// form (`x = profile_time("label") expr;`) its body. `profile_time` is a
+// reserved keyword only because the expression form would otherwise be
+// indistinguishable from a function call; the statement form is a plain
+// ModularCall, so builtin dispatch downstream sees an ordinary module.
+
+#include "openscad_cpp_parser/api.hpp"
+#include "openscad_cpp_parser/pretty_print.hpp"
+#include "openscad_cpp_parser/serialization.hpp"
+#include "test_helpers.hpp"
+
+#include <gtest/gtest.h>
+
+using namespace oscad;
+
+namespace {
+
+const ProfileTimeOp* profileOf(const std::vector<std::unique_ptr<ASTNode>>& ast) {
+    auto* a = dynamic_cast<Assignment*>(ast[0].get());
+    return a ? dynamic_cast<const ProfileTimeOp*>(a->expr.get()) : nullptr;
+}
+
+} // namespace
+
+TEST(ProfileTime, StatementFormIsAPlainModularCall) {
+    auto ast = parseSrc("profile_time(\"gears\") { cube(1); sphere(2); }");
+    ASSERT_EQ(ast.size(), 1u);
+    auto* call = dynamic_cast<ModularCall*>(ast[0].get());
+    ASSERT_NE(call, nullptr);
+    EXPECT_EQ(call->name->name, "profile_time");
+    EXPECT_EQ(call->arguments.size(), 1u);
+    EXPECT_EQ(call->children.size(), 2u);
+}
+
+TEST(ProfileTime, ExpressionFormWrapsItsBody) {
+    auto ast = parseSrc("x = profile_time(\"sum\") 1 + 2;");
+    const ProfileTimeOp* p = profileOf(ast);
+    ASSERT_NE(p, nullptr);
+    EXPECT_EQ(p->kind(), NodeKind::ProfileTimeOp);
+    EXPECT_EQ(p->arguments.size(), 1u);
+    EXPECT_EQ(p->body->kind(), NodeKind::AdditionOp);
+}
+
+TEST(ProfileTime, ExpressionFormAllowsNoLabel) {
+    const ProfileTimeOp* p = nullptr;
+    auto ast = parseSrc("x = profile_time() f(3);");
+    p = profileOf(ast);
+    ASSERT_NE(p, nullptr);
+    EXPECT_TRUE(p->arguments.empty());
+}
+
+TEST(ProfileTime, ExpressionFormNeedsABody) {
+    EXPECT_THROW(parseSrc("x = profile_time(\"a\");"), ParseError);
+}
+
+TEST(ProfileTime, IsReserved) {
+    EXPECT_THROW(parseSrc("profile_time = 1;"), ParseError);
+    EXPECT_THROW(parseSrc("function profile_time() = 1;"), ParseError);
+    EXPECT_THROW(parseSrc("module profile_time() {}"), ParseError);
+    // `$profile_time` is a different identifier and stays usable.
+    EXPECT_NO_THROW(parseSrc("$profile_time = 1;"));
+}
+
+TEST(ProfileTime, ToStringRoundTrips) {
+    auto ast = parseSrc("x = profile_time(\"a\") 1 + 2;");
+    EXPECT_EQ(ast[0]->toString(), "x = profile_time(\"a\") 1 + 2");
+    EXPECT_NE(profileOf(parseSrc(ast[0]->toString() + ";")), nullptr);
+}
+
+TEST(ProfileTime, JsonRoundTrips) {
+    auto ast = parseSrc("x = profile_time(\"a\") 1 + 2;");
+    auto back = astFromJsonString(astToJsonString(ast));
+    const ProfileTimeOp* p = profileOf(back);
+    ASSERT_NE(p, nullptr);
+    EXPECT_EQ(p->body->kind(), NodeKind::AdditionOp);
+}
+
+TEST(ProfileTime, PrettyPrintReparses) {
+    for (const char* src : {"x = profile_time(\"a\") 1 + 2;",
+                            "profile_time(\"g\") { cube(1); }"}) {
+        auto ast = parseSrc(src);
+        std::string out = toOpenscad(ast);
+        EXPECT_NE(out.find("profile_time(\""), std::string::npos) << out;
+        EXPECT_NO_THROW(parseSrc(out)) << out;
+    }
+}

{openscad_cpp_evaluator-1.37.2 → openscad_cpp_evaluator-1.38.1}/include/openscad_cpp_evaluator/csg_node.hpp

@@ -71,6 +71,13 @@ struct CSGNode {
     // stack risk the moment this node is ever destroyed.
     int treeDepth = 1;
 
+    // profile_time() only: how long resolving this node (its arguments and
+    // its children's script code) took, in ms; < 0 for every other node.
+    // Measured fresh on every run, so -- like warnEntry -- deliberately NOT
+    // part of cacheKey(): putting a timing in the key would make every
+    // profiled subtree a permanent cache miss.
+    double profileScriptMs = -1.0;
+
     // Memoizes manifold_cache.cpp's cacheKey(*this) -- that function
     // recurses into every descendant to build its own key, so without this
     // memo a generate-time walk that calls cacheKey() at every node (not

{openscad_cpp_evaluator-1.37.2 → openscad_cpp_evaluator-1.38.1}/include/openscad_cpp_evaluator/evaluator.hpp

@@ -422,6 +422,22 @@ public:
     // subtree, not just direct children, since hull() consumes all of it.
     bool insideHull = false;
 
+    // profile_time(). generateRequested_ is false only inside an
+    // evaluate(generate = false) run, where no geometry pass follows to
+    // report a profiled block, so resolve reports the script time alone.
+    // profileNodeCount_ counts this run's profile_time() nodes so a cache
+    // hit only walks its subtree for them when there are any (see
+    // reportCachedProfiles).
+    bool generateRequested_ = true;
+    std::size_t profileNodeCount_ = 0;
+    // Prints "PROFILE: <label>: ..." for a profile_time() node. geometryMs
+    // < 0 means no geometry pass; `cached` means its geometry came from the
+    // ManifoldCache rather than being built.
+    void reportProfile(const CSGNode& node, double geometryMs, bool cached);
+    // A cache hit at `node` skips its whole subtree, so a profile_time()
+    // inside it would otherwise print nothing at all.
+    void reportCachedProfiles(const CSGNode& node);
+
     ColoredBody tagGenerated(manifold::Manifold body, const oscad::ASTNode& node, const Value& colorValue);
 
     // tagGenerated()'s counterpart for a mesh Manifold refused to build --
@@ -837,6 +853,7 @@ private:
     Value evalLetExpr(const oscad::LetOp& node, EvalContext& ctx);
     Value evalEchoExpr(const oscad::EchoOp& node, EvalContext& ctx);
     Value evalAssertExpr(const oscad::AssertOp& node, EvalContext& ctx);
+    Value evalProfileTimeExpr(const oscad::ProfileTimeOp& node, EvalContext& ctx);
     void bindLetName(EvalContext& ctx, const std::string& name, const Value& v);
 
     // Bracketed public in place: Stage 2's Op::NativeStatement

{openscad_cpp_evaluator-1.37.2 → openscad_cpp_evaluator-1.38.1}/pyproject.toml

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

{openscad_cpp_evaluator-1.37.2 → openscad_cpp_evaluator-1.38.1}/src/CMakeLists.txt

@@ -43,6 +43,7 @@ add_library(openscad_cpp_evaluator STATIC
   builtins/booleans.cpp
   builtins/modifiers.cpp
   builtins/control.cpp
+  builtins/profile_time.cpp
   builtins/function_builtins.cpp
   builtins/import.cpp
   builtins/topology.cpp

{openscad_cpp_evaluator-1.37.2 → openscad_cpp_evaluator-1.38.1}/src/builtins/builtins.hpp

@@ -146,6 +146,12 @@ std::vector<ColoredBody> generateChildren(Evaluator& ev, const CSGParams& params
 // generateTree()'s default child-concatenation, exactly reproducing
 // passthrough).
 CSGParams resolveRender(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx);
+CSGParams resolveProfileTime(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx);
+// profile_time()'s message pieces: "12.40 ms" (or "4.7 µs" under 1 ms), and the label it names --
+// the label as written (a non-string formatted like echo() would), or
+// "line N" (with the file when there is one) when none was given.
+std::string fmtMs(double ms);
+std::string profileLabel(const Value& label, const oscad::Position& pos);
 
 // breakpoint() -- no-op as of Phase 4 (no debugger until Phase 9); still
 // evaluates/validates its optional `condition` argument for parity.

{openscad_cpp_evaluator-1.37.2 → openscad_cpp_evaluator-1.38.1}/src/builtins/extrude.cpp

@@ -118,34 +118,86 @@ manifold::Manifold extrudeTwisted(const manifold::Polygons& polys, double height
 BuiltinWrapParams computeLinearExtrudeParams(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx) {
     auto [args, effCtx] = resolveCallArgs(ev, node.arguments, ctx);
 
-    // 100 when not given, as upstream (the old 1 was a guess), and `h` as
-    // upstream's alias -- BOSL2's linear_extrude override forwards it.
-    const double height = toDoubleLenient(getArgOrAlias(ev, &node.position(), args, 0, "height", "h", Value{100.0}));
-    const bool center = truthy(getArg(args, std::nullopt, "center", Value{false}));
-    const double twist = toDoubleLenient(getArg(args, std::nullopt, "twist", Value{0.0}));
+    // Positional order is upstream's: height, v, scale, center, twist,
+    // slices, segments. Only height used to be read positionally.
+    //
+    // Upstream's LinearExtrudeNode: the extrusion runs along a vector, (0,0,1)
+    // unless `v` gives one. Its length is `height` (`h` its alias, BOSL2's
+    // override forwards it) when given -- `v` then only sets the direction --
+    // else |v| when `v` is given, else 100. A vector pointing down (z <= 0)
+    // extrudes nothing. Bad values warn and fall back as upstream's do.
+    // `v` was ignored here, so an oblique extrusion came out straight.
+    double hv[3] = {0.0, 0.0, 1.0};
+    double length = 100.0;
+    const Value vArg = getArg(args, 1, "v", Value{});
+    if (!std::holds_alternative<std::monostate>(vArg)) {
+        const ListPtr* l = std::get_if<ListPtr>(&vArg);
+        bool ok = l && *l && (*l)->items.size() == 3;
+        double t[3] = {0, 0, 0};
+        for (int i = 0; ok && i < 3; ++i) {
+            const double* d = std::get_if<double>(&(*l)->items[i]);
+            ok = d && std::isfinite(*d);
+            if (ok) t[i] = *d;
+        }
+        if (ok) std::copy(t, t + 3, hv);
+        else ev.warn("v when specified should be a 3d vector", &node.position());
+        length = 1.0;
+    }
+    const Value heightArg = getArgOrAlias(ev, &node.position(), args, 0, "height", "h", Value{});
+    if (!std::holds_alternative<std::monostate>(heightArg)) {
+        const double* d = std::get_if<double>(&heightArg);
+        if (d && std::isfinite(*d)) {
+            length = *d;
+        } else {
+            ev.warn("height when specified should be a number", &node.position());
+            length = 100.0;
+        }
+        const double norm = std::sqrt(hv[0] * hv[0] + hv[1] * hv[1] + hv[2] * hv[2]);
+        for (double& c : hv) c /= norm;
+    }
+    for (double& c : hv) c *= length;
+    if (hv[2] <= 0) hv[2] = 0;
+    const double height = hv[2];
+    // Only a real boolean counts, as upstream: center="yes" is not true.
+    const Value centerArg = getArg(args, 3, "center", Value{false});
+    const bool* centerBool = std::get_if<bool>(&centerArg);
+    const bool center = centerBool && *centerBool;
+    const double twist = toDoubleLenient(getArg(args, 4, "twist", Value{0.0}));
     // Upstream's validate_integral: any finite number counts as given, and is
     // truncated and clamped (slices >= 1, segments >= 0). Not given, the
     // discretizer decides.
-    const auto integral = [&](const char* name, double lo) -> std::optional<double> {
-        const Value v = getArg(args, std::nullopt, name, Value{});
+    const auto integral = [&](int pos, const char* name, double lo) -> std::optional<double> {
+        const Value v = getArg(args, pos, name, Value{});
         const double* d = std::get_if<double>(&v);
         if (!d || !std::isfinite(*d)) return std::nullopt;
         return *d < lo ? lo : std::trunc(*d);
     };
-    const std::optional<double> slices = integral("slices", 1.0);
-    const std::optional<double> segments = integral("segments", 0.0);
-    const Value scaleArg = getArg(args, std::nullopt, "scale", Value{});
+    const std::optional<double> slices = integral(5, "slices", 1.0);
+    const std::optional<double> segments = integral(6, "segments", 0.0);
+    const Value scaleArg = getArg(args, 2, "scale", Value{});
 
     double scaleX = 1.0, scaleY = 1.0;
+    bool scaleOk = true;
     if (const double* s = std::get_if<double>(&scaleArg)) {
         scaleX = scaleY = *s;
+        scaleOk = std::isfinite(*s);
     } else if (const ListPtr* l = std::get_if<ListPtr>(&scaleArg); l && *l && (*l)->items.size() >= 2) {
         scaleX = toDoubleLenient((*l)->items[0]);
         scaleY = toDoubleLenient((*l)->items[1]);
+        scaleOk = std::isfinite(scaleX) && std::isfinite(scaleY);
+    } else if (!std::holds_alternative<std::monostate>(scaleArg)) {
+        scaleOk = false;
+    }
+    if (!scaleOk) {
+        ev.warn("linear_extrude(..., scale=" + fmtValue(scaleArg) + ") could not be converted", &node.position());
+        scaleX = scaleY = 1.0;
     }
 
     CSGParams params;
     params["height"] = Value{height};
+    // How far the top slides sideways per unit of height (0 unless `v`).
+    params["shear_x"] = Value{height > 0 ? hv[0] / height : 0.0};
+    params["shear_y"] = Value{height > 0 ? hv[1] / height : 0.0};
     params["center"] = Value{center};
     params["twist"] = Value{twist};
     params["slices"] = slices ? Value{*slices} : Value{};
@@ -227,6 +279,14 @@ std::vector<ColoredBody> generateLinearExtrude(Evaluator& ev, const CSGParams& p
             ? extrudeTwisted(polys, height, slices, twist, scaleX, scaleY)
             : manifold::Manifold::Extrude(polys, height, slices - 1, -twist, manifold::vec2(scaleX, scaleY));
     if (std::get<bool>(params.at("center"))) body = body.Translate(manifold::vec3(0, 0, -height / 2));
+    // `v`: slide each point sideways in proportion to its height -- upstream
+    // places slice k at bottom + v*k/n, and centring subtracts v/2, so the
+    // same shear is right either way.
+    const double shearX = std::get<double>(params.at("shear_x"));
+    const double shearY = std::get<double>(params.at("shear_y"));
+    if (shearX != 0.0 || shearY != 0.0) {
+        body = body.Transform(manifold::mat3x4({1, 0, 0}, {0, 1, 0}, {shearX, shearY, 1}, {0, 0, 0}));
+    }
     return {ev.tagGenerated(std::move(body), node, params.at("color"))};
 }
 
@@ -241,11 +301,36 @@ std::vector<ColoredBody> generateLinearExtrude(Evaluator& ev, const CSGParams& p
 BuiltinWrapParams computeRotateExtrudeParams(Evaluator& ev, const oscad::ModularCall& node, EvalContext& ctx) {
     auto [args, effCtx] = resolveCallArgs(ev, node.arguments, ctx);
 
-    const double angle = toDoubleLenient(getArgOrAlias(ev, &node.position(), args, 0, "angle", "a", Value{360.0}));
+    // Positional order is upstream's: angle, start.
+    //
+    // Upstream's RotateExtrudeNode: the sweep runs from `start` through
+    // `start + angle`. With an angle, start defaults to 0 (the +X axis) and
+    // an angle outside (-360, 360] becomes a full turn; with none, the turn
+    // is 360 and starts at 180 (-X), which upstream says will change, and
+    // says so for an odd $fn, where the start shows. An explicit start
+    // always wins. It was ignored here: a quarter turn from 90 drew 0..90.
+    const Value angleArg = getArgOrAlias(ev, &node.position(), args, 0, "angle", "a", Value{});
+    const Value startArg = getArg(args, 1, "start", Value{});
+    const bool hasAngle = !std::holds_alternative<std::monostate>(angleArg) && std::isfinite(toDoubleLenient(angleArg));
+    const bool hasStart = !std::holds_alternative<std::monostate>(startArg) && std::isfinite(toDoubleLenient(startArg));
+    double angle = 360.0;
+    double start = 180.0;
+    if (hasAngle) {
+        angle = toDoubleLenient(angleArg);
+        start = 0.0;
+        if (angle <= -360.0 || angle > 360.0) angle = 360.0;
+    }
+    if (hasStart) start = toDoubleLenient(startArg);
+    const Discretizer disc = Discretizer::fromCtx(effCtx);
+    if (!hasAngle && !hasStart && (static_cast<int>(disc.fn) & 1)) {
+        ev.emitWarning("DEPRECATED: In future releases, rotational extrusion without \"angle\" will start at zero, "
+                       "the +X axis.  Set start=180 to explicitly start on the -X axis.");
+    }
 
     CSGParams params;
     params["angle"] = Value{angle};
-    Discretizer::fromCtx(effCtx).store(params);
+    params["start"] = Value{start};
+    disc.store(params);
     params["color"] = colorToValue(effCtx.color);
     return BuiltinWrapParams{std::move(params), std::move(effCtx)};
 }
@@ -299,6 +384,9 @@ std::vector<ColoredBody> generateRotateExtrude(Evaluator& ev, const CSGParams& p
             v = manifold::vec3(v.x * std::cos(a), v.x * std::sin(a), sign * v.y);
         });
     }
+    // The arc above runs from +X; turn it to begin at `start`.
+    const double start = std::get<double>(params.at("start"));
+    if (start != 0.0) body = body.Rotate(0.0, 0.0, start);
     return {ev.tagGenerated(std::move(body), node, params.at("color"))};
 }
 

{openscad_cpp_evaluator-1.37.2 → openscad_cpp_evaluator-1.38.1}/src/builtins/function_builtins.cpp

@@ -1018,6 +1018,7 @@ const std::unordered_map<std::string, double>& featureLevels() {
         {"roof-op", 1.0},            // roof(), method="voronoi" only
         {"svg-class", 1.0},          // import(svg, class=); id= is upstream's
         {"discretization-by-error", 1.0}, // $fe, always on (upstream: behind --enable)
+        {"profile-time", 1.0},       // profile_time(label) { ... } and profile_time(label) expr
     };
     return levels;
 }