summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNadrieril2020-01-30 17:16:25 +0000
committerNadrieril2020-01-30 17:16:25 +0000
commit8ff022fa2cec34bc1d46ac3655d0c3d228ef893c (patch)
tree1580d703d6ba21d97fafed4d84a5f934ffb9daf7
parent0a60a4a891cd8c527ecc3caf6502bd614118d59a (diff)
Move parse and resolve up a level
Diffstat (limited to '')
-rw-r--r--dhall/src/error/mod.rs2
-rw-r--r--dhall/src/lib.rs6
-rw-r--r--dhall/src/semantics/mod.rs3
-rw-r--r--dhall/src/semantics/parse.rs (renamed from dhall/src/semantics/phase/parse.rs)2
-rw-r--r--dhall/src/semantics/phase/mod.rs2
-rw-r--r--dhall/src/semantics/resolve.rs (renamed from dhall/src/semantics/phase/resolve.rs)0
6 files changed, 7 insertions, 8 deletions
diff --git a/dhall/src/error/mod.rs b/dhall/src/error/mod.rs
index 8991758..4df018d 100644
--- a/dhall/src/error/mod.rs
+++ b/dhall/src/error/mod.rs
@@ -1,6 +1,6 @@
use std::io::Error as IOError;
-use crate::semantics::phase::resolve::ImportStack;
+use crate::semantics::resolve::ImportStack;
use crate::semantics::Value;
use crate::syntax::{Import, ParseError};
use crate::NormalizedExpr;
diff --git a/dhall/src/lib.rs b/dhall/src/lib.rs
index cbf3ceb..e9f8aa3 100644
--- a/dhall/src/lib.rs
+++ b/dhall/src/lib.rs
@@ -21,9 +21,9 @@ use std::fmt::Display;
use std::path::Path;
use crate::error::{EncodeError, Error, ImportError, TypeError};
-use crate::semantics::phase::parse;
-use crate::semantics::phase::resolve;
-use crate::semantics::phase::resolve::ImportRoot;
+use crate::semantics::parse;
+use crate::semantics::resolve;
+use crate::semantics::resolve::ImportRoot;
use crate::semantics::{typecheck, typecheck_with, TyExpr, Value, ValueKind};
use crate::syntax::binary;
use crate::syntax::{Builtin, Const, Expr};
diff --git a/dhall/src/semantics/mod.rs b/dhall/src/semantics/mod.rs
index 92e5912..98fdf5a 100644
--- a/dhall/src/semantics/mod.rs
+++ b/dhall/src/semantics/mod.rs
@@ -1,6 +1,7 @@
pub mod builtins;
pub mod nze;
-pub mod phase;
+pub mod parse;
+pub mod resolve;
pub mod tck;
pub(crate) use self::builtins::*;
pub(crate) use self::nze::*;
diff --git a/dhall/src/semantics/phase/parse.rs b/dhall/src/semantics/parse.rs
index b72fe7f..ee35536 100644
--- a/dhall/src/semantics/phase/parse.rs
+++ b/dhall/src/semantics/parse.rs
@@ -3,7 +3,7 @@ use std::io::Read;
use std::path::Path;
use crate::error::Error;
-use crate::semantics::phase::resolve::ImportRoot;
+use crate::semantics::resolve::ImportRoot;
use crate::syntax::binary;
use crate::syntax::parse_expr;
use crate::Parsed;
diff --git a/dhall/src/semantics/phase/mod.rs b/dhall/src/semantics/phase/mod.rs
deleted file mode 100644
index 02e2b18..0000000
--- a/dhall/src/semantics/phase/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub(crate) mod parse;
-pub(crate) mod resolve;
diff --git a/dhall/src/semantics/phase/resolve.rs b/dhall/src/semantics/resolve.rs
index 3acf114..3acf114 100644
--- a/dhall/src/semantics/phase/resolve.rs
+++ b/dhall/src/semantics/resolve.rs