f38521298b
Some checks failed
CI / build-test-release (pull_request) Failing after 6m5s
A primary module interface unit — `export module Widget;`, no partitions — recorded nothing about what it imported. GetInterfacesAndImplementations registered the Module and then erased the file from the scan list, so the import pass only ever saw partitions, and Module had no vectors to hold an edge anyway. Two consequences, both reported as issue #26: Module::Check consulted only its own .cppm and its partitions. A data member added to an imported module left Widget.pcm, Widget.o and every consumer object untouched while the imported library rebuilt and both binaries relinked — one executable holding two class layouts, no diagnostic, and a crash somewhere unrelated. Wiping build/ was the only cure, so `crafter-build test` could not be trusted straight after an interface edit. Module::Compile waited on nothing. Two modules in one Configuration compile on concurrent threads, so a primary interface importing a sibling was a coin flip between working and "module 'Base' not found". Partitions never had either problem — they carry the same three vectors and Check/Compile honour them — which is why the gap only surfaced on a module whose interface is one flat unit. Module now carries moduleDependencies, externalModuleDependencies and pendingImports with the same meanings as on ModulePartition; primary units stay in the scan list so their imports land there; Check sees through them; Compile orders itself behind a local sibling; and ResolvePendingImports sweeps them so an edge survives dependencies being wired up afterwards. Build() now Checks every interface before spawning any compile thread — the `compiled` flag a waiter blocks on is raised either by a Compile that runs or by the Check that decides none is needed, so a Check still pending while another module's thread waits would have hung the build. Resolves #26 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
55 lines
2.7 KiB
C++
55 lines
2.7 KiB
C++
// SPDX-License-Identifier: LGPL-3.0-only
|
|
// SPDX-FileCopyrightText: Copyright (C) 2026 Catcrafts®
|
|
|
|
module;
|
|
#include "Crafter.Build-Api.h"
|
|
export module Crafter.Build:Interface;
|
|
import std;
|
|
namespace fs = std::filesystem;
|
|
|
|
namespace Crafter {
|
|
export class Module;
|
|
export class ModulePartition {
|
|
public:
|
|
std::vector<Module*> moduleDependencies;
|
|
std::vector<ModulePartition*> partitionDependencies;
|
|
std::vector<std::pair<Module*, fs::path>> externalModuleDependencies;
|
|
// Names from `import X;` that matched neither a module in this
|
|
// Configuration nor one reachable through its dependencies at the time
|
|
// the source was scanned. Retried by ResolvePendingImports (see
|
|
// Crafter.Build:Clang) so a dependency wired up after
|
|
// GetInterfacesAndImplementations still produces a staleness edge.
|
|
// Names that never resolve (`std`, module-mapped externals) stay here.
|
|
std::vector<std::string> pendingImports;
|
|
std::atomic<bool> compiled;
|
|
bool needsRecompiling = false;
|
|
bool checked = false;
|
|
std::string name;
|
|
fs::path path;
|
|
CRAFTER_API ModulePartition(std::string&& name, fs::path&& path);
|
|
CRAFTER_API bool Check(const fs::path& pcmDir, fs::file_time_type sourceFloor = fs::file_time_type::min());
|
|
CRAFTER_API void Compile(const std::string_view clang, const fs::path& pcmDir, const fs::path& buildDir, std::atomic<bool>& buildCancelled, std::string& buildError);
|
|
};
|
|
|
|
export class Module {
|
|
public:
|
|
// A primary module interface unit imports things too — `import Base;`
|
|
// in `export module Widget;` is as much a layout dependency as the
|
|
// same line in a partition. Recorded on the same three vectors, with
|
|
// the same meanings, so Check() can see through them and Compile()
|
|
// can order itself behind a sibling module in the same Configuration
|
|
// (issue #26).
|
|
std::vector<Module*> moduleDependencies;
|
|
std::vector<std::pair<Module*, fs::path>> externalModuleDependencies;
|
|
std::vector<std::string> pendingImports;
|
|
std::atomic<bool> compiled;
|
|
bool needsRecompiling = false;
|
|
bool checked = false;
|
|
std::vector<std::unique_ptr<ModulePartition>> partitions;
|
|
std::string name;
|
|
fs::path path;
|
|
CRAFTER_API Module(std::string&& name, fs::path&& path);
|
|
CRAFTER_API bool Check(const fs::path& pcmDir, fs::file_time_type sourceFloor = fs::file_time_type::min());
|
|
CRAFTER_API void Compile(const std::string_view clang, const fs::path& pcmDir, const fs::path& buildDir, std::atomic<bool>& buildCancelled, std::string& buildError);
|
|
};
|
|
}
|