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

cargo fmt

Browse source
This commit is contained in:
Richard Feldman 2019-09-02 15:08:33 -04:00
parent 505b9f7b02
commit f47b657b9f
24 changed files with 2463 additions and 1915 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/solve.rs
View file

@ -1,11 +1,9 @@
// type Env =
// Map.Map Name.Name Variable
// type Pools =
// MVector.IOVector [Variable]
// data State =
// State
// { _env :: Env
@ -13,9 +11,9 @@
// , _errors :: [Error.Error]
// }
use subs::{Subs, Variable, Descriptor, Content, FlatType};
use collections::ImMap;
use canonicalize::Symbol;
use collections::ImMap;
use subs::{Content, Descriptor, FlatType, Subs, Variable};
use types::Constraint::{self, *};
use types::Type::{self, *};
@ -30,20 +28,21 @@ pub fn solve(env: &Env, subs: &mut Subs, constraint: Constraint) {
let expected = type_to_variable(subs, expected_type.get_type());
subs.union(actual, expected);
},
}
Lookup(symbol, expected_type, region) => {
let actual = subs.copy_var(env.get(&symbol).unwrap_or_else(|| {
panic!("Could not find symbol {:?} in env {:?}", symbol, env)
}));
let actual =
subs.copy_var(env.get(&symbol).unwrap_or_else(|| {
panic!("Could not find symbol {:?} in env {:?}", symbol, env)
}));
let expected = type_to_variable(subs, expected_type.get_type());
subs.union(actual, expected);
},
}
And(sub_constraints) => {
for sub_constraint in sub_constraints {
solve(env, subs, sub_constraint);
}
},
}
Let(box_let_constraint) => {
let let_con = *box_let_constraint;
@ -52,7 +51,7 @@ pub fn solve(env: &Env, subs: &mut Subs, constraint: Constraint) {
// If the return expression is guaranteed to solve,
// solve the assignments themselves and move on.
solve(env, subs, let_con.assignments_constraint)
},
}
ret_con => {
// Solve the assignments' constraints first.
solve(env, subs, let_con.assignments_constraint);
@ -63,7 +62,7 @@ pub fn solve(env: &Env, subs: &mut Subs, constraint: Constraint) {
for (symbol, loc_type) in let_con.assignment_types {
// We must not overwrite existing symbols! If we do,
// we will overwrite procedure entries, which were
// inserted earlier in solving. (If we allowed
// inserted earlier in solving. (If we allowed
// shadowing, we'd need to do something fancier here.)
if !new_env.contains_key(&symbol) {
let var = type_to_variable(subs, loc_type.value);
@ -79,7 +78,7 @@ pub fn solve(env: &Env, subs: &mut Subs, constraint: Constraint) {
// TODO do an occurs check for each of the assignments!
}
}
},
}
}
}
@ -87,30 +86,31 @@ fn type_to_variable(subs: &mut Subs, typ: Type) -> Variable {
match typ {
Variable(var) => var,
Apply(module_name, name, arg_types) => {
let args: Vec<Variable> =
arg_types.into_iter()
.map(|arg| type_to_variable(subs, arg))
.collect();
let args: Vec<Variable> = arg_types
.into_iter()
.map(|arg| type_to_variable(subs, arg))
.collect();
let flat_type = FlatType::Apply(module_name, name, args);
let content = Content::Structure(flat_type);
subs.fresh(Descriptor::from(content))
},
}
EmptyRec => {
let content = Content::Structure(FlatType::EmptyRecord);
subs.fresh(Descriptor::from(content))
},
}
Function(arg_types, ret_type) => {
let arg_vars = arg_types.into_iter().map(|arg_type| {
type_to_variable(subs, arg_type)
}).collect();
let arg_vars = arg_types
.into_iter()
.map(|arg_type| type_to_variable(subs, arg_type))
.collect();
let ret_var = type_to_variable(subs, *ret_type);
let content = Content::Structure(FlatType::Func(arg_vars, ret_var));
subs.fresh(Descriptor::from(content))
},
}
Operator(box_type) => {
let op_type = *box_type;
let l_var = type_to_variable(subs, op_type.left);
@ -119,7 +119,7 @@ fn type_to_variable(subs: &mut Subs, typ: Type) -> Variable {
let content = Content::Structure(FlatType::Operator(l_var, r_var, ret_var));
subs.fresh(Descriptor::from(content))
},
}
Erroneous(problem) => {
let content = Content::Structure(FlatType::Erroneous(problem));
@ -127,4 +127,3 @@ fn type_to_variable(subs: &mut Subs, typ: Type) -> Variable {
}
}
}