summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNadrieril2019-12-17 11:51:57 +0000
committerNadrieril2019-12-17 11:51:57 +0000
commit97d5840ef607e9eedb1801c7711684908af82b60 (patch)
treeeaaf2944b94aea32da8842b149d206826a3581df
parent27b054b0465d106fb4b6ba4d6dec16288cbc4e1d (diff)
Move binary encoding/decoding to syntax/
-rw-r--r--dhall/src/semantics/phase/mod.rs2
-rw-r--r--dhall/src/semantics/phase/parse.rs2
-rw-r--r--dhall/src/syntax/binary.rs (renamed from dhall/src/semantics/phase/binary.rs)0
-rw-r--r--dhall/src/syntax/mod.rs1
4 files changed, 3 insertions, 2 deletions
diff --git a/dhall/src/semantics/phase/mod.rs b/dhall/src/semantics/phase/mod.rs
index 0d8fc75..752c257 100644
--- a/dhall/src/semantics/phase/mod.rs
+++ b/dhall/src/semantics/phase/mod.rs
@@ -5,10 +5,10 @@ use crate::semantics::core::value::{ToExprOptions, Value};
use crate::semantics::core::valuef::ValueF;
use crate::semantics::core::var::{AlphaVar, Shift, Subst};
use crate::semantics::error::{EncodeError, Error, ImportError, TypeError};
+use crate::syntax::binary;
use crate::syntax::{Builtin, Const, Expr};
use resolve::ImportRoot;
-pub(crate) mod binary;
pub(crate) mod normalize;
pub(crate) mod parse;
pub(crate) mod resolve;
diff --git a/dhall/src/semantics/phase/parse.rs b/dhall/src/semantics/phase/parse.rs
index 6e8e8bd..4c8ad7b 100644
--- a/dhall/src/semantics/phase/parse.rs
+++ b/dhall/src/semantics/phase/parse.rs
@@ -3,9 +3,9 @@ use std::io::Read;
use std::path::Path;
use crate::semantics::error::Error;
-use crate::semantics::phase::binary;
use crate::semantics::phase::resolve::ImportRoot;
use crate::semantics::phase::Parsed;
+use crate::syntax::binary;
use crate::syntax::parse_expr;
pub(crate) fn parse_file(f: &Path) -> Result<Parsed, Error> {
diff --git a/dhall/src/semantics/phase/binary.rs b/dhall/src/syntax/binary.rs
index 9fe31ad..9fe31ad 100644
--- a/dhall/src/semantics/phase/binary.rs
+++ b/dhall/src/syntax/binary.rs
diff --git a/dhall/src/syntax/mod.rs b/dhall/src/syntax/mod.rs
index 177c4f1..00ef5ed 100644
--- a/dhall/src/syntax/mod.rs
+++ b/dhall/src/syntax/mod.rs
@@ -13,3 +13,4 @@ mod printer;
pub use crate::syntax::printer::*;
mod parser;
pub use crate::syntax::parser::*;
+pub mod binary;