Merge branch 'whnf'

Massive normalization rewrite, for greatly improved flexibility
and performance.

Closes #84

1 files changed, 2 insertions, 6 deletions

diff --git a/dhall_generator/src/quote.rs b/dhall_generator/src/quote.rs
index 400c12c..c588eda 100644
--- a/dhall_generator/src/quote.rs
+++ b/dhall_generator/src/quote.rs
@@ -43,7 +43,6 @@ where
             quote! { dhall_core::ExprF::Lam(#x, #t, #b) }
         }
         App(f, a) => {
-            let a = quote_vec(a);
             quote! { dhall_core::ExprF::App(#f, #a) }
         }
         Annot(x, t) => {
@@ -67,11 +66,8 @@ where
         BoolLit(b) => {
             quote! { dhall_core::ExprF::BoolLit(#b) }
         }
-        EmptyOptionalLit(x) => {
-            quote! { dhall_core::ExprF::EmptyOptionalLit(#x) }
-        }
-        NEOptionalLit(x) => {
-            quote! { dhall_core::ExprF::NEOptionalLit(#x) }
+        SomeLit(x) => {
+            quote! { dhall_core::ExprF::SomeLit(#x) }
         }
         EmptyListLit(t) => {
             quote! { dhall_core::ExprF::EmptyListLit(#t) }