Skip to content

Commit

Permalink
frontend: Remove MethodLookup helper
Browse files Browse the repository at this point in the history
  • Loading branch information
@dinfuehr
dinfuehr committed Nov 16, 2024
1 parent afe0797 commit 415f148
Show file tree
Hide file tree
Showing 5 changed files with 101 additions and 388 deletions.
2 changes: 1 addition & 1 deletion dora-frontend/src/typeck.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use crate::typeck::function::{
check_args_compatible_fct, check_lit_char, check_lit_float, check_lit_int, check_lit_str,
is_simple_enum, TypeCheck, VarManager,
};
use crate::typeck::lookup::MethodLookup;
use crate::typeck::lookup::find_method_call_candidates;
use crate::typeck::stmt::{check_pattern, check_stmt};
use crate::{ErrorMessage, SourceType, Span};

Expand Down
166 changes: 89 additions & 77 deletions dora-frontend/src/typeck/call.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,15 @@ use crate::sema::{
use crate::specialize::replace_type;
use crate::sym::SymbolKind;
use crate::typeck::{
args_compatible, args_compatible_fct, check_args_compatible_fct, check_expr, read_path_expr,
CallArguments, MethodLookup, TypeCheck,
args_compatible, args_compatible_fct, check_args_compatible_fct, check_expr,
find_method_call_candidates, read_path_expr, CallArguments, TypeCheck,
};
use crate::typeparamck;
use crate::{
empty_sta, specialize_type, ty::error as ty_error, ErrorMessage, SourceType, SourceTypeArray,
TraitType,
};

use super::lookup::find_method_call_candidates;

pub(super) fn check_expr_call(
ck: &mut TypeCheck,
e: &ast::ExprCallType,
Expand Down Expand Up @@ -310,37 +308,61 @@ fn check_expr_call_static_method(
object_type: SourceType,
method_name: String,
fct_type_params: SourceTypeArray,
arg_types: &[SourceType],
arguments: CallArguments,
) -> SourceType {
let interned_method_name = ck.sa.interner.intern(&method_name);
let lookup = MethodLookup::new(ck.sa, ck.file_id, ck.type_param_definition)
.span(e.span)
.static_method(object_type)
.name(interned_method_name)
.args(arg_types)
.fct_type_params(&fct_type_params)
.find();

if lookup.find() {
let fct_id = lookup.found_fct_id().unwrap();
let return_type = lookup.found_ret().unwrap();
let container_type_params = lookup.found_container_type_params().unwrap();
let type_params = container_type_params.connect(&fct_type_params);
let call_type = Arc::new(CallType::Fct(fct_id, type_params));

let candidates = find_method_call_candidates(
ck.sa,
object_type.clone(),
&ck.type_param_definition,
interned_method_name,
true,
);

if candidates.is_empty() {
let type_name = ck.ty_name(&object_type);
let msg = ErrorMessage::UnknownStaticMethod(type_name, method_name);
ck.sa.report(ck.file_id, e.span, msg);
ck.analysis.set_ty(e.id, ty_error());
ty_error()
} else if candidates.len() > 1 {
let type_name = ck.ty_name(&object_type);
let msg = ErrorMessage::MultipleCandidatesForMethod(type_name, method_name);
ck.sa.report(ck.file_id, e.span, msg);
ck.analysis.set_ty(e.id, ty_error());
ty_error()
} else {
let candidate = &candidates[0];
let fct_id = candidate.fct_id;
let fct = ck.sa.fct(fct_id);

let full_type_params = candidate.container_type_params.connect(&fct_type_params);

let ty = if typeparamck::check(
ck.sa,
&ck.type_param_definition,
fct,
&full_type_params,
ck.file_id,
e.span,
) {
check_args_compatible_fct(ck, fct, arguments, &full_type_params, None);
specialize_type(ck.sa, fct.return_type(), &full_type_params)
} else {
ty_error()
};

let call_type = Arc::new(CallType::Fct(fct_id, full_type_params));
ck.analysis.map_calls.insert(e.id, call_type.clone());

if !method_accessible_from(ck.sa, fct_id, ck.module_id) {
let msg = ErrorMessage::NotAccessible;
ck.sa.report(ck.file_id, e.span, msg);
}

ck.analysis.set_ty(e.id, return_type.clone());

return_type
} else {
ck.analysis.set_ty(e.id, ty_error());

ty_error()
ck.analysis.set_ty(e.id, ty.clone());
ty
}
}

Expand Down Expand Up @@ -388,49 +410,50 @@ fn check_expr_call_method(
if candidates.is_empty() {
// No method with this name found, so this might actually be a field
check_expr_call_field(ck, e, object_type, method_name, fct_type_params, arguments)
} else if candidates.len() > 1 {
let type_name = ck.ty_name(&object_type);
let msg = ErrorMessage::MultipleCandidatesForMethod(type_name, method_name);
ck.sa.report(ck.file_id, e.span, msg);
ck.analysis.set_ty(e.id, ty_error());
ty_error()
} else {
// Lookup the method again, but this time with error reporting
let lookup = MethodLookup::new(ck.sa, ck.file_id, ck.type_param_definition)
.parent(ck.parent.clone())
.method(object_type.clone())
.name(interned_method_name)
.fct_type_params(&fct_type_params)
.span(e.span)
.args(&arg_types)
.find();

if lookup.find() {
let fct_id = lookup.found_fct_id().unwrap();
let fct = ck.sa.fct(fct_id);
let return_type = lookup.found_ret().unwrap();

let call_type = if object_type.is_self() {
CallType::TraitObjectMethod(object_type, fct_id)
} else if object_type.is_trait() && fct.parent.is_trait() {
CallType::TraitObjectMethod(object_type, fct_id)
} else {
let method_type = lookup.found_class_type().unwrap();
let container_type_params = lookup.found_container_type_params().clone().unwrap();
let type_params = container_type_params.connect(&fct_type_params);
CallType::Method(method_type, fct_id, type_params)
};
let candidate = &candidates[0];
let fct_id = candidate.fct_id;
let fct = ck.sa.fct(fct_id);

ck.analysis
.map_calls
.insert_or_replace(e.id, Arc::new(call_type));
ck.analysis.set_ty(e.id, return_type.clone());
let full_type_params = candidate.container_type_params.connect(&fct_type_params);

if !method_accessible_from(ck.sa, fct_id, ck.module_id) {
let msg = ErrorMessage::NotAccessible;
ck.sa.report(ck.file_id, e.span, msg);
}
let ty = if typeparamck::check(
ck.sa,
&ck.type_param_definition,
fct,
&full_type_params,
ck.file_id,
e.span,
) {
check_args_compatible_fct(ck, fct, arguments, &full_type_params, None);
specialize_type(ck.sa, fct.return_type(), &full_type_params)
} else {
ty_error()
};

return_type
let call_type = if object_type.is_self() {
CallType::TraitObjectMethod(object_type, fct_id)
} else if object_type.is_trait() && fct.parent.is_trait() {
CallType::TraitObjectMethod(object_type, fct_id)
} else {
ck.analysis.set_ty(e.id, ty_error());
CallType::Method(object_type, fct_id, full_type_params)
};

ty_error()
ck.analysis.map_calls.insert(e.id, Arc::new(call_type));

if !method_accessible_from(ck.sa, fct_id, ck.module_id) {
let msg = ErrorMessage::NotAccessible;
ck.sa.report(ck.file_id, e.span, msg);
}

ck.analysis.set_ty(e.id, ty.clone());
ty
}
}

Expand Down Expand Up @@ -1029,14 +1052,13 @@ fn check_expr_call_path(
ck.file_id,
e.span,
) {
let arg_types = arguments.assume_all_positional(ck);
check_expr_call_static_method(
ck,
e,
SourceType::Class(cls_id, container_type_params),
method_name,
type_params,
&arg_types,
arguments,
)
} else {
ty_error()
Expand All @@ -1061,15 +1083,7 @@ fn check_expr_call_path(
SourceType::Struct(struct_id, container_type_params)
};

let arg_types = arguments.assume_all_positional(ck);
check_expr_call_static_method(
ck,
e,
object_ty,
method_name,
type_params,
&arg_types,
)
check_expr_call_static_method(ck, e, object_ty, method_name, type_params, arguments)
} else {
ty_error()
}
Expand Down Expand Up @@ -1109,15 +1123,14 @@ fn check_expr_call_path(
e.span,
) {
let object_ty = SourceType::Enum(enum_id, container_type_params);
let arg_types = arguments.assume_all_positional(ck);

check_expr_call_static_method(
ck,
e,
object_ty,
method_name,
type_params,
&arg_types,
arguments,
)
} else {
ty_error()
Expand Down Expand Up @@ -1158,9 +1171,8 @@ fn check_expr_call_path(
}

let alias_ty = ck.sa.alias(alias_id).ty();
let arg_types = arguments.assume_all_positional(ck);

check_expr_call_static_method(ck, e, alias_ty, method_name, type_params, &arg_types)
check_expr_call_static_method(ck, e, alias_ty, method_name, type_params, arguments)
}

_ => {
Expand Down
Loading

0 comments on commit 415f148

Please sign in to comment.