pr 03.01
This commit is contained in:
@@ -400,16 +400,9 @@ pub fn compile_project(
|
||||
|
||||
let name_simple = interner.resolve(sym.name).to_string();
|
||||
|
||||
// For service methods, VM function name is "Service.method"
|
||||
let expected_vm_name = if let Some(origin) = &sym.origin {
|
||||
if let Some(svc) = origin.strip_prefix("svc:") {
|
||||
format!("{}.{}", svc, name_simple)
|
||||
} else {
|
||||
name_simple.clone()
|
||||
}
|
||||
} else {
|
||||
name_simple.clone()
|
||||
};
|
||||
// VM function names are currently simple for both free functions and service methods (method name only).
|
||||
// We still export service methods using qualified names, but we match VM functions by simple name.
|
||||
let expected_vm_name = name_simple.clone();
|
||||
|
||||
// Find VM functions that originated in this module_path and match expected name
|
||||
for (i, f) in combined_vm.functions.iter().enumerate() {
|
||||
@@ -420,7 +413,20 @@ pub fn compile_project(
|
||||
continue;
|
||||
}
|
||||
|
||||
let sig_name = format!("{}#sig{}", name_simple, f.sig.0);
|
||||
// Canonical export key name:
|
||||
// - Free function: "name#sig<id>"
|
||||
// - Service method: "Service.method#sig<id>"
|
||||
let canonical_base = if let Some(origin) = &sym.origin {
|
||||
if let Some(svc) = origin.strip_prefix("svc:") {
|
||||
format!("{}.{}", svc, name_simple)
|
||||
} else {
|
||||
name_simple.clone()
|
||||
}
|
||||
} else {
|
||||
name_simple.clone()
|
||||
};
|
||||
|
||||
let sig_name = format!("{}#sig{}", canonical_base, f.sig.0);
|
||||
|
||||
let ty = sym.ty.clone().ok_or_else(|| {
|
||||
CompileError::Internal(format!(
|
||||
@@ -581,4 +587,51 @@ mod tests {
|
||||
};
|
||||
assert!(compiled.exports.contains_key(&vec2_key));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_service_method_export_qualified() {
|
||||
let dir = tempdir().unwrap();
|
||||
let project_dir = dir.path().to_path_buf();
|
||||
|
||||
fs::create_dir_all(project_dir.join("src/main/modules")).unwrap();
|
||||
|
||||
let main_code = r#"
|
||||
pub service Log {
|
||||
fn debug(msg: string): void {
|
||||
}
|
||||
}
|
||||
"#;
|
||||
|
||||
fs::write(project_dir.join("src/main/modules/main.pbs"), main_code).unwrap();
|
||||
|
||||
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_key: project_key.clone(),
|
||||
project_dir: project_dir.clone(),
|
||||
target: BuildTarget::Main,
|
||||
sources: vec![PathBuf::from("src/main/modules/main.pbs")],
|
||||
deps: BTreeMap::new(),
|
||||
};
|
||||
|
||||
let mut file_manager = FileManager::new();
|
||||
let compiled = compile_project(step, &HashMap::new(), &mut file_manager)
|
||||
.expect("Failed to compile project");
|
||||
|
||||
// Find a function export with qualified method name prefix "Log.debug#sig"
|
||||
let mut found = false;
|
||||
for (key, _meta) in &compiled.exports {
|
||||
if key.kind == ExportSurfaceKind::Function && key.symbol_name.starts_with("Log.debug#sig") {
|
||||
found = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
assert!(found, "Expected an export with qualified name 'Log.debug#sigX' but not found. Exports: {:?}", compiled.exports.keys().collect::<Vec<_>>());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1330,13 +1330,17 @@ impl<'a> Lowerer<'a> {
|
||||
];
|
||||
|
||||
// Find candidates among imported value symbols matching:
|
||||
// - name in the new canonical form: "member#sigN" (prefix match on member_name)
|
||||
// - name in the new canonical form: "Service.member#sigN" (prefix match on qualified base)
|
||||
// - origin equals the bound synthetic module path
|
||||
let mut candidates: Vec<&Symbol> = Vec::new();
|
||||
for list in self.imported_symbols.value_symbols.symbols.values() {
|
||||
for s in list {
|
||||
let sname = self.interner.resolve(s.name);
|
||||
if sname.starts_with(&format!("{}#sig", member_name)) {
|
||||
// Accept both canonical qualified form and legacy simple form for compatibility
|
||||
let qualified_base = format!("{}.{}", obj_name, member_name);
|
||||
let matches_qualified = sname.starts_with(&format!("{}#sig", &qualified_base));
|
||||
let matches_legacy = sname.starts_with(&format!("{}#sig", member_name));
|
||||
if matches_qualified || matches_legacy {
|
||||
if let Some(orig) = &s.origin {
|
||||
if synthetic_paths.iter().any(|p| p == orig) {
|
||||
candidates.push(s);
|
||||
@@ -1384,10 +1388,11 @@ impl<'a> Lowerer<'a> {
|
||||
};
|
||||
|
||||
if let Some(sig) = sig_opt {
|
||||
let base_name = format!("{}.{}", obj_name, member_name);
|
||||
self.emit(InstrKind::ImportCall {
|
||||
dep_alias,
|
||||
module_path,
|
||||
base_name: member_name.to_string(),
|
||||
base_name,
|
||||
sig,
|
||||
arg_count: n.args.len() as u32,
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user