diff options
| author | Nadrieril | 2020-03-12 18:13:44 +0000 |
|---|---|---|
| committer | Nadrieril | 2020-03-12 18:13:44 +0000 |
| commit | bff6c3e82ef177c683bd69e39396285e567bd38b (patch) | |
| tree | b9ebf5440aefb83892f1ccf4beb408664094809f /dhall | |
| parent | 66972b05e5996132a83332ef0c6879c3a1679dc7 (diff) | |
Upstream the `with` grammar tweak
Diffstat (limited to 'dhall')
| -rw-r--r-- | dhall/build.rs | 13 | ||||
| -rw-r--r-- | dhall/tests/parser/failure/spacing/MergeNoSpace2.txt | 2 | ||||
| -rw-r--r-- | dhall/tests/parser/failure/spacing/RecordTypeNoSpace.txt | 2 |
3 files changed, 2 insertions, 15 deletions
diff --git a/dhall/build.rs b/dhall/build.rs index 6a0a3bf..ce677e3 100644 --- a/dhall/build.rs +++ b/dhall/build.rs @@ -374,19 +374,6 @@ fn convert_abnf_to_pest() -> std::io::Result<()> { rules.remove("url_path"); writeln!(&mut file, "url_path = _{{ path }}")?; - // TODO: upstream this tweak - rules.remove("with_expression"); - writeln!( - &mut file, - r#" - with_expression = {{ application_expression ~ (whsp1 ~ with ~ whsp1 ~ with_clause)* }} - with_clause = {{ - any_label_or_some ~ (whsp ~ "." ~ whsp ~ any_label_or_some)* - ~ whsp ~ "=" ~ whsp ~ application_expression - }} - "# - )?; - // Work around some greediness issue in the grammar. rules.remove("missing"); writeln!( diff --git a/dhall/tests/parser/failure/spacing/MergeNoSpace2.txt b/dhall/tests/parser/failure/spacing/MergeNoSpace2.txt index 307d873..96d937b 100644 --- a/dhall/tests/parser/failure/spacing/MergeNoSpace2.txt +++ b/dhall/tests/parser/failure/spacing/MergeNoSpace2.txt @@ -3,4 +3,4 @@ 1 | merge x(y)␊ | ^--- | - = expected missing, double_quote_literal, single_quote_literal, if_, merge, NaN, Some_, toMap, assert, forall, numeric_double_literal, minus_infinity_literal, plus_infinity_literal, natural_literal, integer_literal, import_hashed, or non_empty_list_literal + = expected missing, double_quote_literal, single_quote_literal, if_, merge, non_empty_list_literal, NaN, Some_, toMap, assert, forall, numeric_double_literal, minus_infinity_literal, plus_infinity_literal, natural_literal, integer_literal, or import_hashed diff --git a/dhall/tests/parser/failure/spacing/RecordTypeNoSpace.txt b/dhall/tests/parser/failure/spacing/RecordTypeNoSpace.txt index b08c143..0e1a879 100644 --- a/dhall/tests/parser/failure/spacing/RecordTypeNoSpace.txt +++ b/dhall/tests/parser/failure/spacing/RecordTypeNoSpace.txt @@ -3,4 +3,4 @@ 1 | { x :T }␊ | ^--- | - = expected missing, if_, merge, NaN, Some_, toMap, assert, forall, record_type_entry, or empty_record_literal + = expected missing, if_, merge, NaN, Some_, toMap, assert, forall, empty_record_literal, or record_type_entry |