diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-04-01 10:30:25 +0100 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-04-01 10:30:25 +0100 |
commit | 42a883f06c28ddeab22e5703a578f19110dde7f3 (patch) | |
tree | fe57697b54ccfb791fe96c13cb553a8570516270 /crates/ra_syntax/src/grammar.ron | |
parent | dec9bde10868b5e459535449476d17a6a0987b3e (diff) | |
parent | 9e213385c9d06db3c8ca20812779e2b8f8ad2c71 (diff) |
Merge #1078
1078: rewrite syntax trees r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_syntax/src/grammar.ron')
-rw-r--r-- | crates/ra_syntax/src/grammar.ron | 35 |
1 files changed, 2 insertions, 33 deletions
diff --git a/crates/ra_syntax/src/grammar.ron b/crates/ra_syntax/src/grammar.ron index 1123c2e95..6d7a5a1cb 100644 --- a/crates/ra_syntax/src/grammar.ron +++ b/crates/ra_syntax/src/grammar.ron | |||
@@ -463,31 +463,7 @@ Grammar( | |||
463 | "RangeExpr": (), | 463 | "RangeExpr": (), |
464 | "BinExpr": (), | 464 | "BinExpr": (), |
465 | 465 | ||
466 | "IntNumber": ( traits: ["AstToken"] ), | 466 | "Literal": (), |
467 | "FloatNumber": ( traits: ["AstToken"] ), | ||
468 | "String": ( traits: ["AstToken"] ), | ||
469 | "RawString": ( traits: ["AstToken"] ), | ||
470 | "Byte": ( traits: ["AstToken"] ), | ||
471 | "RawByteString": ( traits: ["AstToken"] ), | ||
472 | "ByteString": ( traits: ["AstToken"] ), | ||
473 | "Char": ( traits: ["AstToken"] ), | ||
474 | "TrueKw": ( traits: ["AstToken"] ), | ||
475 | "FalseKw": ( traits: ["AstToken"] ), | ||
476 | "LiteralExpr": ( | ||
477 | enum: [ | ||
478 | "String", | ||
479 | "ByteString", | ||
480 | "RawString", | ||
481 | "RawByteString", | ||
482 | "Char", | ||
483 | "Byte", | ||
484 | "IntNumber", | ||
485 | "FloatNumber", | ||
486 | "TrueKw", | ||
487 | "FalseKw", | ||
488 | ] | ||
489 | ), | ||
490 | "Literal": (options: ["LiteralExpr"]), | ||
491 | 467 | ||
492 | "Expr": ( | 468 | "Expr": ( |
493 | enum: [ | 469 | enum: [ |
@@ -580,14 +556,11 @@ Grammar( | |||
580 | ), | 556 | ), |
581 | "TypeParam": ( traits: ["NameOwner", "AttrsOwner", "TypeBoundsOwner"] ), | 557 | "TypeParam": ( traits: ["NameOwner", "AttrsOwner", "TypeBoundsOwner"] ), |
582 | "LifetimeParam": ( | 558 | "LifetimeParam": ( |
583 | options: [ "Lifetime"], | ||
584 | traits: ["AttrsOwner"], | 559 | traits: ["AttrsOwner"], |
585 | ), | 560 | ), |
586 | "Lifetime": ( traits: ["AstToken"] ), | ||
587 | "TypeBound": ( | 561 | "TypeBound": ( |
588 | options: [ | 562 | options: [ |
589 | "TypeRef", | 563 | "TypeRef", |
590 | "Lifetime", | ||
591 | ] | 564 | ] |
592 | ), | 565 | ), |
593 | "TypeBoundList": ( | 566 | "TypeBoundList": ( |
@@ -598,7 +571,6 @@ Grammar( | |||
598 | "WherePred": ( | 571 | "WherePred": ( |
599 | options: [ | 572 | options: [ |
600 | "TypeRef", | 573 | "TypeRef", |
601 | "Lifetime", | ||
602 | ], | 574 | ], |
603 | traits: [ | 575 | traits: [ |
604 | "TypeBoundsOwner", | 576 | "TypeBoundsOwner", |
@@ -643,12 +615,10 @@ Grammar( | |||
643 | ] | 615 | ] |
644 | ), | 616 | ), |
645 | "SelfParam": ( | 617 | "SelfParam": ( |
646 | options: ["SelfKw"], | ||
647 | traits: [ | 618 | traits: [ |
648 | "TypeAscriptionOwner", | 619 | "TypeAscriptionOwner", |
649 | ] | 620 | ] |
650 | ), | 621 | ), |
651 | "SelfKw": (), | ||
652 | "Param": ( | 622 | "Param": ( |
653 | options: [ "Pat" ], | 623 | options: [ "Pat" ], |
654 | traits: [ | 624 | traits: [ |
@@ -692,8 +662,7 @@ Grammar( | |||
692 | ]), | 662 | ]), |
693 | "TypeArg": (options: ["TypeRef"]), | 663 | "TypeArg": (options: ["TypeRef"]), |
694 | "AssocTypeArg": (options: ["NameRef", "TypeRef"]), | 664 | "AssocTypeArg": (options: ["NameRef", "TypeRef"]), |
695 | "LifetimeArg": (options: ["Lifetime"]), | 665 | "LifetimeArg": (), |
696 | "Comment": ( traits: ["AstToken"] ), | ||
697 | "Whitespace": ( traits: ["AstToken"] ), | 666 | "Whitespace": ( traits: ["AstToken"] ), |
698 | }, | 667 | }, |
699 | ) | 668 | ) |