summaryrefslogtreecommitdiff
path: root/dhall_syntax/src/parser.rs
diff options
context:
space:
mode:
authorNadrieril2019-08-04 11:11:37 +0200
committerNadrieril2019-08-06 21:40:24 +0200
commit711164a7a24ab832006b72cac162e78cf434861a (patch)
treecdb2097aa25e20c2953cd5d0192ce66274def33b /dhall_syntax/src/parser.rs
parentcc03ada4e713f145f2eb1bbf0f131a4c5746cf74 (diff)
Remove old-style optional literals
Diffstat (limited to '')
-rw-r--r--dhall_syntax/src/parser.rs18
1 files changed, 3 insertions, 15 deletions
diff --git a/dhall_syntax/src/parser.rs b/dhall_syntax/src/parser.rs
index 9d9a374..db1699b 100644
--- a/dhall_syntax/src/parser.rs
+++ b/dhall_syntax/src/parser.rs
@@ -724,6 +724,9 @@ make_parser! {
[merge(()), expression(x), expression(y), expression(z)] => {
spanned(span, Merge(x, y, Some(z)))
},
+ [List(()), expression(x)] => {
+ spanned(span, EmptyListLit(x))
+ },
[expression(e)] => e,
));
@@ -738,21 +741,6 @@ make_parser! {
token_rule!(List<()>);
token_rule!(Optional<()>);
- rule!(empty_collection<ParsedSubExpr> as expression; span; children!(
- [List(_), expression(t)] => {
- spanned(span, EmptyListLit(t))
- },
- [Optional(_), expression(t)] => {
- spanned(span, OldOptionalLit(None, t))
- },
- ));
-
- rule!(non_empty_optional<ParsedSubExpr> as expression; span; children!(
- [expression(x), Optional(_), expression(t)] => {
- spanned(span, OldOptionalLit(Some(x), t))
- }
- ));
-
rule!(import_alt_expression<ParsedSubExpr> as expression; children!(
[expression(e)] => e,
[expression(first), expression(rest)..] => {