summaryrefslogtreecommitdiff
path: root/dhall/src/semantics/phase
diff options
context:
space:
mode:
authorNadrieril2020-01-29 21:26:42 +0000
committerNadrieril2020-01-29 21:26:42 +0000
commitdb6c09f33c3c794e4b6ec8a7aa80978d945a9d7a (patch)
tree8cf018122e61b035c3af4bdd84d62a159a089b22 /dhall/src/semantics/phase
parente410dbb428e621fe600be43ddecca1c7bff7cb2f (diff)
Remove dead code
Diffstat (limited to 'dhall/src/semantics/phase')
-rw-r--r--dhall/src/semantics/phase/normalize.rs7
-rw-r--r--dhall/src/semantics/phase/typecheck.rs624
2 files changed, 2 insertions, 629 deletions
diff --git a/dhall/src/semantics/phase/normalize.rs b/dhall/src/semantics/phase/normalize.rs
index f4e4099..d40456b 100644
--- a/dhall/src/semantics/phase/normalize.rs
+++ b/dhall/src/semantics/phase/normalize.rs
@@ -1,4 +1,3 @@
-#![allow(dead_code)]
use std::collections::HashMap;
use std::convert::TryInto;
@@ -376,9 +375,6 @@ pub(crate) fn apply_builtin(
pub(crate) fn apply_any(f: Value, a: Value, ty: &Value) -> ValueKind<Value> {
let f_borrow = f.as_whnf();
match &*f_borrow {
- ValueKind::Lam(_, _, e) => e
- .subst_shift(&AlphaVar::default(), &a)
- .to_whnf_check_type(ty),
ValueKind::LamClosure { closure, .. } => {
closure.apply(a).to_whnf_check_type(ty)
}
@@ -861,9 +857,6 @@ impl NzEnv {
pub fn new() -> Self {
NzEnv { items: Vec::new() }
}
- pub fn construct(items: Vec<NzEnvItem>) -> Self {
- NzEnv { items }
- }
pub fn to_alpha_tyenv(&self) -> TyEnv {
TyEnv::from_nzenv_alpha(self)
}
diff --git a/dhall/src/semantics/phase/typecheck.rs b/dhall/src/semantics/phase/typecheck.rs
index 6de65e8..4392365 100644
--- a/dhall/src/semantics/phase/typecheck.rs
+++ b/dhall/src/semantics/phase/typecheck.rs
@@ -1,122 +1,10 @@
-use std::borrow::Cow;
-use std::cmp::max;
-use std::collections::HashMap;
-
-use crate::error::{TypeError, TypeMessage};
-use crate::semantics::core::context::TyCtx;
-use crate::semantics::phase::normalize::merge_maps;
use crate::semantics::phase::normalize::NzEnv;
-use crate::semantics::phase::Normalized;
-use crate::semantics::{AlphaVar, Binder, Value, ValueKind};
+use crate::semantics::{Value, ValueKind};
use crate::syntax;
use crate::syntax::{
- Builtin, Const, Expr, ExprKind, InterpolatedTextContents, Label, Span,
- UnspannedExpr,
+ Builtin, Const, Expr, ExprKind, Label, Span, UnspannedExpr,
};
-fn tck_pi_type(
- binder: Binder,
- tx: Value,
- te: Value,
-) -> Result<Value, TypeError> {
- use TypeMessage::*;
-
- let ka = match tx.get_type()?.as_const() {
- Some(k) => k,
- _ => return Err(TypeError::new(InvalidInputType(tx))),
- };
-
- let kb = match te.get_type()?.as_const() {
- Some(k) => k,
- _ => return Err(TypeError::new(InvalidOutputType(te.get_type()?))),
- };
-
- let k = function_check(ka, kb);
-
- Ok(Value::from_kind_and_type(
- ValueKind::Pi(binder, tx, te),
- Value::from_const(k),
- ))
-}
-
-fn tck_record_type(
- kts: impl IntoIterator<Item = Result<(Label, Value), TypeError>>,
-) -> Result<Value, TypeError> {
- use std::collections::hash_map::Entry;
- use TypeMessage::*;
- let mut new_kts = HashMap::new();
- // An empty record type has type Type
- let mut k = Const::Type;
- for e in kts {
- let (x, t) = e?;
- // Construct the union of the contained `Const`s
- match t.get_type()?.as_const() {
- Some(k2) => k = max(k, k2),
- None => return Err(TypeError::new(InvalidFieldType(x, t))),
- }
- // Check for duplicated entries
- let entry = new_kts.entry(x);
- match &entry {
- Entry::Occupied(_) => {
- return Err(TypeError::new(RecordTypeDuplicateField))
- }
- Entry::Vacant(_) => entry.or_insert_with(|| t),
- };
- }
-
- Ok(Value::from_kind_and_type(
- ValueKind::RecordType(new_kts),
- Value::from_const(k),
- ))
-}
-
-fn tck_union_type<Iter>(kts: Iter) -> Result<Value, TypeError>
-where
- Iter: IntoIterator<Item = Result<(Label, Option<Value>), TypeError>>,
-{
- use std::collections::hash_map::Entry;
- use TypeMessage::*;
- let mut new_kts = HashMap::new();
- // Check that all types are the same const
- let mut k = None;
- for e in kts {
- let (x, t) = e?;
- if let Some(t) = &t {
- match (k, t.get_type()?.as_const()) {
- (None, Some(k2)) => k = Some(k2),
- (Some(k1), Some(k2)) if k1 == k2 => {}
- _ => {
- return Err(TypeError::new(InvalidFieldType(x, t.clone())))
- }
- }
- }
- let entry = new_kts.entry(x);
- match &entry {
- Entry::Occupied(_) => {
- return Err(TypeError::new(UnionTypeDuplicateField))
- }
- Entry::Vacant(_) => entry.or_insert_with(|| t),
- };
- }
-
- // An empty union type has type Type;
- // an union type with only unary variants also has type Type
- let k = k.unwrap_or(Const::Type);
-
- Ok(Value::from_kind_and_type(
- ValueKind::UnionType(new_kts),
- Value::from_const(k),
- ))
-}
-
-fn function_check(a: Const, b: Const) -> Const {
- if b == Const::Type {
- Const::Type
- } else {
- max(a, b)
- }
-}
-
pub(crate) fn const_to_value(c: Const) -> Value {
let v = ValueKind::Const(c);
match c {
@@ -289,511 +177,3 @@ pub(crate) fn builtin_to_value_env(b: Builtin, env: &NzEnv) -> Value {
.normalize_whnf_noenv(),
)
}
-
-/// Type-check an expression and return the expression alongside its type if type-checking
-/// succeeded, or an error if type-checking failed.
-/// Some normalization is done while typechecking, so the returned expression might be partially
-/// normalized as well.
-fn type_with(ctx: &TyCtx, e: Expr<Normalized>) -> Result<Value, TypeError> {
- use syntax::ExprKind::{Annot, Embed, Lam, Let, Pi, Var};
- let span = e.span();
-
- match e.as_ref() {
- Lam(var, annot, body) => {
- let binder = ctx.new_binder(var);
- let annot = type_with(ctx, annot.clone())?;
- annot.normalize_nf();
- let ctx2 = ctx.insert_type(&binder, annot.clone());
- let body = type_with(&ctx2, body.clone())?;
- let body_type = body.get_type()?;
- Ok(Value::from_kind_and_type(
- ValueKind::Lam(binder.clone(), annot.clone(), body),
- tck_pi_type(binder, annot, body_type)?,
- ))
- }
- Pi(x, ta, tb) => {
- let binder = ctx.new_binder(x);
- let ta = type_with(ctx, ta.clone())?;
- let ctx2 = ctx.insert_type(&binder, ta.clone());
- let tb = type_with(&ctx2, tb.clone())?;
- tck_pi_type(binder, ta, tb)
- }
- Let(x, t, v, e) => {
- let v = if let Some(t) = t {
- t.rewrap(Annot(v.clone(), t.clone()))
- } else {
- v.clone()
- };
-
- let v = type_with(ctx, v)?;
- let binder = ctx.new_binder(x);
- let e =
- type_with(&ctx.insert_value(&binder, v.clone())?, e.clone())?;
- // let e_ty = e.get_type()?;
- // Ok(Value::from_kind_and_type(
- // ValueKind::PartialExpr(ExprKind::Let(x.clone(), None, v, e)),
- // e_ty,
- // ))
- Ok(e)
- }
- Embed(p) => Ok(p.clone().into_value()),
- Var(var) => match ctx.lookup(&var) {
- Some(typed) => Ok(typed.clone()),
- None => Err(TypeError::new(TypeMessage::UnboundVariable(span))),
- },
- e => {
- // Typecheck recursively all subexpressions
- let expr = e.traverse_ref_with_special_handling_of_binders(
- |e| type_with(ctx, e.clone()),
- |_, _| unreachable!(),
- )?;
- type_last_layer(ctx, expr, span)
- }
- }
-}
-
-/// When all sub-expressions have been typed, check the remaining toplevel
-/// layer.
-fn type_last_layer(
- ctx: &TyCtx,
- e: ExprKind<Value, Normalized>,
- span: Span,
-) -> Result<Value, TypeError> {
- use syntax::BinOp::*;
- use syntax::Builtin::*;
- use syntax::Const::Type;
- let mkerr =
- |msg: &str| Err(TypeError::new(TypeMessage::Custom(msg.to_string())));
-
- /// Intermediary return type
- enum Ret {
- /// Returns the contained value as is
- RetWhole(Value),
- /// Returns the input expression `e` with the contained value as its type
- RetTypeOnly(Value),
- }
- use Ret::*;
-
- let ret = match &e {
- ExprKind::Import(_) => unreachable!(
- "There should remain no imports in a resolved expression"
- ),
- ExprKind::Lam(_, _, _)
- | ExprKind::Pi(_, _, _)
- | ExprKind::Let(_, _, _, _)
- | ExprKind::Embed(_)
- | ExprKind::Var(_) => unreachable!(),
- ExprKind::App(f, a) => {
- let tf = f.get_type()?;
- let tf_borrow = tf.as_whnf();
- match &*tf_borrow {
- ValueKind::Pi(_, tx, tb) => {
- if &a.get_type()? != tx {
- return mkerr("TypeMismatch");
- }
-
- let ret = tb.subst_shift(&AlphaVar::default(), a);
- ret.normalize_nf();
- RetTypeOnly(ret)
- }
- ValueKind::PiClosure { closure, .. } => {
- RetTypeOnly(closure.apply(a.clone()))
- }
- _ => return mkerr("NotAFunction"),
- }
- }
- ExprKind::Annot(x, t) => {
- if &x.get_type()? != t {
- return mkerr("AnnotMismatch");
- }
- RetWhole(x.clone())
- }
- ExprKind::Assert(t) => {
- match &*t.as_whnf() {
- ValueKind::Equivalence(x, y) if x == y => {}
- ValueKind::Equivalence(..) => return mkerr("AssertMismatch"),
- _ => return mkerr("AssertMustTakeEquivalence"),
- }
- RetTypeOnly(t.clone())
- }
- ExprKind::BoolIf(x, y, z) => {
- if *x.get_type()?.as_whnf() != ValueKind::from_builtin(Bool) {
- return mkerr("InvalidPredicate");
- }
-
- if y.get_type()?.get_type()?.as_const() != Some(Const::Type) {
- return mkerr("IfBranchMustBeTerm");
- }
-
- if z.get_type()?.get_type()?.as_const() != Some(Const::Type) {
- return mkerr("IfBranchMustBeTerm");
- }
-
- if y.get_type()? != z.get_type()? {
- return mkerr("IfBranchMismatch");
- }
-
- RetTypeOnly(y.get_type()?)
- }
- ExprKind::EmptyListLit(t) => {
- let arg = match &*t.as_whnf() {
- ValueKind::AppliedBuiltin(
- syntax::Builtin::List,
- args,
- _,
- _,
- ) if args.len() == 1 => args[0].clone(),
- _ => return mkerr("InvalidListType"),
- };
- RetWhole(Value::from_kind_and_type(
- ValueKind::EmptyListLit(arg),
- t.clone(),
- ))
- }
- ExprKind::NEListLit(xs) => {
- let mut iter = xs.iter().enumerate();
- let (_, x) = iter.next().unwrap();
- for (_, y) in iter {
- if x.get_type()? != y.get_type()? {
- return mkerr("InvalidListElement");
- }
- }
- let t = x.get_type()?;
- if t.get_type()?.as_const() != Some(Const::Type) {
- return mkerr("InvalidListType");
- }
-
- RetTypeOnly(Value::from_builtin(syntax::Builtin::List).app(t))
- }
- ExprKind::SomeLit(x) => {
- let t = x.get_type()?;
- if t.get_type()?.as_const() != Some(Const::Type) {
- return mkerr("InvalidOptionalType");
- }
-
- RetTypeOnly(Value::from_builtin(syntax::Builtin::Optional).app(t))
- }
- ExprKind::RecordType(kts) => RetWhole(tck_record_type(
- kts.iter().map(|(x, t)| Ok((x.clone(), t.clone()))),
- )?),
- ExprKind::UnionType(kts) => RetWhole(tck_union_type(
- kts.iter().map(|(x, t)| Ok((x.clone(), t.clone()))),
- )?),
- ExprKind::RecordLit(kvs) => RetTypeOnly(tck_record_type(
- kvs.iter().map(|(x, v)| Ok((x.clone(), v.get_type()?))),
- )?),
- ExprKind::Field(r, x) => {
- match &*r.get_type()?.as_whnf() {
- ValueKind::RecordType(kts) => match kts.get(&x) {
- Some(tth) => RetTypeOnly(tth.clone()),
- None => return mkerr("MissingRecordField"),
- },
- // TODO: branch here only when r.get_type() is a Const
- _ => {
- match &*r.as_whnf() {
- ValueKind::UnionType(kts) => match kts.get(&x) {
- // Constructor has type T -> < x: T, ... >
- Some(Some(t)) => RetTypeOnly(tck_pi_type(
- ctx.new_binder(x),
- t.clone(),
- r.under_binder(),
- )?),
- Some(None) => RetTypeOnly(r.clone()),
- None => return mkerr("MissingUnionField"),
- },
- _ => return mkerr("NotARecord"),
- }
- } // _ => mkerr("NotARecord"),
- }
- }
- ExprKind::Const(c) => RetWhole(const_to_value(*c)),
- ExprKind::Builtin(b) => RetWhole(builtin_to_value(*b)),
- ExprKind::BoolLit(_) => RetTypeOnly(builtin_to_value(Bool)),
- ExprKind::NaturalLit(_) => RetTypeOnly(builtin_to_value(Natural)),
- ExprKind::IntegerLit(_) => RetTypeOnly(builtin_to_value(Integer)),
- ExprKind::DoubleLit(_) => RetTypeOnly(builtin_to_value(Double)),
- ExprKind::TextLit(interpolated) => {
- let text_type = builtin_to_value(Text);
- for contents in interpolated.iter() {
- use InterpolatedTextContents::Expr;
- if let Expr(x) = contents {
- if x.get_type()? != text_type {
- return mkerr("InvalidTextInterpolation");
- }
- }
- }
- RetTypeOnly(text_type)
- }
- ExprKind::BinOp(RightBiasedRecordMerge, l, r) => {
- let l_type = l.get_type()?;
- let r_type = r.get_type()?;
-
- // Extract the LHS record type
- let l_type_borrow = l_type.as_whnf();
- let kts_x = match &*l_type_borrow {
- ValueKind::RecordType(kts) => kts,
- _ => return mkerr("MustCombineRecord"),
- };
-
- // Extract the RHS record type
- let r_type_borrow = r_type.as_whnf();
- let kts_y = match &*r_type_borrow {
- ValueKind::RecordType(kts) => kts,
- _ => return mkerr("MustCombineRecord"),
- };
-
- // Union the two records, prefering
- // the values found in the RHS.
- let kts = merge_maps::<_, _, _, !>(kts_x, kts_y, |_, _, r_t| {
- Ok(r_t.clone())
- })?;
-
- // Construct the final record type from the union
- RetTypeOnly(tck_record_type(
- kts.into_iter().map(|(x, v)| Ok((x.clone(), v))),
- )?)
- }
- ExprKind::BinOp(RecursiveRecordMerge, l, r) => {
- RetTypeOnly(type_last_layer(
- ctx,
- ExprKind::BinOp(
- RecursiveRecordTypeMerge,
- l.get_type()?,
- r.get_type()?,
- ),
- Span::Artificial,
- )?)
- }
- ExprKind::BinOp(RecursiveRecordTypeMerge, l, r) => {
- // Extract the LHS record type
- let borrow_l = l.as_whnf();
- let kts_x = match &*borrow_l {
- ValueKind::RecordType(kts) => kts,
- _ => return mkerr("RecordTypeMergeRequiresRecordType"),
- };
-
- // Extract the RHS record type
- let borrow_r = r.as_whnf();
- let kts_y = match &*borrow_r {
- ValueKind::RecordType(kts) => kts,
- _ => return mkerr("RecordTypeMergeRequiresRecordType"),
- };
-
- // Ensure that the records combine without a type error
- let kts = merge_maps(
- kts_x,
- kts_y,
- // If the Label exists for both records, then we hit the recursive case.
- |_, l: &Value, r: &Value| {
- type_last_layer(
- ctx,
- ExprKind::BinOp(
- RecursiveRecordTypeMerge,
- l.clone(),
- r.clone(),
- ),
- Span::Artificial,
- )
- },
- )?;
-
- RetWhole(tck_record_type(kts.into_iter().map(Ok))?)
- }
- ExprKind::BinOp(ListAppend, l, r) => {
- match &*l.get_type()?.as_whnf() {
- ValueKind::AppliedBuiltin(List, _, _, _) => {}
- _ => return mkerr("BinOpTypeMismatch"),
- }
-
- if l.get_type()? != r.get_type()? {
- return mkerr("BinOpTypeMismatch");
- }
-
- RetTypeOnly(l.get_type()?)
- }
- ExprKind::BinOp(Equivalence, l, r) => {
- if l.get_type()?.get_type()?.as_const() != Some(Const::Type) {
- return mkerr("EquivalenceArgumentMustBeTerm");
- }
- if r.get_type()?.get_type()?.as_const() != Some(Const::Type) {
- return mkerr("EquivalenceArgumentMustBeTerm");
- }
-
- if l.get_type()? != r.get_type()? {
- return mkerr("EquivalenceTypeMismatch");
- }
-
- RetWhole(Value::from_kind_and_type(
- ValueKind::Equivalence(l.clone(), r.clone()),
- Value::from_const(Type),
- ))
- }
- ExprKind::BinOp(o, l, r) => {
- let t = builtin_to_value(match o {
- BoolAnd => Bool,
- BoolOr => Bool,
- BoolEQ => Bool,
- BoolNE => Bool,
- NaturalPlus => Natural,
- NaturalTimes => Natural,
- TextAppend => Text,
- ListAppend => unreachable!(),
- RightBiasedRecordMerge => unreachable!(),
- RecursiveRecordMerge => unreachable!(),
- RecursiveRecordTypeMerge => unreachable!(),
- ImportAlt => unreachable!("There should remain no import alternatives in a resolved expression"),
- Equivalence => unreachable!(),
- });
-
- if l.get_type()? != t {
- return mkerr("BinOpTypeMismatch");
- }
-
- if r.get_type()? != t {
- return mkerr("BinOpTypeMismatch");
- }
-
- RetTypeOnly(t)
- }
- ExprKind::Merge(record, union, type_annot) => {
- let record_type = record.get_type()?;
- let record_borrow = record_type.as_whnf();
- let handlers = match &*record_borrow {
- ValueKind::RecordType(kts) => kts,
- _ => return mkerr("Merge1ArgMustBeRecord"),
- };
-
- let union_type = union.get_type()?;
- let union_borrow = union_type.as_whnf();
- let variants = match &*union_borrow {
- ValueKind::UnionType(kts) => Cow::Borrowed(kts),
- ValueKind::AppliedBuiltin(
- syntax::Builtin::Optional,
- args,
- _,
- _,
- ) if args.len() == 1 => {
- let ty = &args[0];
- let mut kts = HashMap::new();
- kts.insert("None".into(), None);
- kts.insert("Some".into(), Some(ty.clone()));
- Cow::Owned(kts)
- }
- _ => return mkerr("Merge2ArgMustBeUnionOrOptional"),
- };
-
- let mut inferred_type = None;
- for (x, handler_type) in handlers {
- let handler_return_type =
- match variants.get(x) {
- // Union alternative with type
- Some(Some(variant_type)) => {
- let handler_type_borrow = handler_type.as_whnf();
- let (tx, tb) = match &*handler_type_borrow {
- ValueKind::Pi(_, tx, tb) => (tx, tb),
- _ => return mkerr("NotAFunction"),
- };
-
- if variant_type != tx {
- return mkerr("TypeMismatch");
- }
-
- // Extract `tb` from under the binder. Fails if the variable was used
- // in `tb`.
- match tb.over_binder() {
- Some(x) => x,
- None => return mkerr(
- "MergeHandlerReturnTypeMustNotBeDependent",
- ),
- }
- }
- // Union alternative without type
- Some(None) => handler_type.clone(),
- None => return mkerr("MergeHandlerMissingVariant"),
- };
- match &inferred_type {
- None => inferred_type = Some(handler_return_type),
- Some(t) => {
- if t != &handler_return_type {
- return mkerr("MergeHandlerTypeMismatch");
- }
- }
- }
- }
- for x in variants.keys() {
- if !handlers.contains_key(x) {
- return mkerr("MergeVariantMissingHandler");
- }
- }
-
- match (inferred_type, type_annot.as_ref()) {
- (Some(t1), Some(t2)) => {
- if &t1 != t2 {
- return mkerr("MergeAnnotMismatch");
- }
- RetTypeOnly(t1)
- }
- (Some(t), None) => RetTypeOnly(t),
- (None, Some(t)) => RetTypeOnly(t.clone()),
- (None, None) => return mkerr("MergeEmptyNeedsAnnotation"),
- }
- }
- ExprKind::ToMap(_, _) => unimplemented!("toMap"),
- ExprKind::Projection(record, labels) => {
- let record_type = record.get_type()?;
- let record_type_borrow = record_type.as_whnf();
- let kts = match &*record_type_borrow {
- ValueKind::RecordType(kts) => kts,
- _ => return mkerr("ProjectionMustBeRecord"),
- };
-
- let mut new_kts = HashMap::new();
- for l in labels {
- match kts.get(l) {
- None => return mkerr("ProjectionMissingEntry"),
- Some(t) => {
- use std::collections::hash_map::Entry;
- match new_kts.entry(l.clone()) {
- Entry::Occupied(_) => {
- return mkerr("ProjectionDuplicateField")
- }
- Entry::Vacant(e) => e.insert(t.clone()),
- }
- }
- };
- }
-
- RetTypeOnly(Value::from_kind_and_type(
- ValueKind::RecordType(new_kts),
- record_type.get_type()?,
- ))
- }
- ExprKind::ProjectionByExpr(_, _) => {
- unimplemented!("selection by expression")
- }
- ExprKind::Completion(_, _) => unimplemented!("record completion"),
- };
-
- Ok(match ret {
- RetTypeOnly(typ) => Value::from_kind_and_type_and_span(
- ValueKind::PartialExpr(e),
- typ,
- span,
- ),
- RetWhole(v) => v.with_span(span),
- })
-}
-
-/// `type_of` is the same as `type_with` with an empty context, meaning that the
-/// expression must be closed (i.e. no free variables), otherwise type-checking
-/// will fail.
-pub(crate) fn typecheck(e: Expr<Normalized>) -> Result<Value, TypeError> {
- type_with(&TyCtx::new(), e)
-}
-
-pub(crate) fn typecheck_with(
- expr: Expr<Normalized>,
- ty: Expr<Normalized>,
-) -> Result<Value, TypeError> {
- typecheck(expr.rewrap(ExprKind::Annot(expr.clone(), ty)))
-}