Parse ConstBlockPat

Veykril · Veykril · commit 03a9bbacf2a8 · 2020-12-23T01:49:43.000+01:00
diff --git a/crates/parser/src/grammar/patterns.rs b/crates/parser/src/grammar/patterns.rs
@@ -1,5 +1,7 @@
 //! FIXME: write short doc here
 
+use expressions::block_expr;
+
 use super::*;
 
 pub(super) const PATTERN_FIRST: TokenSet =
@@ -89,6 +91,7 @@ fn atom_pat(p: &mut Parser, recovery_set: TokenSet) -> Option<CompletedMarker> {
     let m = match p.nth(0) {
         T![box] => box_pat(p),
         T![ref] | T![mut] => ident_pat(p, true),
+        T![const] => const_block_pat(p),
         IDENT => match p.nth(1) {
             // Checks the token after an IDENT to see if a pattern is a path (Struct { .. }) or macro
             // (T![x]).
@@ -386,3 +389,16 @@ fn box_pat(p: &mut Parser) -> CompletedMarker {
     pattern_single(p);
     m.complete(p, BOX_PAT)
 }
+
+// test const_block_pat
+// fn main() {
+//     let const { 15 } = ();
+//     let const { foo(); bar() } = ();
+// }
+fn const_block_pat(p: &mut Parser) -> CompletedMarker {
+    assert!(p.at(T![const]));
+    let m = p.start();
+    p.bump(T![const]);
+    block_expr(p);
+    m.complete(p, CONST_BLOCK_PAT)
+}
diff --git a/crates/syntax/test_data/parser/inline/ok/0156_const_block_pat.rast b/crates/syntax/test_data/parser/inline/ok/0156_const_block_pat.rast
@@ -0,0 +1,76 @@
+SOURCE_FILE@0..78
+  FN@0..77
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..7
+      IDENT@3..7 "main"
+    PARAM_LIST@7..9
+      L_PAREN@7..8 "("
+      R_PAREN@8..9 ")"
+    WHITESPACE@9..10 " "
+    BLOCK_EXPR@10..77
+      L_CURLY@10..11 "{"
+      WHITESPACE@11..16 "\n    "
+      LET_STMT@16..38
+        LET_KW@16..19 "let"
+        WHITESPACE@19..20 " "
+        CONST_BLOCK_PAT@20..32
+          CONST_KW@20..25 "const"
+          WHITESPACE@25..26 " "
+          BLOCK_EXPR@26..32
+            L_CURLY@26..27 "{"
+            WHITESPACE@27..28 " "
+            LITERAL@28..30
+              INT_NUMBER@28..30 "15"
+            WHITESPACE@30..31 " "
+            R_CURLY@31..32 "}"
+        WHITESPACE@32..33 " "
+        EQ@33..34 "="
+        WHITESPACE@34..35 " "
+        TUPLE_EXPR@35..37
+          L_PAREN@35..36 "("
+          R_PAREN@36..37 ")"
+        SEMICOLON@37..38 ";"
+      WHITESPACE@38..43 "\n    "
+      LET_STMT@43..75
+        LET_KW@43..46 "let"
+        WHITESPACE@46..47 " "
+        CONST_BLOCK_PAT@47..69
+          CONST_KW@47..52 "const"
+          WHITESPACE@52..53 " "
+          BLOCK_EXPR@53..69
+            L_CURLY@53..54 "{"
+            WHITESPACE@54..55 " "
+            EXPR_STMT@55..61
+              CALL_EXPR@55..60
+                PATH_EXPR@55..58
+                  PATH@55..58
+                    PATH_SEGMENT@55..58
+                      NAME_REF@55..58
+                        IDENT@55..58 "foo"
+                ARG_LIST@58..60
+                  L_PAREN@58..59 "("
+                  R_PAREN@59..60 ")"
+              SEMICOLON@60..61 ";"
+            WHITESPACE@61..62 " "
+            CALL_EXPR@62..67
+              PATH_EXPR@62..65
+                PATH@62..65
+                  PATH_SEGMENT@62..65
+                    NAME_REF@62..65
+                      IDENT@62..65 "bar"
+              ARG_LIST@65..67
+                L_PAREN@65..66 "("
+                R_PAREN@66..67 ")"
+            WHITESPACE@67..68 " "
+            R_CURLY@68..69 "}"
+        WHITESPACE@69..70 " "
+        EQ@70..71 "="
+        WHITESPACE@71..72 " "
+        TUPLE_EXPR@72..74
+          L_PAREN@72..73 "("
+          R_PAREN@73..74 ")"
+        SEMICOLON@74..75 ";"
+      WHITESPACE@75..76 "\n"
+      R_CURLY@76..77 "}"
+  WHITESPACE@77..78 "\n"
diff --git a/crates/syntax/test_data/parser/inline/ok/0156_const_block_pat.rs b/crates/syntax/test_data/parser/inline/ok/0156_const_block_pat.rs
@@ -0,0 +1,4 @@
+fn main() {
+    let const { 15 } = ();
+    let const { foo(); bar() } = ();
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,76 @@ @@
 +[email protected]
 +  [email protected]
 +    [email protected] "fn"
 +    [email protected] " "
 +    [email protected]
 +      [email protected] "main"
 +    [email protected]
 +      [email protected] "("
 +      [email protected] ")"
 +    [email protected] " "
 +    [email protected]
 +      [email protected] "{"
 +      [email protected] "\n    "
 +      [email protected]
 +        [email protected] "let"
 +        [email protected] " "
 +        [email protected]
 +          [email protected] "const"
 +          [email protected] " "
 +          [email protected]
 +            [email protected] "{"
 +            [email protected] " "
 +            [email protected]
 +              [email protected] "15"
 +            [email protected] " "
 +            [email protected] "}"
 +        [email protected] " "
 +        [email protected] "="
 +        [email protected] " "
 +        [email protected]
 +          [email protected] "("
 +          [email protected] ")"
 +        [email protected] ";"
 +      [email protected] "\n    "
 +      [email protected]
 +        [email protected] "let"
 +        [email protected] " "
 +        [email protected]
 +          [email protected] "const"
 +          [email protected] " "
 +          [email protected]
 +            [email protected] "{"
 +            [email protected] " "
 +            [email protected]
 +              [email protected]
 +                [email protected]
 +                  [email protected]
 +                    [email protected]
 +                      [email protected]
 +                        [email protected] "foo"
 +                [email protected]
 +                  [email protected] "("
 +                  [email protected] ")"
 +              [email protected] ";"
 +            [email protected] " "
 +            [email protected]
 +              [email protected]
 +                [email protected]
 +                  [email protected]
 +                    [email protected]
 +                      [email protected] "bar"
 +              [email protected]
 +                [email protected] "("
 +                [email protected] ")"
 +            [email protected] " "
 +            [email protected] "}"
 +        [email protected] " "
 +        [email protected] "="
 +        [email protected] " "
 +        [email protected]
 +          [email protected] "("
 +          [email protected] ")"
 +        [email protected] ";"
 +      [email protected] "\n"
 +      [email protected] "}"
 +  [email protected] "\n"