language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-01 07:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'trunk' into fuzz

Browse source
This commit is contained in:
Richard Feldman 2020-11-01 08:57:19 -05:00 • committed by GitHub
commit 2f2e67059b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 56 additions and 593 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/can/src/def.rs
View file

@ -1278,7 +1278,7 @@ pub fn can_defs_with_return<'a>(
for declaration in decls.into_iter().rev() {
loc_expr = Located {
region: Region::zero(),
value: decl_to_let(var_store, declaration, loc_expr, output.aliases.clone()),
value: decl_to_let(var_store, declaration, loc_expr),
};
}
@ -1288,19 +1288,12 @@ pub fn can_defs_with_return<'a>(
}
}
fn decl_to_let(
var_store: &mut VarStore,
decl: Declaration,
loc_ret: Located<Expr>,
aliases: SendMap<Symbol, Alias>,
) -> Expr {
fn decl_to_let(var_store: &mut VarStore, decl: Declaration, loc_ret: Located<Expr>) -> Expr {
match decl {
Declaration::Declare(def) => {
Expr::LetNonRec(Box::new(def), Box::new(loc_ret), var_store.fresh(), aliases)
}
Declaration::DeclareRec(defs) => {
Expr::LetRec(defs, Box::new(loc_ret), var_store.fresh(), aliases)
Expr::LetNonRec(Box::new(def), Box::new(loc_ret), var_store.fresh())
}
Declaration::DeclareRec(defs) => Expr::LetRec(defs, Box::new(loc_ret), var_store.fresh()),
Declaration::InvalidCycle(symbols, regions) => {
Expr::RuntimeError(RuntimeError::CircularDef(symbols, regions))
}