language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-28 14:24:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

BROKEN

Browse source
This commit is contained in:
Folkert 2021-07-29 17:22:25 +02:00
parent aac0e2d9f9
commit 27c3d57e35
18 changed files with 391 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

65
compiler/solve/src/solve.rs
View file

@ -795,7 +795,7 @@ fn type_to_variable(
symbol,
type_arguments: args,
actual: alias_type,
lambda_set_variables: _,
lambda_set_variables,
} => {
// the rank of these variables is NONE (encoded as 0 in practice)
// using them for other ranks causes issues
@ -826,8 +826,15 @@ fn type_to_variable(
arg_vars.push((arg.clone(), arg_var));
}
let lambda_set_variables: Vec<_> = lambda_set_variables
.iter()
.map(|ls| {
roc_types::subs::LambdaSet(type_to_variable(subs, rank, pools, cached, &ls.0))
})
.collect();
let alias_var = type_to_variable(subs, rank, pools, cached, alias_type);
let content = Content::Alias(*symbol, arg_vars, alias_var);
let content = Content::Alias(*symbol, arg_vars, lambda_set_variables, alias_var);
register(subs, rank, pools, content)
}
@ -836,6 +843,7 @@ fn type_to_variable(
type_arguments: args,
actual: alias_type,
actual_var,
lambda_set_variables,
..
} => {
let mut arg_vars = Vec::with_capacity(args.len());
@ -846,6 +854,13 @@ fn type_to_variable(
arg_vars.push((arg.clone(), arg_var));
}
let lambda_set_variables: Vec<_> = lambda_set_variables
.iter()
.map(|ls| {
roc_types::subs::LambdaSet(type_to_variable(subs, rank, pools, cached, &ls.0))
})
.collect();
let alias_var = type_to_variable(subs, rank, pools, cached, alias_type);
// unify the actual_var with the result var
@ -854,7 +869,7 @@ fn type_to_variable(
// subs.set_content(*actual_var, descriptor.content);
//subs.set(*actual_var, descriptor.clone());
let content = Content::Alias(*symbol, arg_vars, alias_var);
let content = Content::Alias(*symbol, arg_vars, lambda_set_variables, alias_var);
let result = register(subs, rank, pools, content);
@ -934,6 +949,8 @@ fn circular_error(
let (error_type, _) = subs.var_to_error_type(var);
let problem = TypeError::CircularType(loc_var.region, symbol, error_type);
dbg!("circular error");
subs.set_content(var, Content::Error);
problems.push(problem);
@ -1162,13 +1179,23 @@ fn adjust_rank_content(
}
}
Alias(_, args, real_var) => {
Alias(_, args, lambda_set_variables, real_var) => {
let mut rank = Rank::toplevel();
for (_, var) in args {
rank = rank.max(adjust_rank(subs, young_mark, visit_mark, group_rank, *var));
}
for var in lambda_set_variables {
rank = rank.max(adjust_rank(
subs,
young_mark,
visit_mark,
group_rank,
var.into_inner(),
));
}
// from elm-compiler: THEORY: anything in the real_var would be Rank::toplevel()
// this theory is not true in Roc! aliases of function types capture the closure var
rank = rank.max(adjust_rank(
@ -1372,13 +1399,24 @@ fn instantiate_rigids_help(
copy
}
Alias(symbol, args, real_type_var) => {
Alias(symbol, args, lambda_set_variables, real_type_var) => {
let new_args = args
.into_iter()
.map(|(name, var)| (name, instantiate_rigids_help(subs, max_rank, pools, var)))
.collect();
let new_lambda_set_variables = lambda_set_variables
.into_iter()
.map(|var| instantiate_rigids_help(subs, max_rank, pools, var.into_inner()).into())
.collect();
let new_real_type_var = instantiate_rigids_help(subs, max_rank, pools, real_type_var);
let new_content = Alias(symbol, new_args, new_real_type_var);
let new_content = Alias(
symbol,
new_args,
new_lambda_set_variables,
new_real_type_var,
);
subs.set(copy, make_descriptor(new_content));
@ -1564,13 +1602,24 @@ fn deep_copy_var_help(
copy
}
Alias(symbol, args, real_type_var) => {
Alias(symbol, args, lambda_set_variables, real_type_var) => {
let new_args = args
.into_iter()
.map(|(name, var)| (name, deep_copy_var_help(subs, max_rank, pools, var)))
.collect();
let new_lambda_set_variables = lambda_set_variables
.into_iter()
.map(|var| deep_copy_var_help(subs, max_rank, pools, var.into_inner()).into())
.collect();
let new_real_type_var = deep_copy_var_help(subs, max_rank, pools, real_type_var);
let new_content = Alias(symbol, new_args, new_real_type_var);
let new_content = Alias(
symbol,
new_args,
new_lambda_set_variables,
new_real_type_var,
);
subs.set(copy, make_descriptor(new_content));