diff options
| author | Fintan Halpenny | 2019-09-06 12:43:52 +0200 |
|---|---|---|
| committer | Fintan Halpenny | 2019-09-06 12:43:52 +0200 |
| commit | 4424d3ece5db10527ae446a685a579ae768ef943 (patch) | |
| tree | 688d29c25f12c2c5347e3d24db8b9b7fb83c7b04 /dhall_generated_parser | |
| parent | 52c91e08db68e05f760ebfd465b84fe4107731df (diff) | |
| parent | bcaeab3b7b114d8782be9589ad673ab9ab8c59fd (diff) | |
Merge remote-tracking branch 'origin/master' into fintan/canonicalize
Diffstat (limited to 'dhall_generated_parser')
| -rw-r--r-- | dhall_generated_parser/Cargo.toml | 2 | ||||
| -rw-r--r-- | dhall_generated_parser/src/dhall.pest.visibility | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/dhall_generated_parser/Cargo.toml b/dhall_generated_parser/Cargo.toml index aed54b8..0730f60 100644 --- a/dhall_generated_parser/Cargo.toml +++ b/dhall_generated_parser/Cargo.toml @@ -13,7 +13,7 @@ doctest = false [build-dependencies] abnf_to_pest = { version = "0.1.1", path = "../abnf_to_pest" } pest_generator = "2.1" -quote = "0.6.11" +quote = "1.0.2" [dependencies] pest = "2.1" diff --git a/dhall_generated_parser/src/dhall.pest.visibility b/dhall_generated_parser/src/dhall.pest.visibility index dcebf45..17c1edc 100644 --- a/dhall_generated_parser/src/dhall.pest.visibility +++ b/dhall_generated_parser/src/dhall.pest.visibility @@ -18,7 +18,7 @@ simple_label # quoted_label_char quoted_label -label +# label # nonreserved_label # any_label double_quote_chunk @@ -31,13 +31,13 @@ escaped_quote_pair escaped_interpolation single_quote_char single_quote_literal -interpolation +# interpolation # text_literal if_ # then # else_ # let_ -in_ +# in_ # as_ # using merge @@ -49,9 +49,9 @@ toMap assert # keyword builtin -Optional +# Optional Text -List +# List Location # Bool # True @@ -95,7 +95,7 @@ arrow numeric_double_literal minus_infinity_literal plus_infinity_literal -double_literal +# double_literal natural_literal integer_literal identifier @@ -104,7 +104,7 @@ variable # quoted_path_character unquoted_path_component quoted_path_component -path_component +# path_component path local parent_path @@ -136,7 +136,7 @@ env bash_environment_variable posix_environment_variable posix_environment_variable_character -import_type +# import_type hash import_hashed import @@ -160,7 +160,7 @@ not_equal_expression equivalent_expression application_expression first_application_expression -import_expression +# import_expression selector_expression selector labels |