RFC3986 URLs

2 files changed, 7 insertions, 0 deletions

diff --git a/dhall_generated_parser/build.rs b/dhall_generated_parser/build.rs
index 744cb3d..2c1a8f5 100644
--- a/dhall_generated_parser/build.rs
+++ b/dhall_generated_parser/build.rs
@@ -27,6 +27,7 @@ fn main() -> std::io::Result<()> {
         }
     }
     rules.remove("http");
+    rules.remove("url_path");
     rules.remove("simple_label");
     rules.remove("nonreserved_label");
 
@@ -53,6 +54,11 @@ fn main() -> std::io::Result<()> {
                 ~ (import_hashed | ^\"(\" ~ whsp ~ import_hashed ~ whsp ~ ^\")\"))?
     }}"
     )?;
+    // TODO: this is a cheat; properly support RFC3986 URLs instead
+    writeln!(
+        &mut file,
+        "url_path = _{{ path }}"
+    )?;
     writeln!(
         &mut file,
         "nonreserved_label = _{{
diff --git a/dhall_generated_parser/src/dhall.pest.visibility b/dhall_generated_parser/src/dhall.pest.visibility
index 2b7c477..97d3a69 100644
--- a/dhall_generated_parser/src/dhall.pest.visibility
+++ b/dhall_generated_parser/src/dhall.pest.visibility
@@ -48,6 +48,7 @@ builtin
 Optional
 Text
 List
+Location
 # Bool
 # True
 # False