diff options
Diffstat (limited to 'crates/ra_syntax/src/grammar.ron')
-rw-r--r-- | crates/ra_syntax/src/grammar.ron | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/crates/ra_syntax/src/grammar.ron b/crates/ra_syntax/src/grammar.ron index d1be40abe..08aafb610 100644 --- a/crates/ra_syntax/src/grammar.ron +++ b/crates/ra_syntax/src/grammar.ron | |||
@@ -94,7 +94,8 @@ Grammar( | |||
94 | "return", | 94 | "return", |
95 | "try", | 95 | "try", |
96 | "box", | 96 | "box", |
97 | "await" | 97 | "await", |
98 | "macro" | ||
98 | ], | 99 | ], |
99 | contextual_keywords: [ | 100 | contextual_keywords: [ |
100 | "auto", | 101 | "auto", |
@@ -140,6 +141,7 @@ Grammar( | |||
140 | "TYPE_ALIAS_DEF", | 141 | "TYPE_ALIAS_DEF", |
141 | "MACRO_CALL", | 142 | "MACRO_CALL", |
142 | "TOKEN_TREE", | 143 | "TOKEN_TREE", |
144 | "MACRO_DEF", | ||
143 | 145 | ||
144 | "PAREN_TYPE", | 146 | "PAREN_TYPE", |
145 | "TUPLE_TYPE", | 147 | "TUPLE_TYPE", |
@@ -243,6 +245,7 @@ Grammar( | |||
243 | "TYPE_PARAM_LIST", | 245 | "TYPE_PARAM_LIST", |
244 | "LIFETIME_PARAM", | 246 | "LIFETIME_PARAM", |
245 | "TYPE_PARAM", | 247 | "TYPE_PARAM", |
248 | "CONST_PARAM", | ||
246 | "TYPE_ARG_LIST", | 249 | "TYPE_ARG_LIST", |
247 | "LIFETIME_ARG", | 250 | "LIFETIME_ARG", |
248 | "TYPE_ARG", | 251 | "TYPE_ARG", |
@@ -426,7 +429,7 @@ Grammar( | |||
426 | "PathExpr": (options: ["Path"]), | 429 | "PathExpr": (options: ["Path"]), |
427 | "LambdaExpr": ( | 430 | "LambdaExpr": ( |
428 | options: [ | 431 | options: [ |
429 | "ParamList", | 432 | "ParamList", "RetType", |
430 | ["body", "Expr"], | 433 | ["body", "Expr"], |
431 | ] | 434 | ] |
432 | ), | 435 | ), |
@@ -602,6 +605,10 @@ Grammar( | |||
602 | options: [("default_type", "TypeRef")], | 605 | options: [("default_type", "TypeRef")], |
603 | traits: ["NameOwner", "AttrsOwner", "TypeBoundsOwner"], | 606 | traits: ["NameOwner", "AttrsOwner", "TypeBoundsOwner"], |
604 | ), | 607 | ), |
608 | "ConstParam": ( | ||
609 | options: [("default_val", "Expr")], | ||
610 | traits: ["NameOwner", "AttrsOwner", "TypeAscriptionOwner"], | ||
611 | ), | ||
605 | "LifetimeParam": ( | 612 | "LifetimeParam": ( |
606 | traits: ["AttrsOwner"], | 613 | traits: ["AttrsOwner"], |
607 | ), | 614 | ), |
@@ -653,6 +660,7 @@ Grammar( | |||
653 | ], | 660 | ], |
654 | traits: [ | 661 | traits: [ |
655 | "AttrsOwner", | 662 | "AttrsOwner", |
663 | "ModuleItemOwner", | ||
656 | ] | 664 | ] |
657 | ), | 665 | ), |
658 | "ParamList": ( | 666 | "ParamList": ( |
@@ -664,14 +672,14 @@ Grammar( | |||
664 | "SelfParam": ( | 672 | "SelfParam": ( |
665 | traits: [ | 673 | traits: [ |
666 | "TypeAscriptionOwner", | 674 | "TypeAscriptionOwner", |
667 | "AttrsOwner", | 675 | "AttrsOwner", |
668 | ] | 676 | ] |
669 | ), | 677 | ), |
670 | "Param": ( | 678 | "Param": ( |
671 | options: [ "Pat" ], | 679 | options: [ "Pat" ], |
672 | traits: [ | 680 | traits: [ |
673 | "TypeAscriptionOwner", | 681 | "TypeAscriptionOwner", |
674 | "AttrsOwner", | 682 | "AttrsOwner", |
675 | ] | 683 | ] |
676 | ), | 684 | ), |
677 | "UseItem": ( | 685 | "UseItem": ( |