diff options
author | Nadrieril | 2019-05-08 17:29:23 +0200 |
---|---|---|
committer | Nadrieril | 2019-05-08 17:29:23 +0200 |
commit | 7aafedae36fe81a64720592f75723b6646913fe2 (patch) | |
tree | 4f2c76ffa6930183023cbe7a4946c589403c3191 /dhall_syntax/src/parser.rs | |
parent | 1ea478858573045e5d3e3f8ccc3773021ea68ffa (diff) |
Rename the record combining operators internally
Diffstat (limited to '')
-rw-r--r-- | dhall_syntax/src/parser.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dhall_syntax/src/parser.rs b/dhall_syntax/src/parser.rs index 83ccc1e..51dbfd2 100644 --- a/dhall_syntax/src/parser.rs +++ b/dhall_syntax/src/parser.rs @@ -762,21 +762,21 @@ make_parser! { rule!(combine_expression<ParsedSubExpr> as expression; children!( [expression(e)] => e, [expression(first), expression(rest)..] => { - let o = crate::BinOp::Combine; + let o = crate::BinOp::RecursiveRecordMerge; rest.fold(first, |acc, e| unspanned(BinOp(o, acc, e))) }, )); rule!(prefer_expression<ParsedSubExpr> as expression; children!( [expression(e)] => e, [expression(first), expression(rest)..] => { - let o = crate::BinOp::Prefer; + let o = crate::BinOp::RightBiasedRecordMerge; rest.fold(first, |acc, e| unspanned(BinOp(o, acc, e))) }, )); rule!(combine_types_expression<ParsedSubExpr> as expression; children!( [expression(e)] => e, [expression(first), expression(rest)..] => { - let o = crate::BinOp::CombineTypes; + let o = crate::BinOp::RecursiveRecordTypeMerge; rest.fold(first, |acc, e| unspanned(BinOp(o, acc, e))) }, )); |