Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 88 additions & 2 deletions rust/src/analyzer/dispatch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,12 @@ pub fn dispatch_simple(genv: &mut GlobalEnv, lenv: &mut LocalEnv, node: &Node) -
};
}

// ConstantReadNode: User → Type::Singleton("User")
// ConstantReadNode: User → Type::Singleton("User") or Type::Singleton("Api::User")
if let Some(const_read) = node.as_constant_read_node() {
let name = String::from_utf8_lossy(const_read.name().as_slice()).to_string();
let vtx = genv.new_source(Type::singleton(&name));
let resolved_name = genv.scope_manager.lookup_constant(&name)
.unwrap_or(name);
let vtx = genv.new_source(Type::singleton(&resolved_name));
return DispatchResult::Vertex(vtx);
}

Expand Down Expand Up @@ -893,4 +895,88 @@ Api::User.new.name
genv.type_errors
);
}

// Test 23: ConstantReadNode inside module resolves to qualified name
#[test]
fn test_constant_read_inside_module_resolves_qualified() {
let source = r#"
module Api
class User
def name
"Alice"
end
end

class Service
def run
User.new.name
end
end
end
"#;
let genv = analyze(source);
assert!(
genv.type_errors.is_empty(),
"User.new inside module Api should resolve to Api::User: {:?}",
genv.type_errors
);
}

// Test 24: ConstantReadNode in deeply nested modules
#[test]
fn test_constant_read_deeply_nested() {
let source = r#"
module Api
module V1
class User
def name
"Alice"
end
end

class Service
def run
User.new.name
end
end
end
end
"#;
let genv = analyze(source);
assert!(
genv.type_errors.is_empty(),
"User.new inside Api::V1 should resolve to Api::V1::User: {:?}",
genv.type_errors
);
}

// Test 25: Same constant name in different modules
#[test]
fn test_constant_read_same_name_different_modules() {
let source = r#"
module Api
class User
def name; "Api User"; end
end
end

module Admin
class User
def name; "Admin User"; end
end

class Service
def run
User.new.name
end
end
end
"#;
let genv = analyze(source);
assert!(
genv.type_errors.is_empty(),
"User.new inside Admin should resolve to Admin::User: {:?}",
genv.type_errors
);
}
}
20 changes: 18 additions & 2 deletions rust/src/env/global_env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -189,20 +189,36 @@ impl GlobalEnv {

// ===== Scope Management =====

/// Register a constant (simple name → qualified name) in the parent scope
fn register_constant_in_parent(&mut self, scope_id: ScopeId, name: &str) {
if name.contains("::") { return; }
let qualified = self.scope_manager.current_qualified_name()
.unwrap_or_else(|| name.to_string());
if let Some(parent_id) = self.scope_manager.get_scope(scope_id)
.and_then(|s| s.parent)
{
if let Some(parent_scope) = self.scope_manager.get_scope_mut(parent_id) {
parent_scope.constants.insert(name.to_string(), qualified);
}
}
}

/// Enter a class scope
pub fn enter_class(&mut self, name: String) -> ScopeId {
let scope_id = self.scope_manager.new_scope(ScopeKind::Class {
name,
name: name.clone(),
superclass: None,
});
self.scope_manager.enter_scope(scope_id);
self.register_constant_in_parent(scope_id, &name);
scope_id
}

/// Enter a module scope
pub fn enter_module(&mut self, name: String) -> ScopeId {
let scope_id = self.scope_manager.new_scope(ScopeKind::Module { name });
let scope_id = self.scope_manager.new_scope(ScopeKind::Module { name: name.clone() });
self.scope_manager.enter_scope(scope_id);
self.register_constant_in_parent(scope_id, &name);
scope_id
}

Expand Down
Loading