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