Merge branch 'whnf'

Massive normalization rewrite, for greatly improved flexibility
and performance.

Closes #84

1 files changed, 7 insertions, 7 deletions

diff --git a/dhall/src/binary.rs b/dhall/src/binary.rs
index c12aa2a..7ded3a5 100644
--- a/dhall/src/binary.rs
+++ b/dhall/src/binary.rs
@@ -42,12 +42,12 @@ fn cbor_value_to_dhall(data: &cbor::Value) -> Result<ParsedExpr, DecodeError> {
                 Var(V(l, *n as usize))
             }
             [U64(0), f, args..] => {
-                let f = cbor_value_to_dhall(&f)?;
-                let args = args
-                    .iter()
-                    .map(cbor_value_to_dhall)
-                    .collect::<Result<Vec<_>, _>>()?;
-                App(f, args)
+                let mut f = cbor_value_to_dhall(&f)?;
+                for a in args {
+                    let a = cbor_value_to_dhall(&a)?;
+                    f = rc(App(f, a))
+                }
+                return Ok(f);
             }
             [U64(1), x, y] => {
                 let x = cbor_value_to_dhall(&x)?;
@@ -111,7 +111,7 @@ fn cbor_value_to_dhall(data: &cbor::Value) -> Result<ParsedExpr, DecodeError> {
             }
             [U64(5), Null, x] => {
                 let x = cbor_value_to_dhall(&x)?;
-                NEOptionalLit(x)
+                SomeLit(x)
             }
             [U64(5), t, x] => {
                 let x = cbor_value_to_dhall(&x)?;