openscad-cpp-evaluator 1.19.0__tar.gz → 1.19.2__tar.gz

{openscad_cpp_evaluator-1.19.0 → openscad_cpp_evaluator-1.19.2}/PKG-INFO

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

{openscad_cpp_evaluator-1.19.0 → openscad_cpp_evaluator-1.19.2}/pyproject.toml

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

{openscad_cpp_evaluator-1.19.0 → openscad_cpp_evaluator-1.19.2}/src/builtins/primitives_3d.cpp

@@ -409,13 +409,20 @@ CSGParams resolveCylinder(Evaluator& ev, const oscad::ModularCall& node, EvalCon
     // per-end r1/r2, then the per-end d1/d2. So `cylinder(h=10, d=8, r1=5)`
     // is r1=5/r2=4, and `cylinder(h=10, r=5, r2=2)` is r1=5/r2=2. Both ends
     // default to 1 independently -- r2 does NOT fall back to r1.
+    //
+    // NUMBERS only, as the reference's isNumber() tests: a stray positional
+    // in a radius slot -- `cylinder(30, r=5, true)`, a mistyped center= --
+    // is ignored, not coerced. Lenient conversion turned that `true` into
+    // r1=1 and drew a cone where OpenSCAD draws the r=5 cylinder
+    // (BelfrySCAD #409).
+    const auto isNum = [](const Value& v) { return std::holds_alternative<double>(v); };
     double r1 = 1.0, r2 = 1.0;
-    if (!isUndef(rV)) r1 = r2 = toDoubleLenient(rV);
-    if (!isUndef(dV)) r1 = r2 = toDoubleLenient(dV) / 2.0;
-    if (!isUndef(r1V)) r1 = toDoubleLenient(r1V);
-    if (!isUndef(r2V)) r2 = toDoubleLenient(r2V);
-    if (!isUndef(d1V)) r1 = toDoubleLenient(d1V) / 2.0;
-    if (!isUndef(d2V)) r2 = toDoubleLenient(d2V) / 2.0;
+    if (isNum(rV)) r1 = r2 = std::get<double>(rV);
+    if (isNum(dV)) r1 = r2 = std::get<double>(dV) / 2.0;
+    if (isNum(r1V)) r1 = std::get<double>(r1V);
+    if (isNum(r2V)) r2 = std::get<double>(r2V);
+    if (isNum(d1V)) r1 = std::get<double>(d1V) / 2.0;
+    if (isNum(d2V)) r2 = std::get<double>(d2V) / 2.0;
 
     const int segs = fnSegmentsFromCtx(effCtx, std::max(r1, r2));
 

{openscad_cpp_evaluator-1.19.0 → openscad_cpp_evaluator-1.19.2}/src/expr_eval.cpp

@@ -193,6 +193,7 @@ std::optional<const Value*> Evaluator::fileGlobal(const oscad::Scope& fileRoot,
         // Source order, once; a read of a later global from an earlier one's
         // initializer finds nothing yet and is undef, as in OpenSCAD.
         for (const oscad::ASTNode* a : globals->assignments) {
+            coverHit(*a); // a used file's globals never pass through evalChildren
             evalAssignment(static_cast<const oscad::Assignment&>(*a), fctx);
         }
         return fctx.let_->find(name);

{openscad_cpp_evaluator-1.19.0 → openscad_cpp_evaluator-1.19.2}/src/text/freetype_font_provider.cpp

@@ -238,8 +238,15 @@ FreetypeFontProvider::FreetypeFontProvider() : impl_(std::make_unique<Impl>()) {
 FreetypeFontProvider::~FreetypeFontProvider() = default;
 
 FontHandle FreetypeFontProvider::resolveFont(const std::string& spec) {
-    const FontSpec parsed = parseFontSpec(spec);
-    if (parsed.families.empty()) return 0;
+    FontSpec parsed = parseFontSpec(spec);
+    if (parsed.families.empty()) {
+        // font=":style=bold" -- a style with no family names the DEFAULT
+        // family in that style, which is what fontconfig does with it and
+        // what BOSL2's text3d() example relies on (BelfrySCAD #405).
+        // Returning handle 0 here silently drew Regular.
+        if (parsed.style.empty()) return 0;
+        parsed.families.push_back(impl_->faces[0].metrics.family);
+    }
 
     const auto cached = impl_->bySpec.find(spec);
     if (cached != impl_->bySpec.end()) return cached->second;

{openscad_cpp_evaluator-1.19.0 → openscad_cpp_evaluator-1.19.2}/tests/test_coverage.cpp

@@ -223,6 +223,11 @@ TEST(Coverage, IncludedAndUsedFilesCarryTheirOwnOrigin) {
     EXPECT_EQ(body("used.scad", 2), 1u);
     EXPECT_EQ(body("used.scad", 3), 0u);
     EXPECT_EQ(statements["used.scad"], 1u) << "the used file's own global is in the universe";
+    for (const CoverageSpan& s : ev.coverageResult->spans) {
+        if (s.kind == CoverageKind::Statement && fs::path(s.origin).filename() == "used.scad") {
+            EXPECT_EQ(s.hits, 1u) << "and it ran, eagerly, when used_fn() first read it";
+        }
+    }
     std::map<std::string, double> pct;
     for (const CoverageFileSummary& f : ev.coverageResult->files) pct[fs::path(f.origin).filename().string()] = f.body_percent();
     EXPECT_EQ(pct.size(), 3u) << "main, include and used file each get a summary";

{openscad_cpp_evaluator-1.19.0 → openscad_cpp_evaluator-1.19.2}/tests/test_primitives.cpp

@@ -51,6 +51,19 @@ TEST(Cylinder, StraightCylinderVolumeAndBoundsWhenCentered) {
     EXPECT_NEAR(e.bodies[0].body->Volume(), analytic, analytic * 0.02);
 }
 
+TEST(Cylinder, NonNumericRadiusIsIgnoredNotCoerced) {
+    // cylinder(30, r=5, true): the `true` lands in r1's slot. The reference
+    // applies a radius only if it isNumber(), so this is the r=5 cylinder;
+    // lenient conversion made it a cone from r1=1 (BelfrySCAD #409).
+    Evaluated e = evalSrc("cylinder(30, r=5, true, $fn=32);");
+    ASSERT_TRUE(e.bodies[0].body.has_value());
+    const double analytic = std::numbers::pi * 5.0 * 5.0 * 30.0;
+    EXPECT_NEAR(e.bodies[0].body->Volume(), analytic, analytic * 0.02);
+    // Same rule for every radius spelling, and a string is not a number.
+    Evaluated s = evalSrc("cylinder(h=30, r=5, r2=\"7\", $fn=32);");
+    EXPECT_NEAR(s.bodies[0].body->Volume(), analytic, analytic * 0.02);
+}
+
 TEST(Cylinder, UncenteredSitsOnZEqualsZero) {
     Evaluated e = evalSrc("cylinder(h=5, r=1, $fn=16);");
     manifold::Box bbox = e.bodies[0].body->BoundingBox();

{openscad_cpp_evaluator-1.19.0 → openscad_cpp_evaluator-1.19.2}/tests/test_text.cpp

@@ -380,6 +380,22 @@ TEST(FontArgs, TheLaterPositionalsLineUpToo) {
     EXPECT_EQ(echoes[0], "ECHO: true, true");
 }
 
+TEST(TextArgs, StyleWithoutFamilyStylesTheDefaultFace) {
+    // font=":style=bold" -- BOSL2's text3d() example 2 -- drew Regular:
+    // no family, so resolveFont handed back the default handle and never
+    // looked at the style (BelfrySCAD #405). It means the default family
+    // in bold, the same face "Liberation Sans:style=Bold" names.
+    std::vector<std::string> echoes;
+    evalSrc(
+        "b = render() { linear_extrude(1) text(\"Hi\", 10, font=\":style=bold\"); };\n"
+        "n = render() { linear_extrude(1) text(\"Hi\", 10, font=\"Liberation Sans:style=Bold\"); };\n"
+        "d = render() { linear_extrude(1) text(\"Hi\", 10); };\n"
+        "echo(b.volume == n.volume, b.volume == d.volume);\n",
+        [&](const std::string& m) { echoes.push_back(m); });
+    ASSERT_EQ(echoes.size(), 1u);
+    EXPECT_EQ(echoes[0], "ECHO: true, false");
+}
+
 TEST(TextArgs, FontIsPositionalButTheRestAreNot) {
     // text("Hi", 10, "Liberation Sans:style=Bold") silently drew the
     // DEFAULT face: `font` was name-only, so the third argument went