summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNadrieril2019-03-01 17:28:19 +0100
committerNadrieril2019-03-01 17:28:19 +0100
commite5d9aee00b0c775df1d8e2d8819aeb80dffa73c2 (patch)
treee763a24a0d635048232e72e167ca37eafec69369
parent8a2b7536902831079eddd7b00291b718f5dd7186 (diff)
Split abnf_to_pest and dhall into their own crates
-rw-r--r--.gitignore2
-rw-r--r--Cargo.lock39
-rw-r--r--Cargo.toml24
-rw-r--r--abnf_to_pest/Cargo.toml10
-rw-r--r--abnf_to_pest/src/lib.rs (renamed from build.rs)48
-rw-r--r--dhall/.gitignore1
-rw-r--r--dhall/Cargo.toml18
-rw-r--r--dhall/build.rs39
-rwxr-xr-xdhall/compare.fish (renamed from compare.fish)0
-rw-r--r--dhall/src/context.rs (renamed from src/context.rs)0
-rw-r--r--dhall/src/core.rs (renamed from src/core.rs)0
-rw-r--r--dhall/src/dhall.pest.visibility (renamed from src/dhall.pest.visibility)0
-rw-r--r--dhall/src/errors/AnnotMismatch.txt (renamed from src/errors/AnnotMismatch.txt)0
-rw-r--r--dhall/src/errors/CantTextAppend.txt (renamed from src/errors/CantTextAppend.txt)0
-rw-r--r--dhall/src/errors/DuplicateAlternative.txt (renamed from src/errors/DuplicateAlternative.txt)0
-rw-r--r--dhall/src/errors/FieldCollision.txt (renamed from src/errors/FieldCollision.txt)0
-rw-r--r--dhall/src/errors/HandlerInputTypeMismatch.txt (renamed from src/errors/HandlerInputTypeMismatch.txt)0
-rw-r--r--dhall/src/errors/HandlerNotAFunction.txt (renamed from src/errors/HandlerNotAFunction.txt)0
-rw-r--r--dhall/src/errors/HandlerOutputTypeMismatch.txt (renamed from src/errors/HandlerOutputTypeMismatch.txt)0
-rw-r--r--dhall/src/errors/IfBranchMismatch.txt (renamed from src/errors/IfBranchMismatch.txt)0
-rw-r--r--dhall/src/errors/IfBranchMustBeTerm.txt (renamed from src/errors/IfBranchMustBeTerm.txt)0
-rw-r--r--dhall/src/errors/InvalidAlterantive.txt (renamed from src/errors/InvalidAlterantive.txt)0
-rw-r--r--dhall/src/errors/InvalidAlterantiveType.txt (renamed from src/errors/InvalidAlterantiveType.txt)0
-rw-r--r--dhall/src/errors/InvalidField.txt (renamed from src/errors/InvalidField.txt)0
-rw-r--r--dhall/src/errors/InvalidFieldType.txt (renamed from src/errors/InvalidFieldType.txt)0
-rw-r--r--dhall/src/errors/InvalidInputType.txt (renamed from src/errors/InvalidInputType.txt)0
-rw-r--r--dhall/src/errors/InvalidListElement.txt (renamed from src/errors/InvalidListElement.txt)0
-rw-r--r--dhall/src/errors/InvalidListType.txt (renamed from src/errors/InvalidListType.txt)0
-rw-r--r--dhall/src/errors/InvalidOptionType.txt (renamed from src/errors/InvalidOptionType.txt)0
-rw-r--r--dhall/src/errors/InvalidOptionalElement.txt (renamed from src/errors/InvalidOptionalElement.txt)0
-rw-r--r--dhall/src/errors/InvalidOptionalLiteral.txt (renamed from src/errors/InvalidOptionalLiteral.txt)0
-rw-r--r--dhall/src/errors/InvalidOutputType.txt (renamed from src/errors/InvalidOutputType.txt)0
-rw-r--r--dhall/src/errors/InvalidPredicate.txt (renamed from src/errors/InvalidPredicate.txt)0
-rw-r--r--dhall/src/errors/MissingField.txt (renamed from src/errors/MissingField.txt)0
-rw-r--r--dhall/src/errors/MissingHandler.txt (renamed from src/errors/MissingHandler.txt)0
-rw-r--r--dhall/src/errors/MustCombineARecord.txt (renamed from src/errors/MustCombineARecord.txt)0
-rw-r--r--dhall/src/errors/MustMergeARecord.txt (renamed from src/errors/MustMergeARecord.txt)0
-rw-r--r--dhall/src/errors/MustMergeUnion.txt (renamed from src/errors/MustMergeUnion.txt)0
-rw-r--r--dhall/src/errors/NoDependentLet.txt (renamed from src/errors/NoDependentLet.txt)0
-rw-r--r--dhall/src/errors/NoDependentTypes.txt (renamed from src/errors/NoDependentTypes.txt)0
-rw-r--r--dhall/src/errors/NotAFunction.txt (renamed from src/errors/NotAFunction.txt)0
-rw-r--r--dhall/src/errors/NotARecord.txt (renamed from src/errors/NotARecord.txt)0
-rw-r--r--dhall/src/errors/TypeMismatch.txt (renamed from src/errors/TypeMismatch.txt)0
-rw-r--r--dhall/src/errors/UnboundVariable.txt (renamed from src/errors/UnboundVariable.txt)0
-rw-r--r--dhall/src/errors/Untyped.txt (renamed from src/errors/Untyped.txt)0
-rw-r--r--dhall/src/errors/UnusedHandler.txt (renamed from src/errors/UnusedHandler.txt)0
-rw-r--r--dhall/src/generated_parser.rs (renamed from src/generated_parser.rs)0
-rw-r--r--dhall/src/grammar.lalrpop (renamed from src/grammar.lalrpop)0
-rw-r--r--dhall/src/grammar_util.rs (renamed from src/grammar_util.rs)0
-rw-r--r--dhall/src/lexer.rs (renamed from src/lexer.rs)0
-rw-r--r--dhall/src/lib.rs (renamed from src/lib.rs)0
-rw-r--r--dhall/src/main.rs (renamed from src/main.rs)0
-rw-r--r--dhall/src/parser.rs (renamed from src/parser.rs)0
-rw-r--r--dhall/src/typecheck.rs (renamed from src/typecheck.rs)0
-rw-r--r--dhall/tests/macros.rs (renamed from tests/macros.rs)2
-rw-r--r--dhall/tests/tests.rs (renamed from tests/tests.rs)0
56 files changed, 104 insertions, 79 deletions
diff --git a/.gitignore b/.gitignore
index aa25c81..eb5a316 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-src/grammar.rs
target
-src/dhall.pest
diff --git a/Cargo.lock b/Cargo.lock
index ae09890..2ccf37d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7,6 +7,15 @@ dependencies = [
]
[[package]]
+name = "abnf_to_pest"
+version = "0.1.0"
+dependencies = [
+ "abnf 0.1.1 (git+https://github.com/Nadrieril/abnf)",
+ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pretty 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "aho-corasick"
version = "0.6.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -125,15 +134,13 @@ dependencies = [
name = "dhall"
version = "0.1.0"
dependencies = [
- "abnf 0.1.1 (git+https://github.com/Nadrieril/abnf)",
+ "abnf_to_pest 0.1.0",
"bytecount 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lalrpop 0.16.3 (registry+https://github.com/rust-lang/crates.io-index)",
"lalrpop-util 0.16.3 (registry+https://github.com/rust-lang/crates.io-index)",
"nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"pest 2.1.0 (git+https://github.com/pest-parser/pest)",
"pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "pretty 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"term-painter 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -165,8 +172,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -247,8 +254,8 @@ dependencies = [
"petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"regex-syntax 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
"term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -362,7 +369,7 @@ dependencies = [
"pest_meta 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -569,17 +576,17 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.88"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "serde_derive"
-version = "1.0.88"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -618,7 +625,7 @@ dependencies = [
"new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
"precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -647,7 +654,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "syn"
-version = "0.15.26"
+version = "0.15.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -826,8 +833,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
"checksum regex 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53ee8cfdddb2e0291adfb9f13d31d3bbe0a03c9a402c01b1e24188d86c35b24f"
"checksum regex-syntax 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8c2f35eedad5295fdf00a63d7d4b238135723f92b434ec06774dad15c7ab0861"
-"checksum serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)" = "9f301d728f2b94c9a7691c90f07b0b4e8a4517181d9461be94c04bddeb4bd850"
-"checksum serde_derive 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)" = "beed18e6f5175aef3ba670e57c60ef3b1b74d250d962a26604bff4c80e970dd4"
+"checksum serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)" = "92514fb95f900c9b5126e32d020f5c6d40564c27a5ea6d1d7d9f157a96623560"
+"checksum serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)" = "bb6eabf4b5914e88e24eea240bb7c9f9a2cbc1bbbe8d961d381975ec3c6b806c"
"checksum sha-1 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "51b9d1f3b5de8a167ab06834a7c883bd197f2191e1dda1a22d9ccfeedbf9aded"
"checksum sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d"
"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
@@ -835,7 +842,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1eea1eee654ef80933142157fdad9dd8bc43cf7c74e999e369263496f04ff4da"
"checksum string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc"
"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
-"checksum syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)" = "f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9"
+"checksum syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)" = "525bd55255f03c816e5d7f615587bd13030c7103354fadb104993dcee6a788ec"
"checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1"
"checksum term-painter 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "dcaa948f0e3e38470cd8dc8dcfe561a75c9e43f28075bb183845be2b9b3c08cf"
"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
diff --git a/Cargo.toml b/Cargo.toml
index 9775e6a..9aff88d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,20 +1,6 @@
-[package]
-name = "dhall"
-version = "0.1.0"
-authors = ["NanoTech <nanotech@nanotechcorp.net>"]
-edition = "2018"
-build = "build.rs"
+[workspace]
-[build-dependencies]
-lalrpop = "0.16.3"
-abnf = { git = "https://github.com/Nadrieril/abnf" }
-itertools = "0.8.0"
-pretty = "0.5.2"
-
-[dependencies]
-bytecount = "0.5.1"
-lalrpop-util = "0.16.3"
-nom = "3.0.0"
-term-painter = "0.2.3"
-pest = { git = "https://github.com/pest-parser/pest" }
-pest_derive = "2.0"
+members = [
+ "dhall",
+ "abnf_to_pest"
+]
diff --git a/abnf_to_pest/Cargo.toml b/abnf_to_pest/Cargo.toml
new file mode 100644
index 0000000..bfa6b6d
--- /dev/null
+++ b/abnf_to_pest/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "abnf_to_pest"
+version = "0.1.0"
+authors = ["Nadrieril <nadrieril@users.noreply.github.com>"]
+edition = "2018"
+
+[dependencies]
+abnf = { git = "https://github.com/Nadrieril/abnf" }
+itertools = "0.8.0"
+pretty = "0.5.2"
diff --git a/build.rs b/abnf_to_pest/src/lib.rs
index a418c67..cb7ba99 100644
--- a/build.rs
+++ b/abnf_to_pest/src/lib.rs
@@ -1,20 +1,18 @@
-use std::fs::File;
-use std::io::{Read,Write,BufReader,BufRead};
use std::collections::HashMap;
use itertools::Itertools;
-use lalrpop;
-
-struct PestRuleSettings {
- visible: bool,
- replace: Option<String>,
+pub struct PestRuleSettings {
+ pub visible: bool,
+ pub replace: Option<String>,
}
impl Default for PestRuleSettings {
- fn default() -> Self { PestRuleSettings { visible: true, replace: None } }
+ fn default() -> Self {
+ PestRuleSettings { visible: true, replace: None }
+ }
}
-fn abnf_to_pest(data: &Vec<u8>, rule_settings: &HashMap<String, PestRuleSettings>) -> std::io::Result<String> {
+pub fn abnf_to_pest(data: &Vec<u8>, rule_settings: &HashMap<String, PestRuleSettings>) -> std::io::Result<String> {
use abnf::abnf::*;
use pretty::{Doc, BoxDoc};
fn format_rule(x: Rule, rule_settings: &HashMap<String, PestRuleSettings>) -> Doc<BoxDoc<()>> {
@@ -114,35 +112,3 @@ fn abnf_to_pest(data: &Vec<u8>, rule_settings: &HashMap<String, PestRuleSettings
Ok(format!("{}", doc.pretty(80)))
}
-fn main() -> std::io::Result<()> {
- lalrpop::process_root().unwrap();
- println!("cargo:rerun-if-changed=src/grammar.lalrpop");
-
-
- let abnf_path = "dhall-lang/standard/dhall.abnf";
- let visibility_path = "src/dhall.pest.visibility";
- let pest_path = "src/dhall.pest";
- println!("cargo:rerun-if-changed={}", abnf_path);
- println!("cargo:rerun-if-changed={}", visibility_path);
-
- let mut file = File::open(abnf_path)?;
- let mut data = Vec::new();
- file.read_to_end(&mut data)?;
- data.push('\n' as u8);
-
- let mut rule_settings: HashMap<String, PestRuleSettings> = HashMap::new();
- for line in BufReader::new(File::open(visibility_path)?).lines() {
- let line = line?;
- if line.len() >= 2 && &line[0..2] == "# " {
- rule_settings.insert(line[2..].into(), PestRuleSettings { visible: false, ..Default::default() });
- } else {
- rule_settings.insert(line, PestRuleSettings { visible: true, ..Default::default() });
- }
- }
-
- let mut file = File::create(pest_path)?;
- writeln!(&mut file, "{}", abnf_to_pest(&data, &rule_settings)?)?;
- writeln!(&mut file, "final_expression = _{{ SOI ~ complete_expression ~ EOI }}")?;
-
- Ok(())
-}
diff --git a/dhall/.gitignore b/dhall/.gitignore
new file mode 100644
index 0000000..8a0bac6
--- /dev/null
+++ b/dhall/.gitignore
@@ -0,0 +1 @@
+src/dhall.pest
diff --git a/dhall/Cargo.toml b/dhall/Cargo.toml
new file mode 100644
index 0000000..d55d04e
--- /dev/null
+++ b/dhall/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "dhall"
+version = "0.1.0"
+authors = ["NanoTech <nanotech@nanotechcorp.net>"]
+edition = "2018"
+build = "build.rs"
+
+[build-dependencies]
+lalrpop = "0.16.3"
+abnf_to_pest = { path = "../abnf_to_pest" }
+
+[dependencies]
+bytecount = "0.5.1"
+lalrpop-util = "0.16.3"
+nom = "3.0.0"
+term-painter = "0.2.3"
+pest = { git = "https://github.com/pest-parser/pest" }
+pest_derive = "2.0"
diff --git a/dhall/build.rs b/dhall/build.rs
new file mode 100644
index 0000000..9d5d8f7
--- /dev/null
+++ b/dhall/build.rs
@@ -0,0 +1,39 @@
+use std::fs::File;
+use std::io::{Read,Write,BufReader,BufRead};
+use std::collections::HashMap;
+
+use lalrpop;
+use abnf_to_pest::{PestRuleSettings, abnf_to_pest};
+
+fn main() -> std::io::Result<()> {
+ lalrpop::process_root().unwrap();
+ println!("cargo:rerun-if-changed=src/grammar.lalrpop");
+
+
+ let abnf_path = "../dhall-lang/standard/dhall.abnf";
+ let visibility_path = "src/dhall.pest.visibility";
+ let pest_path = "src/dhall.pest";
+ println!("cargo:rerun-if-changed={}", abnf_path);
+ println!("cargo:rerun-if-changed={}", visibility_path);
+
+ let mut file = File::open(abnf_path)?;
+ let mut data = Vec::new();
+ file.read_to_end(&mut data)?;
+ data.push('\n' as u8);
+
+ let mut rule_settings: HashMap<String, PestRuleSettings> = HashMap::new();
+ for line in BufReader::new(File::open(visibility_path)?).lines() {
+ let line = line?;
+ if line.len() >= 2 && &line[0..2] == "# " {
+ rule_settings.insert(line[2..].into(), PestRuleSettings { visible: false, ..Default::default() });
+ } else {
+ rule_settings.insert(line, PestRuleSettings { visible: true, ..Default::default() });
+ }
+ }
+
+ let mut file = File::create(pest_path)?;
+ writeln!(&mut file, "{}", abnf_to_pest(&data, &rule_settings)?)?;
+ writeln!(&mut file, "final_expression = _{{ SOI ~ complete_expression ~ EOI }}")?;
+
+ Ok(())
+}
diff --git a/compare.fish b/dhall/compare.fish
index 154f06a..154f06a 100755
--- a/compare.fish
+++ b/dhall/compare.fish
diff --git a/src/context.rs b/dhall/src/context.rs
index c2e1913..c2e1913 100644
--- a/src/context.rs
+++ b/dhall/src/context.rs
diff --git a/src/core.rs b/dhall/src/core.rs
index 473a6a6..473a6a6 100644
--- a/src/core.rs
+++ b/dhall/src/core.rs
diff --git a/src/dhall.pest.visibility b/dhall/src/dhall.pest.visibility
index c09fccf..c09fccf 100644
--- a/src/dhall.pest.visibility
+++ b/dhall/src/dhall.pest.visibility
diff --git a/src/errors/AnnotMismatch.txt b/dhall/src/errors/AnnotMismatch.txt
index 4904bf8..4904bf8 100644
--- a/src/errors/AnnotMismatch.txt
+++ b/dhall/src/errors/AnnotMismatch.txt
diff --git a/src/errors/CantTextAppend.txt b/dhall/src/errors/CantTextAppend.txt
index 26b9ceb..26b9ceb 100644
--- a/src/errors/CantTextAppend.txt
+++ b/dhall/src/errors/CantTextAppend.txt
diff --git a/src/errors/DuplicateAlternative.txt b/dhall/src/errors/DuplicateAlternative.txt
index 077f8aa..077f8aa 100644
--- a/src/errors/DuplicateAlternative.txt
+++ b/dhall/src/errors/DuplicateAlternative.txt
diff --git a/src/errors/FieldCollision.txt b/dhall/src/errors/FieldCollision.txt
index 2b2d260..2b2d260 100644
--- a/src/errors/FieldCollision.txt
+++ b/dhall/src/errors/FieldCollision.txt
diff --git a/src/errors/HandlerInputTypeMismatch.txt b/dhall/src/errors/HandlerInputTypeMismatch.txt
index 7d3525b..7d3525b 100644
--- a/src/errors/HandlerInputTypeMismatch.txt
+++ b/dhall/src/errors/HandlerInputTypeMismatch.txt
diff --git a/src/errors/HandlerNotAFunction.txt b/dhall/src/errors/HandlerNotAFunction.txt
index ff87443..ff87443 100644
--- a/src/errors/HandlerNotAFunction.txt
+++ b/dhall/src/errors/HandlerNotAFunction.txt
diff --git a/src/errors/HandlerOutputTypeMismatch.txt b/dhall/src/errors/HandlerOutputTypeMismatch.txt
index f359459..f359459 100644
--- a/src/errors/HandlerOutputTypeMismatch.txt
+++ b/dhall/src/errors/HandlerOutputTypeMismatch.txt
diff --git a/src/errors/IfBranchMismatch.txt b/dhall/src/errors/IfBranchMismatch.txt
index a95b130..a95b130 100644
--- a/src/errors/IfBranchMismatch.txt
+++ b/dhall/src/errors/IfBranchMismatch.txt
diff --git a/src/errors/IfBranchMustBeTerm.txt b/dhall/src/errors/IfBranchMustBeTerm.txt
index 4c15881..4c15881 100644
--- a/src/errors/IfBranchMustBeTerm.txt
+++ b/dhall/src/errors/IfBranchMustBeTerm.txt
diff --git a/src/errors/InvalidAlterantive.txt b/dhall/src/errors/InvalidAlterantive.txt
index 391fc3a..391fc3a 100644
--- a/src/errors/InvalidAlterantive.txt
+++ b/dhall/src/errors/InvalidAlterantive.txt
diff --git a/src/errors/InvalidAlterantiveType.txt b/dhall/src/errors/InvalidAlterantiveType.txt
index f5dadef..f5dadef 100644
--- a/src/errors/InvalidAlterantiveType.txt
+++ b/dhall/src/errors/InvalidAlterantiveType.txt
diff --git a/src/errors/InvalidField.txt b/dhall/src/errors/InvalidField.txt
index bfbf106..bfbf106 100644
--- a/src/errors/InvalidField.txt
+++ b/dhall/src/errors/InvalidField.txt
diff --git a/src/errors/InvalidFieldType.txt b/dhall/src/errors/InvalidFieldType.txt
index 4f76a64..4f76a64 100644
--- a/src/errors/InvalidFieldType.txt
+++ b/dhall/src/errors/InvalidFieldType.txt
diff --git a/src/errors/InvalidInputType.txt b/dhall/src/errors/InvalidInputType.txt
index eabafa4..eabafa4 100644
--- a/src/errors/InvalidInputType.txt
+++ b/dhall/src/errors/InvalidInputType.txt
diff --git a/src/errors/InvalidListElement.txt b/dhall/src/errors/InvalidListElement.txt
index 59db7b7..59db7b7 100644
--- a/src/errors/InvalidListElement.txt
+++ b/dhall/src/errors/InvalidListElement.txt
diff --git a/src/errors/InvalidListType.txt b/dhall/src/errors/InvalidListType.txt
index 676647e..676647e 100644
--- a/src/errors/InvalidListType.txt
+++ b/dhall/src/errors/InvalidListType.txt
diff --git a/src/errors/InvalidOptionType.txt b/dhall/src/errors/InvalidOptionType.txt
index 3bc81de..3bc81de 100644
--- a/src/errors/InvalidOptionType.txt
+++ b/dhall/src/errors/InvalidOptionType.txt
diff --git a/src/errors/InvalidOptionalElement.txt b/dhall/src/errors/InvalidOptionalElement.txt
index 0254220..0254220 100644
--- a/src/errors/InvalidOptionalElement.txt
+++ b/dhall/src/errors/InvalidOptionalElement.txt
diff --git a/src/errors/InvalidOptionalLiteral.txt b/dhall/src/errors/InvalidOptionalLiteral.txt
index 41c0fdc..41c0fdc 100644
--- a/src/errors/InvalidOptionalLiteral.txt
+++ b/dhall/src/errors/InvalidOptionalLiteral.txt
diff --git a/src/errors/InvalidOutputType.txt b/dhall/src/errors/InvalidOutputType.txt
index dd2695d..dd2695d 100644
--- a/src/errors/InvalidOutputType.txt
+++ b/dhall/src/errors/InvalidOutputType.txt
diff --git a/src/errors/InvalidPredicate.txt b/dhall/src/errors/InvalidPredicate.txt
index 4c15881..4c15881 100644
--- a/src/errors/InvalidPredicate.txt
+++ b/dhall/src/errors/InvalidPredicate.txt
diff --git a/src/errors/MissingField.txt b/dhall/src/errors/MissingField.txt
index de14a33..de14a33 100644
--- a/src/errors/MissingField.txt
+++ b/dhall/src/errors/MissingField.txt
diff --git a/src/errors/MissingHandler.txt b/dhall/src/errors/MissingHandler.txt
index 433445e..433445e 100644
--- a/src/errors/MissingHandler.txt
+++ b/dhall/src/errors/MissingHandler.txt
diff --git a/src/errors/MustCombineARecord.txt b/dhall/src/errors/MustCombineARecord.txt
index 141b969..141b969 100644
--- a/src/errors/MustCombineARecord.txt
+++ b/dhall/src/errors/MustCombineARecord.txt
diff --git a/src/errors/MustMergeARecord.txt b/dhall/src/errors/MustMergeARecord.txt
index 79094bd..79094bd 100644
--- a/src/errors/MustMergeARecord.txt
+++ b/dhall/src/errors/MustMergeARecord.txt
diff --git a/src/errors/MustMergeUnion.txt b/dhall/src/errors/MustMergeUnion.txt
index 68df70c..68df70c 100644
--- a/src/errors/MustMergeUnion.txt
+++ b/dhall/src/errors/MustMergeUnion.txt
diff --git a/src/errors/NoDependentLet.txt b/dhall/src/errors/NoDependentLet.txt
index fdc65b4..fdc65b4 100644
--- a/src/errors/NoDependentLet.txt
+++ b/dhall/src/errors/NoDependentLet.txt
diff --git a/src/errors/NoDependentTypes.txt b/dhall/src/errors/NoDependentTypes.txt
index 435bdcb..435bdcb 100644
--- a/src/errors/NoDependentTypes.txt
+++ b/dhall/src/errors/NoDependentTypes.txt
diff --git a/src/errors/NotAFunction.txt b/dhall/src/errors/NotAFunction.txt
index dd2695d..dd2695d 100644
--- a/src/errors/NotAFunction.txt
+++ b/dhall/src/errors/NotAFunction.txt
diff --git a/src/errors/NotARecord.txt b/dhall/src/errors/NotARecord.txt
index e0eebc8..e0eebc8 100644
--- a/src/errors/NotARecord.txt
+++ b/dhall/src/errors/NotARecord.txt
diff --git a/src/errors/TypeMismatch.txt b/dhall/src/errors/TypeMismatch.txt
index 4904bf8..4904bf8 100644
--- a/src/errors/TypeMismatch.txt
+++ b/dhall/src/errors/TypeMismatch.txt
diff --git a/src/errors/UnboundVariable.txt b/dhall/src/errors/UnboundVariable.txt
index bd7d483..bd7d483 100644
--- a/src/errors/UnboundVariable.txt
+++ b/dhall/src/errors/UnboundVariable.txt
diff --git a/src/errors/Untyped.txt b/dhall/src/errors/Untyped.txt
index 4904bf8..4904bf8 100644
--- a/src/errors/Untyped.txt
+++ b/dhall/src/errors/Untyped.txt
diff --git a/src/errors/UnusedHandler.txt b/dhall/src/errors/UnusedHandler.txt
index 2e46a12..2e46a12 100644
--- a/src/errors/UnusedHandler.txt
+++ b/dhall/src/errors/UnusedHandler.txt
diff --git a/src/generated_parser.rs b/dhall/src/generated_parser.rs
index 452b4cd..452b4cd 100644
--- a/src/generated_parser.rs
+++ b/dhall/src/generated_parser.rs
diff --git a/src/grammar.lalrpop b/dhall/src/grammar.lalrpop
index 150961f..150961f 100644
--- a/src/grammar.lalrpop
+++ b/dhall/src/grammar.lalrpop
diff --git a/src/grammar_util.rs b/dhall/src/grammar_util.rs
index c546a13..c546a13 100644
--- a/src/grammar_util.rs
+++ b/dhall/src/grammar_util.rs
diff --git a/src/lexer.rs b/dhall/src/lexer.rs
index 5b4dcaa..5b4dcaa 100644
--- a/src/lexer.rs
+++ b/dhall/src/lexer.rs
diff --git a/src/lib.rs b/dhall/src/lib.rs
index e07071d..e07071d 100644
--- a/src/lib.rs
+++ b/dhall/src/lib.rs
diff --git a/src/main.rs b/dhall/src/main.rs
index cdab3c0..cdab3c0 100644
--- a/src/main.rs
+++ b/dhall/src/main.rs
diff --git a/src/parser.rs b/dhall/src/parser.rs
index 057fce2..057fce2 100644
--- a/src/parser.rs
+++ b/dhall/src/parser.rs
diff --git a/src/typecheck.rs b/dhall/src/typecheck.rs
index 62ff7d2..62ff7d2 100644
--- a/src/typecheck.rs
+++ b/dhall/src/typecheck.rs
diff --git a/tests/macros.rs b/dhall/tests/macros.rs
index 4b6d0d7..5ad2ab3 100644
--- a/tests/macros.rs
+++ b/dhall/tests/macros.rs
@@ -1,6 +1,6 @@
#[macro_export]
macro_rules! include_test_str {
- ($x:expr) => { include_str!(concat!("../dhall-lang/tests/", $x, ".dhall")) };
+ ($x:expr) => { include_str!(concat!("../../dhall-lang/tests/", $x, ".dhall")) };
}
#[macro_export]
diff --git a/tests/tests.rs b/dhall/tests/tests.rs
index 6a2ada8..6a2ada8 100644
--- a/tests/tests.rs
+++ b/dhall/tests/tests.rs