From 5f52c5bda0277edd87323eb67dcda721cd18a9d3 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Tue, 24 Dec 2019 20:23:19 +0000
Subject: Extend merge to work on Optionals

---
 dhall/build.rs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'dhall/build.rs')

diff --git a/dhall/build.rs b/dhall/build.rs
index 981e558..3d4a2eb 100644
--- a/dhall/build.rs
+++ b/dhall/build.rs
@@ -128,7 +128,7 @@ 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
+                    // TODO: waiting for https://github.com/dhall-lang/dhall-lang/pull/871
                     || path == "preferMissingNoSpaces"
             }),
             input_type: FileType::Text,
@@ -154,7 +154,7 @@ 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
+                    // TODO: waiting for https://github.com/dhall-lang/dhall-lang/pull/871
                     || path == "preferMissingNoSpaces"
             }),
             input_type: FileType::Text,
@@ -178,7 +178,7 @@ 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
+                    // TODO: waiting for https://github.com/dhall-lang/dhall-lang/pull/871
                     || path == "preferMissingNoSpaces"
             }),
             input_type: FileType::Text,
@@ -282,6 +282,9 @@ fn generate_tests() -> std::io::Result<()> {
                     // TODO: record completion
                     || path == "simple/completion"
                     || path == "unit/Completion"
+                    // TODO: waiting for https://github.com/dhall-lang/dhall-lang/pull/871
+                    || path == "unit/MergeNone"
+                    || path == "unit/MergeSome"
             }),
             input_type: FileType::Text,
             output_type: Some(FileType::Text),
@@ -317,6 +320,9 @@ fn generate_tests() -> std::io::Result<()> {
                     // TODO: record completion
                     || path == "simple/completion"
                     || path == "unit/Completion"
+                    // TODO: waiting for https://github.com/dhall-lang/dhall-lang/pull/871
+                    || path == "unit/MergeNone"
+                    || path == "unit/MergeSome"
             }),
             input_type: FileType::Text,
             output_type: Some(FileType::Text),
@@ -423,6 +429,10 @@ fn convert_abnf_to_pest() -> std::io::Result<()> {
 
     // Prefer my nice error message to illegible parse errors.
     rules.remove("unicode_escape");
+    rules.remove("unbraced_escape");
+    rules.remove("braced_escape");
+    rules.remove("braced_codepoint");
+    rules.remove("unicode_suffix");
     writeln!(
         &mut file,
         r#"unicode_escape = _{{ HEXDIG{{4}} | "{{" ~ HEXDIG+ ~ "}}" }}"#
-- 
cgit v1.2.3