pr 03.C
This commit is contained in:
@@ -4,7 +4,7 @@ use crate::common::diagnostics::DiagnosticBundle;
|
||||
use crate::common::files::FileManager;
|
||||
use crate::common::spans::Span;
|
||||
use crate::deps::resolver::ProjectId;
|
||||
use crate::frontends::pbs::ast::FileNode;
|
||||
use crate::frontends::pbs::ast::ParsedAst;
|
||||
use crate::frontends::pbs::collector::SymbolCollector;
|
||||
use crate::frontends::pbs::lowering::Lowerer;
|
||||
use crate::frontends::pbs::parser::Parser;
|
||||
@@ -116,7 +116,7 @@ pub fn compile_project(
|
||||
let mut interner = NameInterner::new();
|
||||
// 1. Parse all files and group symbols by module
|
||||
let mut module_symbols_map: HashMap<String, ModuleSymbols> = HashMap::new();
|
||||
let mut parsed_files: Vec<(String, FileNode)> = Vec::new(); // (module_path, ast)
|
||||
let mut parsed_files: Vec<(String, ParsedAst)> = Vec::new(); // (module_path, ast)
|
||||
|
||||
for source_rel in &step.sources {
|
||||
let source_abs = step.project_dir.join(source_rel);
|
||||
@@ -124,10 +124,10 @@ pub fn compile_project(
|
||||
let file_id = file_manager.add(source_abs.clone(), source_code.clone());
|
||||
|
||||
let mut parser = Parser::new(&source_code, file_id, &mut interner);
|
||||
let ast = parser.parse_file()?;
|
||||
|
||||
let parsed = parser.parse_file()?;
|
||||
|
||||
let mut collector = SymbolCollector::new(&interner);
|
||||
let (ts, vs) = collector.collect(&ast)?;
|
||||
let (ts, vs) = collector.collect(&parsed.arena, parsed.root)?;
|
||||
|
||||
let full_path = source_rel.to_string_lossy().replace('\\', "/");
|
||||
let logical_module_path = if let Some(stripped) = full_path.strip_prefix("src/main/modules/") {
|
||||
@@ -173,7 +173,7 @@ pub fn compile_project(
|
||||
let _ = ms.value_symbols.insert(sym);
|
||||
}
|
||||
|
||||
parsed_files.push((module_path, ast));
|
||||
parsed_files.push((module_path, parsed));
|
||||
}
|
||||
|
||||
// 2. Synthesize ModuleSymbols for dependencies
|
||||
@@ -243,10 +243,10 @@ pub fn compile_project(
|
||||
// We need to collect imported symbols for Lowerer
|
||||
let mut file_imported_symbols: HashMap<String, ModuleSymbols> = HashMap::new(); // keyed by module_path
|
||||
|
||||
for (module_path, ast) in &parsed_files {
|
||||
for (module_path, parsed) in &parsed_files {
|
||||
let ms = module_symbols_map.get(module_path).unwrap();
|
||||
let mut resolver = Resolver::new(ms, &module_provider, &interner);
|
||||
resolver.resolve(ast)?;
|
||||
resolver.resolve(&parsed.arena, parsed.root)?;
|
||||
|
||||
// Capture imported symbols
|
||||
file_imported_symbols.insert(module_path.clone(), resolver.imported_symbols.clone());
|
||||
@@ -255,7 +255,7 @@ pub fn compile_project(
|
||||
let mut ms_mut = module_symbols_map.get_mut(module_path).unwrap();
|
||||
let imported = file_imported_symbols.get(module_path).unwrap();
|
||||
let mut typechecker = TypeChecker::new(&mut ms_mut, imported, &module_provider, &interner);
|
||||
typechecker.check(ast)?;
|
||||
typechecker.check(&parsed.arena, parsed.root)?;
|
||||
}
|
||||
|
||||
// 4. Lower to IR
|
||||
@@ -266,11 +266,11 @@ pub fn compile_project(
|
||||
field_types: HashMap::new(),
|
||||
};
|
||||
|
||||
for (module_path, ast) in &parsed_files {
|
||||
for (module_path, parsed) in &parsed_files {
|
||||
let ms = module_symbols_map.get(module_path).unwrap();
|
||||
let imported = file_imported_symbols.get(module_path).unwrap();
|
||||
let lowerer = Lowerer::new(ms, imported, &interner);
|
||||
let program = lowerer.lower_file(ast, module_path)?;
|
||||
let lowerer = Lowerer::new(&parsed.arena, ms, imported, &interner);
|
||||
let program = lowerer.lower_file(parsed.root, module_path)?;
|
||||
|
||||
// Combine program into combined_program
|
||||
if combined_program.modules.is_empty() {
|
||||
|
||||
Reference in New Issue
Block a user