Add module loader and related tests

Introduce `ModuleLoader` to handle `#use` directives and dependency
resolution. This involves adding `tempfile` dependency, modifying
`Cargo.toml` and `Cargo.lock`, creating a new `module_loader.rs` file,
and updating `environment.rs` to use the new module.

Also, add comprehensive tests for `Diagnostics::format_errors`,
`CompilationResult`, and the new `ModuleLoader` functionality. These
tests cover various scenarios including empty diagnostics, multiple
errors, error formatting, compilation success/failure, and complex
dependency loading with topological ordering and search path resolution.
This commit is contained in:
2026-03-27 15:08:28 +01:00
parent 636f5a1814
commit 1f0208af95
8 changed files with 457 additions and 123 deletions
+1
View File
@@ -1,5 +1,6 @@
pub mod analyzer;
pub mod binder;
pub mod module_loader;
pub mod captures;
pub mod dumper;
pub mod emitter;
+168
View File
@@ -0,0 +1,168 @@
use std::cell::RefCell;
use std::collections::HashSet;
use std::path::{Path, PathBuf};
use std::rc::Rc;
use crate::ast::nodes::SyntaxNode;
use crate::ast::parser::Parser;
/// Resolves `#use` directives and collects `.myc` dependency files in topological order.
/// File I/O and dependency graph traversal are fully encapsulated here;
/// compilation and execution remain the caller's responsibility.
pub struct ModuleLoader {
search_paths: Rc<RefCell<Vec<PathBuf>>>,
loaded_modules: Rc<RefCell<HashSet<PathBuf>>>,
}
impl ModuleLoader {
pub fn new(
search_paths: Rc<RefCell<Vec<PathBuf>>>,
loaded_modules: Rc<RefCell<HashSet<PathBuf>>>,
) -> Self {
Self {
search_paths,
loaded_modules,
}
}
/// Collects all dependency files for `source` in topological order (dependencies before
/// dependents). Already-loaded modules (tracked in `loaded_modules`) are skipped.
pub fn collect_dependency_files(
&self,
source: &str,
base_path: &Path,
) -> Result<Vec<(PathBuf, SyntaxNode)>, String> {
let mut files = Vec::new();
self.collect_dependencies(source, base_path, &mut files)?;
Ok(files)
}
/// Returns a list of all matching `.myc` files for `module_path`
/// (resolves to single file or all files in a directory, alphabetically sorted).
fn resolve_module_paths(
&self,
module_path: &str,
base_path: &Path,
) -> Result<Vec<PathBuf>, String> {
let relative_path = module_path.replace("->", std::path::MAIN_SEPARATOR_STR);
let file_name = format!("{}.myc", relative_path);
let check_path = |base: &Path| -> Option<Vec<PathBuf>> {
// Check for file first
let mut file_p = base.to_path_buf();
file_p.push(&file_name);
if file_p.is_file() && let Ok(canon) = file_p.canonicalize() {
return Some(vec![canon]);
}
// Check for directory
let mut dir_p = base.to_path_buf();
dir_p.push(&relative_path);
if dir_p.is_dir() {
let mut files = Vec::new();
if let Ok(entries) = std::fs::read_dir(&dir_p) {
let mut valid_entries: Vec<_> = entries.filter_map(|e| e.ok()).collect();
valid_entries.sort_by_key(|e| e.path());
for entry in valid_entries {
let p = entry.path();
if p.is_file()
&& p.extension().is_some_and(|ext| ext == "myc")
&& let Ok(canon) = p.canonicalize()
{
files.push(canon);
}
}
}
if !files.is_empty() {
return Some(files);
}
}
None
};
// 1. Try relative to base_path
if let Some(paths) = check_path(base_path) {
return Ok(paths);
}
// 2. Try configured search paths
for sp in self.search_paths.borrow().iter() {
if let Some(paths) = check_path(sp) {
return Ok(paths);
}
}
Err(format!(
"Could not find module or directory '{}'",
module_path
))
}
/// Recursively collects dependencies into `all_files` in topological order.
fn collect_dependencies(
&self,
source: &str,
base_path: &Path,
all_files: &mut Vec<(PathBuf, SyntaxNode)>,
) -> Result<(), String> {
let directives = self.extract_use_directives(source);
for module_path in directives {
let abs_paths = self.resolve_module_paths(&module_path, base_path)?;
for abs_path in abs_paths {
if self.loaded_modules.borrow().contains(&abs_path) {
continue;
}
self.loaded_modules.borrow_mut().insert(abs_path.clone());
let lib_source = std::fs::read_to_string(&abs_path)
.map_err(|e| format!("Failed to read module {:?}: {}", abs_path, e))?;
// Recurse: load transitive dependencies before the current file (topological order)
let lib_base = abs_path.parent().unwrap_or(Path::new("."));
self.collect_dependencies(&lib_source, lib_base, all_files)?;
let mut parser = Parser::new(&lib_source);
let syntax_ast = parser.parse_expression();
if parser.diagnostics.has_errors() {
return Err(format!(
"Parser error in module {:?}:\n{}",
abs_path, parser.diagnostics.items[0].message
));
}
all_files.push((abs_path, syntax_ast));
}
}
Ok(())
}
/// Extracts `#use <path>` directives from the leading lines of `source`.
/// Stops at the first non-directive, non-comment line.
fn extract_use_directives(&self, source: &str) -> Vec<String> {
let mut paths = Vec::new();
for line in source.lines() {
let trimmed = line.trim();
if trimmed.is_empty() || trimmed.starts_with(';') {
continue;
}
if let Some(stripped) = trimmed.strip_prefix("#use ") {
let path = stripped.trim();
let clean_path = if (path.starts_with('"') && path.ends_with('"'))
|| (path.starts_with('\'') && path.ends_with('\''))
{
&path[1..path.len() - 1]
} else {
path
};
paths.push(clean_path.to_string());
} else {
break;
}
}
paths
}
}