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

Second pass

Browse source
This commit is contained in:
ayazhafiz 2022-02-06 00:15:09 -05:00
parent 5e0d90ac53
commit 8dc92ccd97
15 changed files with 651 additions and 275 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -72,6 +72,7 @@ pub enum TypeError {
CircularType(Region, Symbol, ErrorType),
BadType(roc_types::types::Problem),
UnexposedLookup(Symbol),
NotInRange(Region, ErrorType, Expected<Vec<ErrorType>>),
}
#[derive(Clone, Debug, Default)]
@ -231,6 +232,17 @@ fn solve(
problems.push(TypeError::BadType(problem));
state
}
NotInRange(vars, typ, range) => {
introduce(subs, rank, pools, &vars);
problems.push(TypeError::NotInRange(
*region,
typ,
expectation.clone().replace(range),
));
state
}
}
@ -254,7 +266,7 @@ fn solve(
state
}
BadType(vars, _problem) => {
BadType(vars, _) | NotInRange(vars, _, _) => {
introduce(subs, rank, pools, &vars);
// ERROR NOT REPORTED
@ -321,6 +333,17 @@ fn solve(
problems.push(TypeError::BadType(problem));
state
}
NotInRange(vars, typ, range) => {
introduce(subs, rank, pools, &vars);
problems.push(TypeError::NotInRange(
*region,
typ,
expectation.clone().replace(range),
));
state
}
}
@ -391,6 +414,18 @@ fn solve(
problems.push(TypeError::BadType(problem));
state
}
NotInRange(vars, typ, range) => {
introduce(subs, rank, pools, &vars);
problems.push(TypeError::NotInRange(
*region,
typ,
// TODO expectation.clone().replace(range),
Expected::NoExpectation(range),
));
state
}
}
@ -687,52 +722,18 @@ fn solve(
state
}
}
}
EqBoundedRange(typ, expect_one_of, category, region) => {
let actual = type_to_var(subs, rank, pools, cached_aliases, typ);
NotInRange(vars, typ, range) => {
introduce(subs, rank, pools, &vars);
let mut it = expect_one_of.get_type_ref().iter().peekable();
problems.push(TypeError::NotInRange(
Region::zero(),
typ,
Expected::NoExpectation(range),
));
while let Some(expected) = it.next() {
let expected = type_to_var(subs, rank, pools, cached_aliases, expected);
let snapshot = subs.snapshot();
match unify(subs, actual, expected, Mode::Eq) {
Success(vars) => {
introduce(subs, rank, pools, &vars);
return state;
}
Failure(..) if it.peek().is_some() => {
subs.rollback_to(snapshot);
continue;
}
Failure(vars, actual_type, expected_type) => {
// This is the last type we could have tried and failed; record the error.
introduce(subs, rank, pools, &vars);
let problem = TypeError::BadExpr(
*region,
category.clone(),
actual_type,
expect_one_of.clone().replace(expected_type),
);
problems.push(problem);
return state;
}
BadType(vars, problem) => {
introduce(subs, rank, pools, &vars);
problems.push(TypeError::BadType(problem));
return state;
}
state
}
}
unreachable!()
}
}
}
@ -816,6 +817,13 @@ fn type_to_variable<'a>(
match typ {
Variable(var) => *var,
RangedNumber(typ, vars) => {
let ty_var = type_to_variable(subs, rank, pools, arena, typ);
let vars = VariableSubsSlice::insert_into_subs(subs, vars.iter().copied());
let content = Content::RangedNumber(ty_var, vars);
register(subs, rank, pools, content)
}
Apply(symbol, arguments, _) => {
let new_arguments = VariableSubsSlice::reserve_into_subs(subs, arguments.len());
for (target_index, var_index) in (new_arguments.indices()).zip(arguments) {
@ -1636,6 +1644,8 @@ fn adjust_rank_content(
rank
}
RangedNumber(typ, _) => adjust_rank(subs, young_mark, visit_mark, group_rank, *typ),
}
}
@ -1771,6 +1781,11 @@ fn instantiate_rigids_help(subs: &mut Subs, max_rank: Rank, initial: Variable) {
stack.push(var);
}
&RangedNumber(typ, vars) => {
stack.push(typ);
stack.extend(var_slice!(vars));
}
}
}
@ -2027,6 +2042,23 @@ fn deep_copy_var_help(
copy
}
RangedNumber(typ, range_vars) => {
let new_type_var = deep_copy_var_help(subs, max_rank, pools, visited, typ);
let new_vars = SubsSlice::reserve_into_subs(subs, range_vars.len());
for (target_index, var_index) in (new_vars.indices()).zip(range_vars) {
let var = subs[var_index];
let copy_var = deep_copy_var_help(subs, max_rank, pools, visited, var);
subs.variables[target_index] = copy_var;
}
let new_content = RangedNumber(new_type_var, new_vars);
subs.set(copy, make_descriptor(new_content));
copy
}
}
}