From d44169ab1e2897a90f8aa7d7672d2fe318cceb27 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sun, 5 Aug 2018 18:18:02 +0300 Subject: ampersand -> amp --- src/grammar/expressions/mod.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/grammar/expressions') diff --git a/src/grammar/expressions/mod.rs b/src/grammar/expressions/mod.rs index 18e3f5798..e0b4ced74 100644 --- a/src/grammar/expressions/mod.rs +++ b/src/grammar/expressions/mod.rs @@ -68,8 +68,8 @@ fn current_op(p: &Parser) -> (u8, Op) { if p.at_compound2(PIPE, PIPE) { return (3, Op::Composite(PIPEPIPE, 2)); } - if p.at_compound2(AMPERSAND, AMPERSAND) { - return (4, Op::Composite(AMPERSANDAMPERSAND, 2)); + if p.at_compound2(AMP, AMP) { + return (4, Op::Composite(AMPAMP, 2)); } if p.at_compound2(L_ANGLE, EQ) { return (5, Op::Composite(LTEQ, 2)); @@ -113,7 +113,7 @@ fn expr_bp(p: &mut Parser, r: Restrictions, bp: u8) { const UNARY_EXPR_FIRST: TokenSet = token_set_union![ - token_set![AMPERSAND, STAR, EXCL], + token_set![AMP, STAR, EXCL], atom::ATOM_EXPR_FIRST, ]; @@ -125,7 +125,7 @@ fn lhs(p: &mut Parser, r: Restrictions) -> Option { // let _ = &1; // let _ = &mut &f(); // } - AMPERSAND => { + AMP => { m = p.start(); p.bump(); p.eat(MUT_KW); -- cgit v1.2.3