diff options
author | Nadrieril | 2019-08-20 18:03:59 +0200 |
---|---|---|
committer | Nadrieril | 2019-08-20 18:03:59 +0200 |
commit | 4f1f37cfc115510500e83d2dfbfa8ed7ddeae74a (patch) | |
tree | 77c743b9c55afbbb5966a3c90614c6d3d257813d /dhall/src/phase/typecheck.rs | |
parent | a506632b27b287d1bf898e2f77ae09a56902474c (diff) |
Introduce a new enum to store either a Value or a ValueF
Diffstat (limited to '')
-rw-r--r-- | dhall/src/phase/typecheck.rs | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/dhall/src/phase/typecheck.rs b/dhall/src/phase/typecheck.rs index 440d694..996c26c 100644 --- a/dhall/src/phase/typecheck.rs +++ b/dhall/src/phase/typecheck.rs @@ -455,11 +455,11 @@ fn type_last_layer( return mkerr(InvalidListType(t.into_owned())); } - RetTypeOnly(Value::from_valuef_and_type( + RetTypeOnly( ValueF::from_builtin(dhall_syntax::Builtin::List) - .app(t.into_owned()), - Value::from_const(Type), - )) + .app(t.into_owned()) + .into_value_simple_type(), + ) } SomeLit(x) => { let t = x.get_type()?.into_owned(); @@ -467,10 +467,11 @@ fn type_last_layer( return mkerr(InvalidOptionalType(t)); } - RetTypeOnly(Value::from_valuef_and_type( - ValueF::from_builtin(dhall_syntax::Builtin::Optional).app(t), - Value::from_const(Type), - )) + RetTypeOnly( + Value::from_builtin(dhall_syntax::Builtin::Optional) + .app(t) + .into_value_simple_type(), + ) } RecordType(kts) => RetWhole(tck_record_type( ctx, |