aboutsummaryrefslogtreecommitdiff
path: root/src/grammar/expressions
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2018-08-05 16:18:02 +0100
committerAleksey Kladov <[email protected]>2018-08-05 16:18:02 +0100
commitd44169ab1e2897a90f8aa7d7672d2fe318cceb27 (patch)
treed8e52bfeeda6fcd3d2cbc0624c4f188449c32543 /src/grammar/expressions
parent720861bcff4b9f67ca4def66e2996015811fa90b (diff)
ampersand -> amp
Diffstat (limited to 'src/grammar/expressions')
-rw-r--r--src/grammar/expressions/mod.rs8
1 files changed, 4 insertions, 4 deletions
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) {
68 if p.at_compound2(PIPE, PIPE) { 68 if p.at_compound2(PIPE, PIPE) {
69 return (3, Op::Composite(PIPEPIPE, 2)); 69 return (3, Op::Composite(PIPEPIPE, 2));
70 } 70 }
71 if p.at_compound2(AMPERSAND, AMPERSAND) { 71 if p.at_compound2(AMP, AMP) {
72 return (4, Op::Composite(AMPERSANDAMPERSAND, 2)); 72 return (4, Op::Composite(AMPAMP, 2));
73 } 73 }
74 if p.at_compound2(L_ANGLE, EQ) { 74 if p.at_compound2(L_ANGLE, EQ) {
75 return (5, Op::Composite(LTEQ, 2)); 75 return (5, Op::Composite(LTEQ, 2));
@@ -113,7 +113,7 @@ fn expr_bp(p: &mut Parser, r: Restrictions, bp: u8) {
113 113
114const UNARY_EXPR_FIRST: TokenSet = 114const UNARY_EXPR_FIRST: TokenSet =
115 token_set_union![ 115 token_set_union![
116 token_set![AMPERSAND, STAR, EXCL], 116 token_set![AMP, STAR, EXCL],
117 atom::ATOM_EXPR_FIRST, 117 atom::ATOM_EXPR_FIRST,
118 ]; 118 ];
119 119
@@ -125,7 +125,7 @@ fn lhs(p: &mut Parser, r: Restrictions) -> Option<CompletedMarker> {
125 // let _ = &1; 125 // let _ = &1;
126 // let _ = &mut &f(); 126 // let _ = &mut &f();
127 // } 127 // }
128 AMPERSAND => { 128 AMP => {
129 m = p.start(); 129 m = p.start();
130 p.bump(); 130 p.bump();
131 p.eat(MUT_KW); 131 p.eat(MUT_KW);