language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-30 15:21:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix some constraint gen things

Browse source
This commit is contained in:
Richard Feldman 2019-11-08 20:32:54 -05:00
parent d06fe8d4be
commit 9a2c24e97a
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/can/mod.rs
View file

@ -469,7 +469,9 @@ fn canonicalize_expr(
// (However, still include it in scope, because you *can* recursively refer to yourself.) // (However, still include it in scope, because you *can* recursively refer to yourself.)
let mut shadowable_idents = scope.idents.clone(); let mut shadowable_idents = scope.idents.clone();
remove_idents(&loc_pattern.value, &mut shadowable_idents); remove_idents(&loc_pattern.value, &mut shadowable_idents);
let pattern_expected = panic!("TODO implement constraint gen for functions");
let pattern_var = subs.mk_flex_var();
let pattern_expected = PExpected::NoExpectation(Type::Variable(pattern_var));
let (can_arg, state) = canonicalize_pattern( let (can_arg, state) = canonicalize_pattern(
env, env,
@ -481,8 +483,6 @@ fn canonicalize_expr(
pattern_expected, pattern_expected,
); );
panic!("TODO use state to add to constraints");
can_args.push(can_arg); can_args.push(can_arg);
} }
@ -1442,8 +1442,8 @@ fn can_defs<'a>(
scope.idents = union_pairs(scope.idents, assigned_idents.iter()); scope.idents = union_pairs(scope.idents, assigned_idents.iter());
// Used in canonicalization // Used in canonicalization
let refs_by_assignment: MutMap<Symbol, (Located<Ident>, References)> = MutMap::default(); let mut refs_by_assignment: MutMap<Symbol, (Located<Ident>, References)> = MutMap::default();
let can_assignments_by_symbol: MutMap<Symbol, (Located<Pattern>, Located<Expr>)> = let mut can_assignments_by_symbol: MutMap<Symbol, (Located<Pattern>, Located<Expr>)> =
MutMap::default(); MutMap::default();
// Used in constraint generation // Used in constraint generation
@ -1554,7 +1554,8 @@ fn can_defs<'a>(
let mut shadowable_idents = scope.idents.clone(); let mut shadowable_idents = scope.idents.clone();
remove_idents(&loc_pattern.value, &mut shadowable_idents); remove_idents(&loc_pattern.value, &mut shadowable_idents);
let pattern_expected = panic!("TODO need to finish constraining this pattern"); let pattern_var = subs.mk_flex_var();
let pattern_expected = PExpected::NoExpectation(Type::Variable(pattern_var));
let (loc_can_pattern, state) = canonicalize_pattern( let (loc_can_pattern, state) = canonicalize_pattern(
env, env,
@ -1565,7 +1566,6 @@ fn can_defs<'a>(
&mut shadowable_idents, &mut shadowable_idents,
pattern_expected, pattern_expected,
); );
panic!("TODO do something with state here");
let mut renamed_closure_assignment: Option<&Symbol> = None; let mut renamed_closure_assignment: Option<&Symbol> = None;
// Give closures names (and tail-recursive status) where appropriate. // Give closures names (and tail-recursive status) where appropriate.