tweag/nickel
1
1
Fork 0
mirror of https://github.com/tweag/nickel.git synced 2024-11-10 10:46:49 +03:00
Code Issues Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
Yann Hamdaoui 2021-02-10 09:55:24 +01:00
parent 0d5cc3b568
commit e0a64dca82
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/eval.rs
View File

@ -591,26 +591,28 @@ where
// Thanks to the share normal form transformation, the content is either a constant or a
// variable.
let rec_env = ts.iter().try_fold::<_, _, Result<Environment, EvalError>>(
HashMap::new(), |mut rec_env, (id, rt)| match rt.as_ref() {
Term::Var(ref var_id) => {
let thunk = env.get(var_id).ok_or_else(|| {
EvalError::UnboundIdentifier(var_id.clone(), rt.pos.clone())
})?;
rec_env.insert(id.clone(), thunk.clone());
Ok(rec_env)
}
_ => {
// If we are in this branch, the term must be a constant after the
// share normal form transformation, hence it should not need an
// environment, which is why it is dropped.
let closure = Closure {
body: rt.clone(),
env: HashMap::new(),
};
rec_env.insert(id.clone(), Thunk::new(closure, IdentKind::Let()));
Ok(rec_env)
}
})?;
HashMap::new(),
|mut rec_env, (id, rt)| match rt.as_ref() {
Term::Var(ref var_id) => {
let thunk = env.get(var_id).ok_or_else(|| {
EvalError::UnboundIdentifier(var_id.clone(), rt.pos.clone())
})?;
rec_env.insert(id.clone(), thunk.clone());
Ok(rec_env)
}
_ => {
// If we are in this branch, the term must be a constant after the
// share normal form transformation, hence it should not need an
// environment, which is why it is dropped.
let closure = Closure {
body: rt.clone(),
env: HashMap::new(),
};
rec_env.insert(id.clone(), Thunk::new(closure, IdentKind::Let()));
Ok(rec_env)
}
},
)?;
let new_ts = ts.into_iter().map(|(id, rt)| {
let RichTerm { term, pos } = rt;