(LEX): lex `&&` and `&` separately

closes #454
intellij-rust · Jun 14, 2016 · ba9191ef02855ced88dfeacfd966faad9033c0ea · mkaput · Jun 14, 2016 · bgourlie
1 parent fa1c226
commit ba9191ef02855ced88dfeacfd966faad9033c0ea
diff --git a/src/main/kotlin/org/rust/lang/core/grammar/rust.bnf b/src/main/kotlin/org/rust/lang/core/grammar/rust.bnf
@@ -346,7 +346,7 @@ self_argument ::= [ '&' LIFETIME? ] MUT? SELF type_ascription?
 private restricted_pat ::= &( IDENTIFIER
                            | '_'
                            | '&' (IDENTIFIER | '_')
-  
-                            | '&&' (IDENTIFIER | '_')
+  
+                            | '&' '&' (IDENTIFIER | '_')
                            | MUT IDENTIFIER
                            ) pat
@@ -434,7 +434,6 @@ private pats ::= <<comma_separated_list pat>>
 private pat_vec_elts ::= pats? [ '..' [ ',' pats ] ]
 pat_reg ::= '&' MUT? pat
-  
-          | '&&' pat
 pat_wild ::= '_'
 pat_binding ::= binding_mode? IDENTIFIER !'...' !'::'
@@ -707,7 +706,7 @@ vec_type ::= '[' type [';' any_expr] ']'
 ptr_type ::= '*' [ MUT | CONST ] type
-  
-ref_type ::= ( '&' | '&&' ) [ LIFETIME? MUT? ] type
+  
+ref_type ::= '&' [ LIFETIME? MUT? ] type
 bare_fn_type ::= [ UNSAFE? extern_abi? ] FN fn_type_parameters ret_type?
@@ -879,17 +878,17 @@ mul_bin_expr        ::= expr ('*' | '/' | '%') expr
 // <expr> | <expr> has higher priority than <expr> || <expr>
 bool_or_bin_expr    ::= expr oror expr
-  
-bool_and_bin_expr   ::= expr '&&' expr
+  
+bool_and_bin_expr   ::= expr andand expr
 bit_or_bin_expr     ::= expr '|' !'|' expr
+  
+bit_and_bin_expr    ::= expr '&' expr // `&a & &b` is possible
 bit_xor_bin_expr    ::= expr '^' expr
-  
-bit_and_bin_expr    ::= expr '&' expr
 cast_expr ::= expr AS type
 try_expr ::= expr '?'
-  
-unary_expr ::= (BOX | '-' | '*' | '!' | ('&' | '&&') MUT?) expr
+  
+unary_expr ::= (BOX | '-' | '*' | '!' | '&' MUT?) expr
 lambda_expr ::= MOVE? lambda_parameters ret_type? any_expr
@@ -1135,6 +1134,7 @@ private ltlteq ::= <<collapse LTLTEQ LT LT EQ>> | never LTLTEQ { name = "<<=" }
 private ltlt   ::= <<collapse LTLT   LT LT>>    | never LTLT   { name = "<<" }
 private lteq   ::= <<collapse LTEQ   LT EQ>>    | never LTEQ   { name = "<=" }
 private oror   ::= <<collapse OROR   OR OR>>    | never OROR   { name = "||" }
+  
+private andand ::= <<collapse ANDAND AND AND>>  | never ANDAND { name = "&&" }
 private never ::= !()

diff --git a/src/main/kotlin/org/rust/lang/core/lexer/RustLexer.flex b/src/main/kotlin/org/rust/lang/core/lexer/RustLexer.flex
@@ -157,7 +157,6 @@ STRING_LITERAL = \" ( [^\\\"] | \\[^] )* ( \" {SUFFIX}? | \\ )?
  "-"                             { return MINUS; }
  "#"                             { return SHA; }
  "|="                            { return OREQ; }
-  
-  "&&"                            { return ANDAND; }
  "&="                            { return ANDEQ; }
  "&"                             { return AND; }
  "|"                             { return OR; }

diff --git a/src/test/resources/org/rust/ide/formatter/fixtures/spacing.rs b/src/test/resources/org/rust/ide/formatter/fixtures/spacing.rs
@@ -362,3 +362,5 @@ mod    math    {
        /* ... */
    }
 }
+  
+
+  
+fn foo(&& (x, _): && (i32, i32)) {}
diff --git a/src/test/resources/org/rust/ide/formatter/fixtures/spacing_after.rs b/src/test/resources/org/rust/ide/formatter/fixtures/spacing_after.rs
@@ -361,3 +361,5 @@ mod math {
        /* ... */
    }
 }
+  
+
+  
+fn foo(&&(x, _): &&(i32, i32)) {}
diff --git a/src/test/resources/org/rust/lang/core/parser/fixtures/complete/expr.rs b/src/test/resources/org/rust/lang/core/parser/fixtures/complete/expr.rs
@@ -14,6 +14,7 @@ fn test() -> u32 {
    &x;
    &mut x;
    &&& x;
+  
+    &a & &b;
    (x + y) * z;    /* parenthesized */

diff --git a/src/test/resources/org/rust/lang/core/parser/fixtures/complete/expr.txt b/src/test/resources/org/rust/lang/core/parser/fixtures/complete/expr.txt
@@ -158,13 +158,32 @@ FILE
      PsiWhiteSpace('\n    ')
      RustExprStmtElementImpl(EXPR_STMT)
        RustUnaryExprElementImpl(UNARY_EXPR)
-  
-          PsiElement(&&)('&&')
+  
+          PsiElement(&)('&')
+  
+          RustUnaryExprElementImpl(UNARY_EXPR)
+  
+            PsiElement(&)('&')
+  
+            RustUnaryExprElementImpl(UNARY_EXPR)
+  
+              PsiElement(&)('&')
+  
+              PsiWhiteSpace(' ')
+  
+              RustPathExprElementImpl(PATH_EXPR)
+  
+                RustPathElementImpl(PATH)
+  
+                  PsiElement(<IDENTIFIER>)('x')
+  
+        PsiElement(;)(';')
+  
+      PsiWhiteSpace('\n    ')
+  
+      RustExprStmtElementImpl(EXPR_STMT)
+  
+        RustBinaryExprElementImpl(BINARY_EXPR)
          RustUnaryExprElementImpl(UNARY_EXPR)
            PsiElement(&)('&')
-  
-            PsiWhiteSpace(' ')
            RustPathExprElementImpl(PATH_EXPR)
              RustPathElementImpl(PATH)
-  
-                PsiElement(<IDENTIFIER>)('x')
+  
+                PsiElement(<IDENTIFIER>)('a')
+  
+          PsiWhiteSpace(' ')
+  
+          PsiElement(&)('&')
+  
+          PsiWhiteSpace(' ')
+  
+          RustUnaryExprElementImpl(UNARY_EXPR)
+  
+            PsiElement(&)('&')
+  
+            RustPathExprElementImpl(PATH_EXPR)
+  
+              RustPathElementImpl(PATH)
+  
+                PsiElement(<IDENTIFIER>)('b')
        PsiElement(;)(';')
      PsiWhiteSpace('\n\n    ')
      RustExprStmtElementImpl(EXPR_STMT)