diff options
| m--------- | dhall-lang | 0 | ||||
| -rw-r--r-- | dhall/tests/parser.rs | 5 | ||||
| -rw-r--r-- | dhall_parser/src/dhall.abnf | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/dhall-lang b/dhall-lang -Subproject 8b9edd288071566eab4d94f643709e1d9ef9e57 +Subproject 55abd1d97a21bab45a533ea8279e28722d380a6 diff --git a/dhall/tests/parser.rs b/dhall/tests/parser.rs index df012d5..fcc2fa9 100644 --- a/dhall/tests/parser.rs +++ b/dhall/tests/parser.rs @@ -51,20 +51,21 @@ parser_success!(spec_parser_success_record, "record"); parser_success!(spec_parser_success_reservedPrefix, "reservedPrefix"); parser_success!(spec_parser_success_singleQuotedString, "singleQuotedString"); parser_success!(spec_parser_success_sort, "sort"); +parser_success!(spec_parser_success_spaceAfterListAppend, "spaceAfterListAppend"); parser_success!(spec_parser_success_template, "template"); parser_success!(spec_parser_success_unicodeComment, "unicodeComment"); parser_success!(spec_parser_success_unicodeDoubleQuotedString, "unicodeDoubleQuotedString"); parser_success!(spec_parser_success_unicodePaths, "unicodePaths"); parser_success!(spec_parser_success_union, "union"); -// parser_success!(spec_parser_success_urls, "urls"); +parser_success!(spec_parser_success_urls, "urls"); parser_success!(spec_parser_success_whitespace, "whitespace"); parser_success!(spec_parser_success_whitespaceBuffet, "whitespaceBuffet"); parser_failure!(spec_parser_failure_annotation, "annotation"); +// parser_failure!(spec_parser_failure_builtins, "builtins"); parser_failure!(spec_parser_failure_doubleBoundsNeg, "doubleBoundsNeg"); parser_failure!(spec_parser_failure_doubleBoundsPos, "doubleBoundsPos"); parser_failure!(spec_parser_failure_importAccess, "importAccess"); parser_failure!(spec_parser_failure_incompleteIf, "incompleteIf"); parser_failure!(spec_parser_failure_mandatoryNewline, "mandatoryNewline"); parser_failure!(spec_parser_failure_missingSpace, "missingSpace"); -// parser_failure!(spec_parser_failure_spaceAfterListAppend, "spaceAfterListAppend"); 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 / "-" / "." / "_" / "~"
|