From ee7cb20d4db2ca53b23016f5e73def75bf098d96 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sat, 23 Mar 2019 15:10:43 +0100 Subject: Update dhall-lang submodule --- dhall_parser/src/dhall.abnf | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'dhall_parser/src') diff --git a/dhall_parser/src/dhall.abnf b/dhall_parser/src/dhall.abnf index c5c9a84..51de689 100644 --- a/dhall_parser/src/dhall.abnf +++ b/dhall_parser/src/dhall.abnf @@ -298,7 +298,7 @@ equal = "=" whitespace or = "||" whitespace plus = "+" nonempty-whitespace ; To disambiguate `f +2` text-append = "++" whitespace -list-append = "#" nonempty-whitespace ; To disambiguate `http://a/a#a` +list-append = "#" whitespace and = "&&" whitespace times = "*" whitespace double-equal = "==" whitespace @@ -408,7 +408,7 @@ scheme = %x68.74.74.70 [ %x73 ] ; "http" [ "s" ] ; NOTE: This does not match the official grammar for a URI. Specifically, this ; replaces `path-abempty` with `path` -http-raw = scheme "://" authority path [ "?" query ] [ "#" fragment ] +http-raw = scheme "://" authority path [ "?" query ] ; NOTE: Backtrack if parsing the optional user info prefix fails authority = [ userinfo "@" ] host [ ":" port ] @@ -453,8 +453,6 @@ pchar = unreserved / pct-encoded / sub-delims / ":" / "@" query = *( pchar / "/" / "?" ) -fragment = *( pchar / "/" / "?" ) - pct-encoded = "%" HEXDIG HEXDIG unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~" -- cgit v1.2.3