summaryrefslogtreecommitdiff
path: root/dhall
diff options
context:
space:
mode:
Diffstat (limited to '')
m---------dhall-lang0
-rw-r--r--dhall/build.rs13
2 files changed, 13 insertions, 0 deletions
diff --git a/dhall-lang b/dhall-lang
-Subproject 0ee92af46a01a889c6d8d7c72926c959d034b19
+Subproject 89bbf42f9fd3e9e09f0a15aac9a23d309e50b15
diff --git a/dhall/build.rs b/dhall/build.rs
index 2a65f24..7beaa9f 100644
--- a/dhall/build.rs
+++ b/dhall/build.rs
@@ -128,6 +128,8 @@ fn generate_tests() -> std::io::Result<()> {
|| path == "unit/import/urls/emptyPath0"
|| path == "unit/import/urls/emptyPath1"
|| path == "unit/import/urls/emptyPathSegment"
+ // TODO: https://github.com/dhall-lang/dhall-lang/pull/788#issuecomment-568298973
+ || path == "preferMissingNoSpaces"
}),
input_type: FileType::Text,
output_type: Some(FileType::Binary),
@@ -152,6 +154,8 @@ fn generate_tests() -> std::io::Result<()> {
|| path == "unit/import/urls/emptyPath0"
|| path == "unit/import/urls/emptyPath1"
|| path == "unit/import/urls/emptyPathSegment"
+ // TODO: https://github.com/dhall-lang/dhall-lang/pull/788#issuecomment-568298973
+ || path == "preferMissingNoSpaces"
}),
input_type: FileType::Text,
output_type: Some(FileType::Binary),
@@ -174,6 +178,8 @@ fn generate_tests() -> std::io::Result<()> {
|| path == "unit/import/urls/emptyPath0"
|| path == "unit/import/urls/emptyPath1"
|| path == "unit/import/urls/emptyPathSegment"
+ // TODO: https://github.com/dhall-lang/dhall-lang/pull/788#issuecomment-568298973
+ || path == "preferMissingNoSpaces"
}),
input_type: FileType::Text,
output_type: Some(FileType::Binary),
@@ -385,6 +391,7 @@ fn convert_abnf_to_pest() -> std::io::Result<()> {
let mut data = read_to_string(abnf_path)?;
data.push('\n');
+ let data = data.replace('∀', ""); // See https://github.com/duesee/abnf/issues/11
let mut rules = abnf_to_pest::parse_abnf(&data)?;
for line in BufReader::new(File::open(visibility_path)?).lines() {
@@ -401,6 +408,12 @@ fn convert_abnf_to_pest() -> std::io::Result<()> {
rules.remove("url_path");
writeln!(&mut file, "url_path = _{{ path }}")?;
+ rules.remove("missing");
+ writeln!(
+ &mut file,
+ r#"missing = {{ "missing" ~ !simple_label_next_char }}"#
+ )?;
+
rules.remove("simple_label");
writeln!(
&mut file,