diff options
author | Aleksey Kladov <[email protected]> | 2020-04-10 09:27:23 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2020-04-10 15:10:28 +0100 |
commit | 460c8bbdec8561a581d035f9767b7dd1ba36cfd7 (patch) | |
tree | 8bfba509776ea2c58ca6b47c668603c63a4b9d4f /xtask | |
parent | 1c5d8591952cbb017fd6679a1ef29a86e1499025 (diff) |
Curley tokens
Diffstat (limited to 'xtask')
-rw-r--r-- | xtask/src/ast_src.rs | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/xtask/src/ast_src.rs b/xtask/src/ast_src.rs index 8c83450e6..1483dc08e 100644 --- a/xtask/src/ast_src.rs +++ b/xtask/src/ast_src.rs | |||
@@ -335,7 +335,7 @@ pub(crate) const AST_SRC: AstSrc = AstSrc { | |||
335 | RecordFieldDefList, | 335 | RecordFieldDefList, |
336 | } | 336 | } |
337 | 337 | ||
338 | struct RecordFieldDefList { LCurly, fields: [RecordFieldDef], RCurly } | 338 | struct RecordFieldDefList { T!['{'], fields: [RecordFieldDef], T!['}'] } |
339 | struct RecordFieldDef: VisibilityOwner, NameOwner, AttrsOwner, DocCommentsOwner, TypeAscriptionOwner { } | 339 | struct RecordFieldDef: VisibilityOwner, NameOwner, AttrsOwner, DocCommentsOwner, TypeAscriptionOwner { } |
340 | 340 | ||
341 | struct TupleFieldDefList { LParen, fields: [TupleFieldDef], RParen } | 341 | struct TupleFieldDefList { LParen, fields: [TupleFieldDef], RParen } |
@@ -348,9 +348,9 @@ pub(crate) const AST_SRC: AstSrc = AstSrc { | |||
348 | variant_list: EnumVariantList, | 348 | variant_list: EnumVariantList, |
349 | } | 349 | } |
350 | struct EnumVariantList { | 350 | struct EnumVariantList { |
351 | LCurly, | 351 | T!['{'], |
352 | variants: [EnumVariant], | 352 | variants: [EnumVariant], |
353 | RCurly | 353 | T!['}'] |
354 | } | 354 | } |
355 | struct EnumVariant: VisibilityOwner, NameOwner, DocCommentsOwner, AttrsOwner { | 355 | struct EnumVariant: VisibilityOwner, NameOwner, DocCommentsOwner, AttrsOwner { |
356 | FieldDefList, | 356 | FieldDefList, |
@@ -372,9 +372,9 @@ pub(crate) const AST_SRC: AstSrc = AstSrc { | |||
372 | } | 372 | } |
373 | 373 | ||
374 | struct ItemList: ModuleItemOwner { | 374 | struct ItemList: ModuleItemOwner { |
375 | LCurly, | 375 | T!['{'], |
376 | impl_items: [ImplItem], | 376 | impl_items: [ImplItem], |
377 | RCurly | 377 | T!['}'] |
378 | } | 378 | } |
379 | 379 | ||
380 | struct ConstDef: VisibilityOwner, NameOwner, TypeParamsOwner, AttrsOwner, DocCommentsOwner, TypeAscriptionOwner { | 380 | struct ConstDef: VisibilityOwner, NameOwner, TypeParamsOwner, AttrsOwner, DocCommentsOwner, TypeAscriptionOwner { |
@@ -469,7 +469,7 @@ pub(crate) const AST_SRC: AstSrc = AstSrc { | |||
469 | struct Literal { LiteralToken } | 469 | struct Literal { LiteralToken } |
470 | 470 | ||
471 | struct MatchExpr: AttrsOwner { T![match], Expr, MatchArmList } | 471 | struct MatchExpr: AttrsOwner { T![match], Expr, MatchArmList } |
472 | struct MatchArmList: AttrsOwner { LCurly, arms: [MatchArm], RCurly } | 472 | struct MatchArmList: AttrsOwner { T!['{'], arms: [MatchArm], T!['}'] } |
473 | struct MatchArm: AttrsOwner { | 473 | struct MatchArm: AttrsOwner { |
474 | pat: Pat, | 474 | pat: Pat, |
475 | guard: MatchGuard, | 475 | guard: MatchGuard, |
@@ -480,11 +480,11 @@ pub(crate) const AST_SRC: AstSrc = AstSrc { | |||
480 | 480 | ||
481 | struct RecordLit { Path, RecordFieldList} | 481 | struct RecordLit { Path, RecordFieldList} |
482 | struct RecordFieldList { | 482 | struct RecordFieldList { |
483 | LCurly, | 483 | T!['{'], |
484 | fields: [RecordField], | 484 | fields: [RecordField], |
485 | Dotdot, | 485 | Dotdot, |
486 | spread: Expr, | 486 | spread: Expr, |
487 | RCurly | 487 | T!['}'] |
488 | } | 488 | } |
489 | struct RecordField: AttrsOwner { NameRef, Colon, Expr } | 489 | struct RecordField: AttrsOwner { NameRef, Colon, Expr } |
490 | 490 | ||
@@ -503,12 +503,12 @@ pub(crate) const AST_SRC: AstSrc = AstSrc { | |||
503 | 503 | ||
504 | struct RecordPat { RecordFieldPatList, Path } | 504 | struct RecordPat { RecordFieldPatList, Path } |
505 | struct RecordFieldPatList { | 505 | struct RecordFieldPatList { |
506 | LCurly, | 506 | T!['{'], |
507 | pats: [RecordInnerPat], | 507 | pats: [RecordInnerPat], |
508 | record_field_pats: [RecordFieldPat], | 508 | record_field_pats: [RecordFieldPat], |
509 | bind_pats: [BindPat], | 509 | bind_pats: [BindPat], |
510 | Dotdot, | 510 | Dotdot, |
511 | RCurly | 511 | T!['}'] |
512 | } | 512 | } |
513 | struct RecordFieldPat: AttrsOwner, NameOwner { Colon, Pat } | 513 | struct RecordFieldPat: AttrsOwner, NameOwner { Colon, Pat } |
514 | 514 | ||
@@ -556,10 +556,10 @@ pub(crate) const AST_SRC: AstSrc = AstSrc { | |||
556 | } | 556 | } |
557 | struct Condition { T![let], Pat, Eq, Expr } | 557 | struct Condition { T![let], Pat, Eq, Expr } |
558 | struct Block: AttrsOwner, ModuleItemOwner { | 558 | struct Block: AttrsOwner, ModuleItemOwner { |
559 | LCurly, | 559 | T!['{'], |
560 | statements: [Stmt], | 560 | statements: [Stmt], |
561 | Expr, | 561 | Expr, |
562 | RCurly, | 562 | T!['}'], |
563 | } | 563 | } |
564 | struct ParamList { | 564 | struct ParamList { |
565 | LParen, | 565 | LParen, |
@@ -580,7 +580,7 @@ pub(crate) const AST_SRC: AstSrc = AstSrc { | |||
580 | Path, Star, UseTreeList, Alias | 580 | Path, Star, UseTreeList, Alias |
581 | } | 581 | } |
582 | struct Alias: NameOwner { T![as] } | 582 | struct Alias: NameOwner { T![as] } |
583 | struct UseTreeList { LCurly, use_trees: [UseTree], RCurly } | 583 | struct UseTreeList { T!['{'], use_trees: [UseTree], T!['}'] } |
584 | struct ExternCrateItem: AttrsOwner, VisibilityOwner { | 584 | struct ExternCrateItem: AttrsOwner, VisibilityOwner { |
585 | T![extern], T![crate], NameRef, Alias, | 585 | T![extern], T![crate], NameRef, Alias, |
586 | } | 586 | } |
@@ -619,9 +619,9 @@ pub(crate) const AST_SRC: AstSrc = AstSrc { | |||
619 | } | 619 | } |
620 | 620 | ||
621 | struct ExternItemList: ModuleItemOwner { | 621 | struct ExternItemList: ModuleItemOwner { |
622 | LCurly, | 622 | T!['{'], |
623 | extern_items: [ExternItem], | 623 | extern_items: [ExternItem], |
624 | RCurly | 624 | T!['}'] |
625 | } | 625 | } |
626 | 626 | ||
627 | struct ExternBlock { | 627 | struct ExternBlock { |
@@ -769,8 +769,6 @@ pub(crate) const AST_SRC: AstSrc = AstSrc { | |||
769 | }, | 769 | }, |
770 | 770 | ||
771 | token_enums: &ast_enums! { | 771 | token_enums: &ast_enums! { |
772 | enum LeftDelimiter { LParen, LBrack, LCurly } | ||
773 | enum RightDelimiter { RParen, RBrack, RCurly } | ||
774 | enum RangeSeparator { Dotdot, Dotdotdot, Dotdoteq} | 772 | enum RangeSeparator { Dotdot, Dotdotdot, Dotdoteq} |
775 | 773 | ||
776 | enum BinOp { | 774 | enum BinOp { |