From 170eebd7001153a849fbf84c52767240a33c4538 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Thu, 4 Apr 2019 16:03:10 +0200 Subject: Rename whitespace rules --- dhall_parser/src/dhall.pest.visibility | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'dhall_parser/src/dhall.pest.visibility') diff --git a/dhall_parser/src/dhall.pest.visibility b/dhall_parser/src/dhall.pest.visibility index ee5ea2b..e95cd32 100644 --- a/dhall_parser/src/dhall.pest.visibility +++ b/dhall_parser/src/dhall.pest.visibility @@ -7,9 +7,8 @@ end_of_line # not_end_of_line # line_comment # whitespace_chunk -# whitespace -# whitespace_ -# nonempty_whitespace +# whsp +# whsp1 # ALPHA # DIGIT # HEXDIG -- cgit v1.2.3 From a342f45f820e28638e4a73a7b3a577ebf2396b0d Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Thu, 4 Apr 2019 18:48:42 +0200 Subject: Factor back in some rule branches --- dhall_parser/src/dhall.pest.visibility | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'dhall_parser/src/dhall.pest.visibility') diff --git a/dhall_parser/src/dhall.pest.visibility b/dhall_parser/src/dhall.pest.visibility index e95cd32..ac3ea30 100644 --- a/dhall_parser/src/dhall.pest.visibility +++ b/dhall_parser/src/dhall.pest.visibility @@ -34,16 +34,15 @@ single_quote_literal # in # as # using -# merge missing -# if_ +if_ # then # else_ # let_ -# in_ +in_ # as_ # using -# merge +merge # Infinity Optional Text @@ -78,9 +77,9 @@ List # combine # combine_types # prefer -# lambda -# forall -# arrow +lambda +forall +arrow # exponent double_literal natural_literal @@ -120,14 +119,7 @@ import_type hash import_hashed import -# expression -lambda_expression -ifthenelse_expression -let_expression -forall_expression -arrow_expression -merge_expression -# empty_list_or_optional +expression empty_collection non_empty_optional annotated_expression -- cgit v1.2.3 From e05299d3d84dcbba79887f1dc5b42d689b714edc Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Thu, 4 Apr 2019 20:07:51 +0200 Subject: Factor literal-expression back in --- dhall_parser/src/dhall.pest.visibility | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'dhall_parser/src/dhall.pest.visibility') diff --git a/dhall_parser/src/dhall.pest.visibility b/dhall_parser/src/dhall.pest.visibility index ac3ea30..63a4179 100644 --- a/dhall_parser/src/dhall.pest.visibility +++ b/dhall_parser/src/dhall.pest.visibility @@ -142,8 +142,7 @@ application_expression selector_expression selector labels -# primitive_expression -literal_expression +primitive_expression # record_type_or_literal empty_record_literal empty_record_type -- cgit v1.2.3 From 3e4b2dcb8c371045737901c0d49f9d9403109ea0 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Thu, 4 Apr 2019 21:43:41 +0200 Subject: Get keyword rule from upstream --- dhall_parser/src/dhall.pest.visibility | 1 + 1 file changed, 1 insertion(+) (limited to 'dhall_parser/src/dhall.pest.visibility') diff --git a/dhall_parser/src/dhall.pest.visibility b/dhall_parser/src/dhall.pest.visibility index 63a4179..8205cc8 100644 --- a/dhall_parser/src/dhall.pest.visibility +++ b/dhall_parser/src/dhall.pest.visibility @@ -44,6 +44,7 @@ in_ # using merge # Infinity +# keyword Optional Text List -- cgit v1.2.3 From af968c9e72ef5c2ea1ee965776879d9c903bd1aa Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Thu, 4 Apr 2019 22:32:04 +0200 Subject: Revert end_of_line handling to upstream --- dhall_parser/src/dhall.pest.visibility | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'dhall_parser/src/dhall.pest.visibility') diff --git a/dhall_parser/src/dhall.pest.visibility b/dhall_parser/src/dhall.pest.visibility index 8205cc8..d02298e 100644 --- a/dhall_parser/src/dhall.pest.visibility +++ b/dhall_parser/src/dhall.pest.visibility @@ -1,5 +1,4 @@ -end_of_line -# end_of_line_silent +# end_of_line # tab # block_comment # block_comment_chunk -- cgit v1.2.3 From 74eb88c42d938672137771fab33ef0118903b5e1 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Thu, 4 Apr 2019 22:46:27 +0200 Subject: Regen visibility list --- dhall_parser/src/dhall.pest.visibility | 66 +++++++++++++--------------------- 1 file changed, 25 insertions(+), 41 deletions(-) (limited to 'dhall_parser/src/dhall.pest.visibility') diff --git a/dhall_parser/src/dhall.pest.visibility b/dhall_parser/src/dhall.pest.visibility index d02298e..f881a50 100644 --- a/dhall_parser/src/dhall.pest.visibility +++ b/dhall_parser/src/dhall.pest.visibility @@ -12,28 +12,24 @@ # DIGIT # HEXDIG # simple_label_first_char -# simple_label_next_other_char # simple_label_next_char -# simple_label_start simple_label # quoted_label_char quoted_label label +nonreserved_label # any_label double_quote_chunk double_quote_escaped +double_quote_char double_quote_literal single_quote_continue +escaped_quote_pair +escaped_interpolation +single_quote_char single_quote_literal +interpolation # text_literal -# if -# then -# else -# let -# in -# as -# using -missing if_ # then # else_ @@ -42,38 +38,14 @@ in_ # as_ # using merge +missing # Infinity +NaN +Some # keyword Optional Text List -# equal -# or -# plus -# text_append -# list_append -# and -# times -# double_equal -# not_equal -# dot -# bar -# comma -# at -# colon -# import_alt -# open_parens -# close_parens -# close_parens -# open_brace -# close_brace -# close_brace -# open_bracket -# close_bracket -# close_bracket -# open_angle -# close_angle -# close_angle # combine # combine_types # prefer @@ -81,15 +53,24 @@ lambda forall arrow # exponent +numeric_double_literal +minus_infinity_literal +plus_infinity_literal double_literal natural_literal integer_literal identifier # path_character # quoted_path_character +unquoted_path_component +quoted_path_component path_component path # local +parent_path +here_path +home_path +absolute_path scheme http_raw authority @@ -106,7 +87,6 @@ authority # reg_name # pchar query -fragment # pct_encoded # unreserved # sub_delims @@ -120,9 +100,10 @@ hash import_hashed import expression +annotated_expression +let_binding empty_collection non_empty_optional -annotated_expression # operator_expression import_alt_expression or_expression @@ -137,7 +118,6 @@ times_expression equal_expression not_equal_expression application_expression -# atomic_expression # import_expression selector_expression selector @@ -148,10 +128,14 @@ empty_record_literal empty_record_type non_empty_record_type_or_literal non_empty_record_type +record_type_entry non_empty_record_literal +record_literal_entry union_type_or_literal empty_union_type non_empty_union_type_or_literal +union_literal_variant_value +union_type_entry +union_type_or_literal_variant_type non_empty_list_literal -# parenthesized_expression # complete_expression -- cgit v1.2.3