language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 16:44:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Improve some comments

Browse source
This commit is contained in:
Richard Feldman 2019-12-20 18:16:02 -05:00
parent 696a87869b
commit cc3ddd2667
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/can/pattern.rs
View file

@ -132,7 +132,7 @@ pub fn canonicalize_pattern<'a>(
// The latter is relevant when recursively canonicalizing // The latter is relevant when recursively canonicalizing
// tag application patterns, which can bring multiple // tag application patterns, which can bring multiple
// new idents into scope. For example, it's important that // new idents into scope. For example, it's important that
// we catch (Blah foo foo) as being an example of shadowing. // we catch (Blah foo foo) -> … as being an example of shadowing.
scope scope
.idents .idents
.insert(new_ident.clone(), symbol_and_region.clone()); .insert(new_ident.clone(), symbol_and_region.clone());

18
src/solve.rs
View file

@ -96,9 +96,10 @@ fn solve(
match constraint { match constraint {
True => state, True => state,
Eq(typ, expected_type, _region) => { Eq(typ, expected_type, _region) => {
// TODO use region?
let actual = type_to_var(subs, typ.clone()); let actual = type_to_var(subs, typ.clone());
let expected = type_to_var(subs, expected_type.clone().get_type()); let expected = type_to_var(subs, expected_type.clone().get_type());
// TODO use region when reporting a problem
let vars = unify(subs, problems, actual, expected); let vars = unify(subs, problems, actual, expected);
introduce(subs, rank, pools, &vars); introduce(subs, rank, pools, &vars);
@ -375,9 +376,8 @@ fn generalize(
let young_vars = pools.get(young_rank); let young_vars = pools.get(young_rank);
let rank_table = pool_to_rank_table(subs, young_mark, young_rank, young_vars); let rank_table = pool_to_rank_table(subs, young_mark, young_rank, young_vars);
// get the ranks right for each entry. // Get the ranks right for each entry.
// start at low ranks so that we only have to pass // Start at low ranks so we only have to pass over the information once.
// over the information once.
for (index, table) in rank_table.iter().enumerate() { for (index, table) in rank_table.iter().enumerate() {
for &var in table.iter() { for &var in table.iter() {
adjust_rank(subs, young_mark, visit_mark, Rank::from(index), var); adjust_rank(subs, young_mark, visit_mark, Rank::from(index), var);
@ -386,7 +386,7 @@ fn generalize(
let (last_pool, all_but_last_pool) = rank_table.split_last(); let (last_pool, all_but_last_pool) = rank_table.split_last();
// For variables that have rank lowerer than youngRank, register them in // For variables that have rank lowerer than young_rank, register them in
// the appropriate old pool if they are not redundant. // the appropriate old pool if they are not redundant.
for vars in all_but_last_pool { for vars in all_but_last_pool {
for &var in vars { for &var in vars {
@ -398,8 +398,7 @@ fn generalize(
} }
} }
// For variables with rank youngRank // For variables with rank young_rank, if rank < young_rank: register in old pool,
// If rank < youngRank: register in oldPool
// otherwise generalize // otherwise generalize
for &var in last_pool { for &var in last_pool {
if !subs.redundant(var) { if !subs.redundant(var) {
@ -438,7 +437,6 @@ fn pool_to_rank_table(
/// Adjust variable ranks such that ranks never increase as you move deeper. /// Adjust variable ranks such that ranks never increase as you move deeper.
/// This way the outermost rank is representative of the entire structure. /// This way the outermost rank is representative of the entire structure.
///
fn adjust_rank( fn adjust_rank(
subs: &mut Subs, subs: &mut Subs,
young_mark: Mark, young_mark: Mark,
@ -535,7 +533,7 @@ fn adjust_rank_content(
Alias(_, _, args, _) => { Alias(_, _, args, _) => {
let mut rank = Rank::outermost(); let mut rank = Rank::outermost();
// from elm-compiler: THEORY: anything in the realVar would be outermostRank // from elm-compiler: THEORY: anything in the real_var would be Rank::outermost()
for (_, var) in args { for (_, var) in args {
rank = rank.max(adjust_rank(subs, young_mark, visit_mark, group_rank, var)); rank = rank.max(adjust_rank(subs, young_mark, visit_mark, group_rank, var));
} }
@ -545,6 +543,8 @@ fn adjust_rank_content(
} }
} }
/// Introduce some variables to Pools at the given rank.
/// Also, set each of their ranks in Subs to be the given rank.
fn introduce(subs: &mut Subs, rank: Rank, pools: &mut Pools, vars: &[Variable]) { fn introduce(subs: &mut Subs, rank: Rank, pools: &mut Pools, vars: &[Variable]) {
let pool: &mut Vec<Variable> = pools.get_mut(rank); let pool: &mut Vec<Variable> = pools.get_mut(rank);