openscad-cpp-evaluator 1.28.3__tar.gz → 1.28.4__tar.gz

{openscad_cpp_evaluator-1.28.3 → openscad_cpp_evaluator-1.28.4}/PKG-INFO

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

{openscad_cpp_evaluator-1.28.3 → openscad_cpp_evaluator-1.28.4}/include/openscad_cpp_evaluator/eval_use.hpp

@@ -24,6 +24,10 @@ namespace oscadeval {
 struct UsedFileGlobals {
     const oscad::Scope* root = nullptr;
     std::vector<const oscad::ASTNode*> assignments;
+    // Every module/function the file sees -- its own and what it use<>d --
+    // for coverage, which is otherwise handed only the top file's nodes, so
+    // a file reached only by a nested use<> went unreported.
+    std::vector<const oscad::ASTNode*> declarations;
 };
 
 struct ResolvedUseScopes {

{openscad_cpp_evaluator-1.28.3 → openscad_cpp_evaluator-1.28.4}/pyproject.toml

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

{openscad_cpp_evaluator-1.28.3 → openscad_cpp_evaluator-1.28.4}/src/csg_resolve.cpp

@@ -303,7 +303,10 @@ std::vector<ColoredBody> Evaluator::evaluateImpl(const NodeList& nodes, EvalCont
         roots.reserve(nodes.size());
         for (const auto& n : nodes) roots.push_back(&*n);
         std::vector<const oscad::ASTNode*> extra;
-        for (const UsedFileGlobals& g : usedFileGlobals_) extra.insert(extra.end(), g.assignments.begin(), g.assignments.end());
+        for (const UsedFileGlobals& g : usedFileGlobals_) {
+            extra.insert(extra.end(), g.assignments.begin(), g.assignments.end());
+            roots.insert(roots.end(), g.declarations.begin(), g.declarations.end());  // merged by position
+        }
         coverageResult = buildCoverageResult(roots, extra, coverageRecorder_);
     }
 

{openscad_cpp_evaluator-1.28.3 → openscad_cpp_evaluator-1.28.4}/src/eval_use.cpp

@@ -92,6 +92,11 @@ ResolvedUseScopes resolveUseScopesInto(const std::vector<const oscad::ASTNode*>&
         for (const oscad::ASTNode* n : nested.ownNodesFiltered) {
             if (n->kind() == oscad::NodeKind::Assignment) globals.assignments.push_back(n);
         }
+        for (const oscad::ASTNode* n : nested.processedNodes) {
+            if (n->kind() == oscad::NodeKind::ModuleDeclaration || n->kind() == oscad::NodeKind::FunctionDeclaration) {
+                globals.declarations.push_back(n);
+            }
+        }
         result.usedFileGlobals.push_back(std::move(globals));
     }
 

{openscad_cpp_evaluator-1.28.3 → openscad_cpp_evaluator-1.28.4}/tests/test_coverage.cpp

@@ -299,4 +299,32 @@ TEST(Coverage, AFileUsedTwiceIsListedOnce) {
     fs::remove_all(dir);
 }
 
+// A file reached only through a used file's own use<> ran too. Only the top
+// file's nodes were handed to coverage, so its declarations went unlisted.
+TEST(Coverage, AFileReachedByNestedUseIsListed) {
+    namespace fs = std::filesystem;
+    const fs::path dir = fs::temp_directory_path() / "oscad_cov_nested";
+    fs::create_directories(dir);
+    const fs::path lib = dir / "lib.scad", mid = dir / "mid.scad", main = dir / "main.scad";
+    std::ofstream(lib) << "g = 1;\nfunction hit(x) = x + g;\nfunction miss(x) = x;\n";
+    std::ofstream(mid) << "use <lib.scad>\nfunction f() = hit(1);\n";
+    std::ofstream(main) << "use <mid.scad>\necho(f(), f());\n";
+    auto ast = oscad::getASTFromFile(main.string());
+    ResolvedUseScopes uses = resolveUseScopes(ast, main.string(), {});
+    Evaluator ev({}, nullptr, nullptr, {}, false, /*coverage=*/true);
+    ev.setUsedFileGlobals(uses.usedFileGlobals);
+    EvalContext ctx = EvalContext::makeRoot(uses.rootScope.get());
+    ev.evaluate(uses.processedNodes, ctx, {}, false);
+    ASSERT_TRUE(ev.coverageResult.has_value());
+    std::map<std::pair<int, CoverageKind>, std::vector<std::uint32_t>> libSpans;
+    for (const CoverageSpan& s : ev.coverageResult->spans) {
+        if (fs::path(s.origin).filename() == "lib.scad") libSpans[{s.line, s.kind}].push_back(s.hits);
+    }
+    auto hits = [&](int line, CoverageKind kind) { return libSpans[std::make_pair(line, kind)]; };
+    EXPECT_EQ(hits(2, CoverageKind::Body), std::vector<std::uint32_t>{2u});
+    EXPECT_EQ(hits(3, CoverageKind::Body), std::vector<std::uint32_t>{0u});
+    EXPECT_EQ(hits(1, CoverageKind::Statement), std::vector<std::uint32_t>{1u});  // its global, read and so evaluated, once
+    fs::remove_all(dir);
+}
+
 } // namespace oscadeval

{openscad_cpp_evaluator-1.28.3 → openscad_cpp_evaluator-1.28.4}/uv.lock

@@ -55,7 +55,7 @@ wheels = [
 
 [[package]]
 name = "openscad-cpp-evaluator"
-version = "1.28.3"
+version = "1.28.4"
 source = { editable = "." }
 dependencies = [
     { name = "numpy" },