Merge pull request #129 from Nadrieril/missing-features

Implement some missing features

1 files changed, 134 insertions, 5 deletions

diff --git a/dhall/src/semantics/nze/normalize.rs b/dhall/src/semantics/nze/normalize.rs
index e9d140b..a00b7ff 100644
--- a/dhall/src/semantics/nze/normalize.rs
+++ b/dhall/src/semantics/nze/normalize.rs
@@ -1,3 +1,4 @@
+use itertools::Itertools;
 use std::collections::HashMap;
 
 use crate::semantics::NzEnv;
@@ -184,6 +185,7 @@ fn apply_binop<'a>(
             }
             Ret::ValueKind(RecordLit(kvs))
         }
+        (RightBiasedRecordMerge, _, _) if x == y => Ret::ValueRef(y),
 
         (RecursiveRecordMerge, _, RecordLit(kvs)) if kvs.is_empty() => {
             Ret::ValueRef(x)
@@ -242,9 +244,9 @@ pub(crate) fn normalize_one_layer(
     env: &NzEnv,
 ) -> ValueKind {
     use ValueKind::{
-        BoolLit, DoubleLit, EmptyOptionalLit, IntegerLit, NEListLit,
-        NEOptionalLit, NaturalLit, RecordLit, RecordType, UnionConstructor,
-        UnionLit, UnionType,
+        BoolLit, DoubleLit, EmptyListLit, EmptyOptionalLit, IntegerLit,
+        NEListLit, NEOptionalLit, NaturalLit, PartialExpr, RecordLit,
+        RecordType, UnionConstructor, UnionLit, UnionType,
     };
 
     let ret = match expr {
@@ -271,7 +273,7 @@ pub(crate) fn normalize_one_layer(
         ExprKind::DoubleLit(n) => Ret::ValueKind(DoubleLit(n)),
         ExprKind::SomeLit(e) => Ret::ValueKind(NEOptionalLit(e)),
         ExprKind::EmptyListLit(t) => {
-            let arg = match &*t.kind() {
+            let arg = match t.kind() {
                 ValueKind::AppliedBuiltin(BuiltinClosure {
                     b: Builtin::List,
                     args,
@@ -330,6 +332,13 @@ pub(crate) fn normalize_one_layer(
                     .filter_map(|l| kvs.get(l).map(|x| (l.clone(), x.clone())))
                     .collect(),
             )),
+            PartialExpr(ExprKind::Projection(v2, _)) => {
+                return normalize_one_layer(
+                    ExprKind::Projection(v2.clone(), ls.clone()),
+                    ty,
+                    env,
+                )
+            }
             _ => Ret::Expr(expr),
         },
         ExprKind::Field(ref v, ref l) => match v.kind() {
@@ -342,6 +351,88 @@ pub(crate) fn normalize_one_layer(
                 kts.clone(),
                 v.get_type().unwrap(),
             )),
+            PartialExpr(ExprKind::BinOp(
+                BinOp::RightBiasedRecordMerge,
+                x,
+                y,
+            )) => match (x.kind(), y.kind()) {
+                (_, RecordLit(kvs)) => match kvs.get(l) {
+                    Some(r) => Ret::Value(r.clone()),
+                    None => {
+                        return normalize_one_layer(
+                            ExprKind::Field(x.clone(), l.clone()),
+                            ty,
+                            env,
+                        )
+                    }
+                },
+                (RecordLit(kvs), _) => match kvs.get(l) {
+                    Some(r) => Ret::Expr(ExprKind::Field(
+                        Value::from_kind_and_type(
+                            PartialExpr(ExprKind::BinOp(
+                                BinOp::RightBiasedRecordMerge,
+                                Value::from_kind_and_type(
+                                    RecordLit({
+                                        let mut kvs = HashMap::new();
+                                        kvs.insert(l.clone(), r.clone());
+                                        kvs
+                                    }),
+                                    Value::from_kind_and_type(
+                                        RecordType({
+                                            let mut kvs = HashMap::new();
+                                            kvs.insert(
+                                                l.clone(),
+                                                r.get_type_not_sort(),
+                                            );
+                                            kvs
+                                        }),
+                                        r.get_type_not_sort()
+                                            .get_type_not_sort(),
+                                    ),
+                                ),
+                                y.clone(),
+                            )),
+                            v.get_type_not_sort(),
+                        ),
+                        l.clone(),
+                    )),
+                    None => {
+                        return normalize_one_layer(
+                            ExprKind::Field(y.clone(), l.clone()),
+                            ty,
+                            env,
+                        )
+                    }
+                },
+                _ => Ret::Expr(expr),
+            },
+            PartialExpr(ExprKind::BinOp(
+                BinOp::RecursiveRecordTypeMerge,
+                x,
+                y,
+            )) => match (x.kind(), y.kind()) {
+                (RecordLit(kvs), _) => match kvs.get(l) {
+                    Some(_) => Ret::Expr(expr),
+                    None => {
+                        return normalize_one_layer(
+                            ExprKind::Field(y.clone(), l.clone()),
+                            ty,
+                            env,
+                        )
+                    }
+                },
+                (_, RecordLit(kvs)) => match kvs.get(l) {
+                    Some(_) => Ret::Expr(expr),
+                    None => {
+                        return normalize_one_layer(
+                            ExprKind::Field(x.clone(), l.clone()),
+                            ty,
+                            env,
+                        )
+                    }
+                },
+                _ => Ret::Expr(expr),
+            },
             _ => Ret::Expr(expr),
         },
         ExprKind::ProjectionByExpr(_, _) => {
@@ -373,7 +464,45 @@ pub(crate) fn normalize_one_layer(
                 _ => Ret::Expr(expr),
             }
         }
-        ExprKind::ToMap(_, _) => unimplemented!("toMap"),
+        ExprKind::ToMap(ref v, ref annot) => match v.kind() {
+            RecordLit(kvs) if kvs.is_empty() => {
+                match annot.as_ref().map(|v| v.kind()) {
+                    Some(ValueKind::AppliedBuiltin(BuiltinClosure {
+                        b: Builtin::List,
+                        args,
+                        ..
+                    })) if args.len() == 1 => {
+                        Ret::ValueKind(EmptyListLit(args[0].clone()))
+                    }
+                    _ => Ret::Expr(expr),
+                }
+            }
+            RecordLit(kvs) => Ret::ValueKind(NEListLit(
+                kvs.iter()
+                    .sorted_by_key(|(k, _)| k.clone())
+                    .map(|(k, v)| {
+                        let mut rec = HashMap::new();
+                        let mut rec_ty = HashMap::new();
+                        rec.insert("mapKey".into(), Value::from_text(k));
+                        rec.insert("mapValue".into(), v.clone());
+                        rec_ty.insert(
+                            "mapKey".into(),
+                            Value::from_builtin(Builtin::Text),
+                        );
+                        rec_ty.insert("mapValue".into(), v.get_type_not_sort());
+
+                        Value::from_kind_and_type(
+                            ValueKind::RecordLit(rec),
+                            Value::from_kind_and_type(
+                                ValueKind::RecordType(rec_ty),
+                                Value::from_const(Const::Type),
+                            ),
+                        )
+                    })
+                    .collect(),
+            )),
+            _ => Ret::Expr(expr),
+        },
     };
 
     match ret {