diff options
author | Nadrieril | 2020-01-30 17:01:36 +0000 |
---|---|---|
committer | Nadrieril | 2020-01-30 17:01:36 +0000 |
commit | 0c95dd4f940e796865976dad594068ae0fff8f7c (patch) | |
tree | 54ae39155916be24cffabaa917f006fc5d044422 /dhall/src/semantics/core | |
parent | 67bbbafbc9730d74e20e5ac082ae9a87bdf2234e (diff) |
Move Value-related stuff under semantics::nze
Diffstat (limited to '')
-rw-r--r-- | dhall/src/semantics/core/context.rs | 1 | ||||
-rw-r--r-- | dhall/src/semantics/core/mod.rs | 6 | ||||
-rw-r--r-- | dhall/src/semantics/nze/value.rs (renamed from dhall/src/semantics/core/value.rs) | 4 | ||||
-rw-r--r-- | dhall/src/semantics/nze/var.rs (renamed from dhall/src/semantics/core/var.rs) | 0 | ||||
-rw-r--r-- | dhall/src/semantics/nze/visitor.rs (renamed from dhall/src/semantics/core/visitor.rs) | 0 |
5 files changed, 2 insertions, 9 deletions
diff --git a/dhall/src/semantics/core/context.rs b/dhall/src/semantics/core/context.rs deleted file mode 100644 index 8b13789..0000000 --- a/dhall/src/semantics/core/context.rs +++ /dev/null @@ -1 +0,0 @@ - diff --git a/dhall/src/semantics/core/mod.rs b/dhall/src/semantics/core/mod.rs deleted file mode 100644 index 6f577f0..0000000 --- a/dhall/src/semantics/core/mod.rs +++ /dev/null @@ -1,6 +0,0 @@ -pub mod context; -pub mod value; -pub mod var; -pub mod visitor; -pub(crate) use value::*; -pub(crate) use var::*; diff --git a/dhall/src/semantics/core/value.rs b/dhall/src/semantics/nze/value.rs index c881a9a..4960076 100644 --- a/dhall/src/semantics/core/value.rs +++ b/dhall/src/semantics/nze/value.rs @@ -3,11 +3,12 @@ use std::collections::HashMap; use std::rc::Rc; use crate::error::{TypeError, TypeMessage}; -use crate::semantics::core::var::Binder; +use crate::semantics::nze::visitor; use crate::semantics::phase::normalize::{ apply_any, normalize_tyexpr_whnf, normalize_whnf, }; use crate::semantics::phase::{Normalized, NormalizedExpr, ToExprOptions}; +use crate::semantics::Binder; use crate::semantics::{type_of_builtin, typecheck, TyExpr, TyExprKind}; use crate::semantics::{BuiltinClosure, NzEnv, NzVar, VarEnv}; use crate::syntax::{ @@ -546,7 +547,6 @@ impl<V> ValueKind<V> { &'a V, ) -> Result<V2, E>, ) -> Result<ValueKind<V2>, E> { - use crate::semantics::visitor; use visitor::ValueKindVisitor; visitor::TraverseRefWithBindersVisitor { visit_val, diff --git a/dhall/src/semantics/core/var.rs b/dhall/src/semantics/nze/var.rs index 264b81d..264b81d 100644 --- a/dhall/src/semantics/core/var.rs +++ b/dhall/src/semantics/nze/var.rs diff --git a/dhall/src/semantics/core/visitor.rs b/dhall/src/semantics/nze/visitor.rs index d1a85d8..d1a85d8 100644 --- a/dhall/src/semantics/core/visitor.rs +++ b/dhall/src/semantics/nze/visitor.rs |