pr 04
This commit is contained in:
@@ -75,13 +75,13 @@ impl Linker {
|
||||
let mut combined_pc_to_span = Vec::new();
|
||||
let mut combined_function_names = Vec::new();
|
||||
|
||||
// 1. DebugSymbol resolution map: (ProjectId, module_path, symbol_name) -> func_idx in combined_functions
|
||||
// 1. DebugSymbol resolution map: (ProjectKey, module_path, symbol_name) -> func_idx in combined_functions
|
||||
let mut global_symbols = HashMap::new();
|
||||
|
||||
let mut module_code_offsets = Vec::with_capacity(modules.len());
|
||||
let mut module_function_offsets = Vec::with_capacity(modules.len());
|
||||
|
||||
// Map ProjectId to index
|
||||
// Map ProjectKey to index
|
||||
let _project_to_idx: HashMap<_, _> = modules.iter().enumerate().map(|(i, m)| (m.project_id.clone(), i)).collect();
|
||||
|
||||
// PASS 1: Collect exports and calculate offsets
|
||||
@@ -279,16 +279,19 @@ mod tests {
|
||||
use super::*;
|
||||
use crate::building::output::{ExportKey, ExportMetadata, ImportKey, ImportMetadata};
|
||||
use crate::building::plan::BuildTarget;
|
||||
use crate::deps::resolver::ProjectId;
|
||||
use crate::deps::resolver::ProjectKey;
|
||||
use crate::semantics::export_surface::ExportSurfaceKind;
|
||||
use prometeu_analysis::ids::ProjectId;
|
||||
use prometeu_bytecode::opcode::OpCode;
|
||||
use prometeu_bytecode::FunctionMeta;
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
#[test]
|
||||
fn test_link_root_and_lib() {
|
||||
let lib_id = ProjectId { name: "lib".into(), version: "1.0.0".into() };
|
||||
let root_id = ProjectId { name: "root".into(), version: "1.0.0".into() };
|
||||
let lib_key = ProjectKey { name: "lib".into(), version: "1.0.0".into() };
|
||||
let root_key = ProjectKey { name: "root".into(), version: "1.0.0".into() };
|
||||
let lib_id = ProjectId(0);
|
||||
let root_id = ProjectId(1);
|
||||
|
||||
// Lib module: exports 'add'
|
||||
let mut lib_code = Vec::new();
|
||||
@@ -303,7 +306,8 @@ mod tests {
|
||||
}, ExportMetadata { func_idx: Some(0), is_host: false, ty: None });
|
||||
|
||||
let lib_module = CompiledModule {
|
||||
project_id: lib_id.clone(),
|
||||
project_id: lib_id,
|
||||
project_key: lib_key.clone(),
|
||||
target: BuildTarget::Main,
|
||||
exports: lib_exports,
|
||||
imports: vec![],
|
||||
@@ -340,7 +344,8 @@ mod tests {
|
||||
}];
|
||||
|
||||
let root_module = CompiledModule {
|
||||
project_id: root_id.clone(),
|
||||
project_id: root_id,
|
||||
project_key: root_key.clone(),
|
||||
target: BuildTarget::Main,
|
||||
exports: BTreeMap::new(),
|
||||
imports: root_imports,
|
||||
@@ -356,18 +361,20 @@ mod tests {
|
||||
};
|
||||
|
||||
let lib_step = BuildStep {
|
||||
project_id: lib_id.clone(),
|
||||
project_id: lib_id,
|
||||
project_key: lib_key.clone(),
|
||||
project_dir: "".into(),
|
||||
target: BuildTarget::Main,
|
||||
sources: vec![],
|
||||
deps: BTreeMap::new(),
|
||||
};
|
||||
|
||||
let mut root_deps = BTreeMap::new();
|
||||
root_deps.insert("mylib".into(), lib_id.clone());
|
||||
let mut root_deps: BTreeMap<String, ProjectId> = BTreeMap::new();
|
||||
root_deps.insert("mylib".into(), lib_id);
|
||||
|
||||
let root_step = BuildStep {
|
||||
project_id: root_id.clone(),
|
||||
project_id: root_id,
|
||||
project_key: root_key.clone(),
|
||||
project_dir: "".into(),
|
||||
target: BuildTarget::Main,
|
||||
sources: vec![],
|
||||
@@ -391,11 +398,13 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn test_link_const_deduplication() {
|
||||
let id = ProjectId { name: "test".into(), version: "1.0.0".into() };
|
||||
let step = BuildStep { project_id: id.clone(), project_dir: "".into(), target: BuildTarget::Main, sources: vec![], deps: BTreeMap::new() };
|
||||
let key = ProjectKey { name: "test".into(), version: "1.0.0".into() };
|
||||
let id = ProjectId(0);
|
||||
let step = BuildStep { project_id: id, project_key: key.clone(), project_dir: "".into(), target: BuildTarget::Main, sources: vec![], deps: BTreeMap::new() };
|
||||
|
||||
let m1 = CompiledModule {
|
||||
project_id: id.clone(),
|
||||
project_id: id,
|
||||
project_key: key.clone(),
|
||||
target: BuildTarget::Main,
|
||||
exports: BTreeMap::new(),
|
||||
imports: vec![],
|
||||
@@ -407,7 +416,8 @@ mod tests {
|
||||
};
|
||||
|
||||
let m2 = CompiledModule {
|
||||
project_id: id.clone(),
|
||||
project_id: id,
|
||||
project_key: key.clone(),
|
||||
target: BuildTarget::Main,
|
||||
exports: BTreeMap::new(),
|
||||
imports: vec![],
|
||||
|
||||
@@ -77,7 +77,7 @@ pub fn build_from_graph(graph: &ResolvedGraph, target: BuildTarget) -> Result<Bu
|
||||
}
|
||||
|
||||
all_project_symbols.push(crate::common::symbols::ProjectSymbols {
|
||||
project: module.project_id.name.clone(),
|
||||
project: module.project_key.name.clone(),
|
||||
project_dir: project_dir.to_string_lossy().to_string(),
|
||||
symbols: rel_symbols,
|
||||
});
|
||||
|
||||
@@ -3,7 +3,8 @@ use crate::building::plan::{BuildStep, BuildTarget};
|
||||
use crate::common::diagnostics::DiagnosticBundle;
|
||||
use crate::common::files::FileManager;
|
||||
use crate::common::spans::{FileId, Span};
|
||||
use crate::deps::resolver::ProjectId;
|
||||
use crate::deps::resolver::ProjectKey;
|
||||
use prometeu_analysis::ids::ProjectId;
|
||||
use crate::frontends::pbs::ast::ParsedAst;
|
||||
use crate::frontends::pbs::collector::SymbolCollector;
|
||||
use crate::frontends::pbs::lowering::Lowerer;
|
||||
@@ -49,6 +50,7 @@ pub struct ImportMetadata {
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct CompiledModule {
|
||||
pub project_id: ProjectId,
|
||||
pub project_key: ProjectKey,
|
||||
pub target: BuildTarget,
|
||||
pub exports: BTreeMap<ExportKey, ExportMetadata>,
|
||||
pub imports: Vec<ImportMetadata>,
|
||||
@@ -339,7 +341,7 @@ pub fn compile_project(
|
||||
|
||||
// 6. Collect symbols
|
||||
let project_symbols = crate::common::symbols::collect_symbols(
|
||||
&step.project_id.name,
|
||||
&step.project_key.name,
|
||||
&module_symbols_map,
|
||||
file_manager,
|
||||
&interner,
|
||||
@@ -374,6 +376,7 @@ pub fn compile_project(
|
||||
|
||||
Ok(CompiledModule {
|
||||
project_id: step.project_id,
|
||||
project_key: step.project_key,
|
||||
target: step.target,
|
||||
exports,
|
||||
imports,
|
||||
@@ -413,9 +416,11 @@ mod tests {
|
||||
|
||||
fs::write(project_dir.join("src/main/modules/main.pbs"), main_code).unwrap();
|
||||
|
||||
let project_id = ProjectId { name: "root".to_string(), version: "0.1.0".to_string() };
|
||||
let project_key = ProjectKey { name: "root".to_string(), version: "0.1.0".to_string() };
|
||||
let project_id = ProjectId(0);
|
||||
let step = BuildStep {
|
||||
project_id: project_id.clone(),
|
||||
project_id,
|
||||
project_key: project_key.clone(),
|
||||
project_dir: project_dir.clone(),
|
||||
target: BuildTarget::Main,
|
||||
sources: vec![PathBuf::from("src/main/modules/main.pbs")],
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
use crate::deps::resolver::{ProjectId, ResolvedGraph};
|
||||
use crate::deps::resolver::{ProjectKey, ResolvedGraph};
|
||||
use prometeu_analysis::ids::ProjectId;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::collections::{BTreeMap, HashMap};
|
||||
use std::path::PathBuf;
|
||||
@@ -13,6 +14,7 @@ pub enum BuildTarget {
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct BuildStep {
|
||||
pub project_id: ProjectId,
|
||||
pub project_key: ProjectKey,
|
||||
pub project_dir: PathBuf,
|
||||
pub target: BuildTarget,
|
||||
pub sources: Vec<PathBuf>,
|
||||
@@ -47,15 +49,16 @@ impl BuildPlan {
|
||||
.collect();
|
||||
sources.sort();
|
||||
|
||||
let mut deps = BTreeMap::new();
|
||||
let mut deps: BTreeMap<String, ProjectId> = BTreeMap::new();
|
||||
if let Some(edges) = graph.edges.get(&id) {
|
||||
for edge in edges {
|
||||
deps.insert(edge.alias.clone(), edge.to.clone());
|
||||
deps.insert(edge.alias.clone(), edge.to);
|
||||
}
|
||||
}
|
||||
|
||||
steps.push(BuildStep {
|
||||
project_id: id.clone(),
|
||||
project_id: id,
|
||||
project_key: node.key.clone(),
|
||||
project_dir: node.path.clone(),
|
||||
target,
|
||||
sources,
|
||||
@@ -89,19 +92,19 @@ fn topological_sort(graph: &ResolvedGraph) -> Vec<ProjectId> {
|
||||
|
||||
let mut ready: std::collections::BinaryHeap<ReverseProjectId> = graph.nodes.keys()
|
||||
.filter(|id| *in_degree.get(id).unwrap() == 0)
|
||||
.map(|id| ReverseProjectId(id.clone()))
|
||||
.map(|id| ReverseProjectId(*id))
|
||||
.collect();
|
||||
|
||||
let mut result = Vec::new();
|
||||
while let Some(ReverseProjectId(u)) = ready.pop() {
|
||||
result.push(u.clone());
|
||||
result.push(u);
|
||||
|
||||
if let Some(neighbors) = adj.get(&u) {
|
||||
for v in neighbors {
|
||||
let degree = in_degree.get_mut(v).unwrap();
|
||||
*degree -= 1;
|
||||
if *degree == 0 {
|
||||
ready.push(ReverseProjectId(v.clone()));
|
||||
ready.push(ReverseProjectId(*v));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -110,15 +113,14 @@ fn topological_sort(graph: &ResolvedGraph) -> Vec<ProjectId> {
|
||||
result
|
||||
}
|
||||
|
||||
#[derive(Eq, PartialEq)]
|
||||
#[derive(Eq, PartialEq, Copy, Clone)]
|
||||
struct ReverseProjectId(ProjectId);
|
||||
|
||||
impl Ord for ReverseProjectId {
|
||||
fn cmp(&self, other: &Self) -> std::cmp::Ordering {
|
||||
// BinaryHeap is a max-heap. We want min-heap for lexicographic order.
|
||||
// So we reverse the comparison.
|
||||
other.0.name.cmp(&self.0.name)
|
||||
.then(other.0.version.cmp(&self.0.version))
|
||||
// BinaryHeap is a max-heap. We want min-heap with stable numeric order.
|
||||
// So we reverse the comparison on the numeric id.
|
||||
other.0.as_u32().cmp(&self.0.as_u32())
|
||||
}
|
||||
}
|
||||
|
||||
@@ -131,14 +133,15 @@ impl PartialOrd for ReverseProjectId {
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::deps::resolver::{ProjectId, ResolvedEdge, ResolvedGraph, ResolvedNode};
|
||||
use crate::deps::resolver::{ProjectKey, ResolvedEdge, ResolvedGraph, ResolvedNode};
|
||||
use crate::manifest::Manifest;
|
||||
use crate::sources::ProjectSources;
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
fn mock_node(name: &str, version: &str) -> ResolvedNode {
|
||||
ResolvedNode {
|
||||
id: ProjectId { name: name.to_string(), version: version.to_string() },
|
||||
fn mock_node(id: ProjectId, name: &str, version: &str) -> (ProjectId, ResolvedNode) {
|
||||
let node = ResolvedNode {
|
||||
id,
|
||||
key: ProjectKey { name: name.to_string(), version: version.to_string() },
|
||||
path: PathBuf::from(format!("/{}", name)),
|
||||
manifest: Manifest {
|
||||
name: name.to_string(),
|
||||
@@ -151,96 +154,95 @@ mod tests {
|
||||
files: vec![PathBuf::from("b.pbs"), PathBuf::from("a.pbs")],
|
||||
test_files: vec![PathBuf::from("test_b.pbs"), PathBuf::from("test_a.pbs")],
|
||||
},
|
||||
}
|
||||
};
|
||||
(id, node)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_topo_sort_stability() {
|
||||
let mut graph = ResolvedGraph::default();
|
||||
|
||||
let a = mock_node("a", "1.0.0");
|
||||
let b = mock_node("b", "1.0.0");
|
||||
let c = mock_node("c", "1.0.0");
|
||||
|
||||
graph.nodes.insert(a.id.clone(), a);
|
||||
graph.nodes.insert(b.id.clone(), b);
|
||||
graph.nodes.insert(c.id.clone(), c);
|
||||
|
||||
// No edges, should be alphabetical: a, b, c
|
||||
|
||||
let (a_id, a) = mock_node(ProjectId(0), "a", "1.0.0");
|
||||
let (b_id, b) = mock_node(ProjectId(1), "b", "1.0.0");
|
||||
let (c_id, c) = mock_node(ProjectId(2), "c", "1.0.0");
|
||||
|
||||
graph.nodes.insert(a_id, a);
|
||||
graph.nodes.insert(b_id, b);
|
||||
graph.nodes.insert(c_id, c);
|
||||
|
||||
// No edges, order by numeric id: a(0), b(1), c(2)
|
||||
let plan = BuildPlan::from_graph(&graph, BuildTarget::Main);
|
||||
assert_eq!(plan.steps[0].project_id.name, "a");
|
||||
assert_eq!(plan.steps[1].project_id.name, "b");
|
||||
assert_eq!(plan.steps[2].project_id.name, "c");
|
||||
assert_eq!(plan.steps[0].project_key.name, "a");
|
||||
assert_eq!(plan.steps[1].project_key.name, "b");
|
||||
assert_eq!(plan.steps[2].project_key.name, "c");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_topo_sort_dependencies() {
|
||||
let mut graph = ResolvedGraph::default();
|
||||
|
||||
let a = mock_node("a", "1.0.0");
|
||||
let b = mock_node("b", "1.0.0");
|
||||
let c = mock_node("c", "1.0.0");
|
||||
|
||||
graph.nodes.insert(a.id.clone(), a.clone());
|
||||
graph.nodes.insert(b.id.clone(), b.clone());
|
||||
graph.nodes.insert(c.id.clone(), c.clone());
|
||||
|
||||
|
||||
let (a_id, a) = mock_node(ProjectId(0), "a", "1.0.0");
|
||||
let (b_id, b) = mock_node(ProjectId(1), "b", "1.0.0");
|
||||
let (c_id, c) = mock_node(ProjectId(2), "c", "1.0.0");
|
||||
|
||||
graph.nodes.insert(a_id, a.clone());
|
||||
graph.nodes.insert(b_id, b.clone());
|
||||
graph.nodes.insert(c_id, c.clone());
|
||||
|
||||
// c depends on b, b depends on a
|
||||
// Sort should be: a, b, c
|
||||
graph.edges.insert(c.id.clone(), vec![ResolvedEdge { alias: "b_alias".to_string(), to: b.id.clone() }]);
|
||||
graph.edges.insert(b.id.clone(), vec![ResolvedEdge { alias: "a_alias".to_string(), to: a.id.clone() }]);
|
||||
|
||||
graph.edges.insert(c_id, vec![ResolvedEdge { alias: "b_alias".to_string(), to: b_id }]);
|
||||
graph.edges.insert(b_id, vec![ResolvedEdge { alias: "a_alias".to_string(), to: a_id }]);
|
||||
|
||||
let plan = BuildPlan::from_graph(&graph, BuildTarget::Main);
|
||||
assert_eq!(plan.steps.len(), 3);
|
||||
assert_eq!(plan.steps[0].project_id.name, "a");
|
||||
assert_eq!(plan.steps[1].project_id.name, "b");
|
||||
assert_eq!(plan.steps[2].project_id.name, "c");
|
||||
|
||||
assert_eq!(plan.steps[2].deps.get("b_alias").unwrap(), &b.id);
|
||||
assert_eq!(plan.steps[0].project_key.name, "a");
|
||||
assert_eq!(plan.steps[1].project_key.name, "b");
|
||||
assert_eq!(plan.steps[2].project_key.name, "c");
|
||||
|
||||
assert_eq!(plan.steps[2].deps.get("b_alias").copied(), Some(b_id));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_topo_sort_complex() {
|
||||
let mut graph = ResolvedGraph::default();
|
||||
|
||||
|
||||
// d -> b, c
|
||||
// b -> a
|
||||
// c -> a
|
||||
// a
|
||||
// Valid sorts: a, b, c, d OR a, c, b, d
|
||||
// Lexicographic rule says b before c. So a, b, c, d.
|
||||
|
||||
let a = mock_node("a", "1.0.0");
|
||||
let b = mock_node("b", "1.0.0");
|
||||
let c = mock_node("c", "1.0.0");
|
||||
let d = mock_node("d", "1.0.0");
|
||||
|
||||
graph.nodes.insert(a.id.clone(), a.clone());
|
||||
graph.nodes.insert(b.id.clone(), b.clone());
|
||||
graph.nodes.insert(c.id.clone(), c.clone());
|
||||
graph.nodes.insert(d.id.clone(), d.clone());
|
||||
|
||||
graph.edges.insert(d.id.clone(), vec![
|
||||
ResolvedEdge { alias: "b".to_string(), to: b.id.clone() },
|
||||
ResolvedEdge { alias: "c".to_string(), to: c.id.clone() },
|
||||
|
||||
let (a_id, a) = mock_node(ProjectId(0), "a", "1.0.0");
|
||||
let (b_id, b) = mock_node(ProjectId(1), "b", "1.0.0");
|
||||
let (c_id, c) = mock_node(ProjectId(2), "c", "1.0.0");
|
||||
let (d_id, d) = mock_node(ProjectId(3), "d", "1.0.0");
|
||||
|
||||
graph.nodes.insert(a_id, a.clone());
|
||||
graph.nodes.insert(b_id, b.clone());
|
||||
graph.nodes.insert(c_id, c.clone());
|
||||
graph.nodes.insert(d_id, d.clone());
|
||||
|
||||
graph.edges.insert(d_id, vec![
|
||||
ResolvedEdge { alias: "b".to_string(), to: b_id },
|
||||
ResolvedEdge { alias: "c".to_string(), to: c_id },
|
||||
]);
|
||||
graph.edges.insert(b.id.clone(), vec![ResolvedEdge { alias: "a".to_string(), to: a.id.clone() }]);
|
||||
graph.edges.insert(c.id.clone(), vec![ResolvedEdge { alias: "a".to_string(), to: a.id.clone() }]);
|
||||
|
||||
graph.edges.insert(b_id, vec![ResolvedEdge { alias: "a".to_string(), to: a_id }]);
|
||||
graph.edges.insert(c_id, vec![ResolvedEdge { alias: "a".to_string(), to: a_id }]);
|
||||
|
||||
let plan = BuildPlan::from_graph(&graph, BuildTarget::Main);
|
||||
let names: Vec<_> = plan.steps.iter().map(|s| s.project_id.name.as_str()).collect();
|
||||
let names: Vec<_> = plan.steps.iter().map(|s| s.project_key.name.as_str()).collect();
|
||||
assert_eq!(names, vec!["a", "b", "c", "d"]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_sources_sorting() {
|
||||
let mut graph = ResolvedGraph::default();
|
||||
let a = mock_node("a", "1.0.0");
|
||||
graph.nodes.insert(a.id.clone(), a);
|
||||
|
||||
let (a_id, a) = mock_node(ProjectId(0), "a", "1.0.0");
|
||||
graph.nodes.insert(a_id, a);
|
||||
|
||||
let plan = BuildPlan::from_graph(&graph, BuildTarget::Main);
|
||||
assert_eq!(plan.steps[0].sources, vec![PathBuf::from("a.pbs"), PathBuf::from("b.pbs")]);
|
||||
|
||||
|
||||
let plan_test = BuildPlan::from_graph(&graph, BuildTarget::Test);
|
||||
assert_eq!(plan_test.steps[0].sources, vec![PathBuf::from("test_a.pbs"), PathBuf::from("test_b.pbs")]);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user