diff options
Diffstat (limited to 'crates/ra_syntax/src/grammar.ron')
-rw-r--r-- | crates/ra_syntax/src/grammar.ron | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/crates/ra_syntax/src/grammar.ron b/crates/ra_syntax/src/grammar.ron index ad6d74162..6d7a5a1cb 100644 --- a/crates/ra_syntax/src/grammar.ron +++ b/crates/ra_syntax/src/grammar.ron | |||
@@ -243,6 +243,8 @@ Grammar( | |||
243 | "PARAM", | 243 | "PARAM", |
244 | "SELF_PARAM", | 244 | "SELF_PARAM", |
245 | "ARG_LIST", | 245 | "ARG_LIST", |
246 | "TYPE_BOUND", | ||
247 | "TYPE_BOUND_LIST", | ||
246 | ], | 248 | ], |
247 | ast: { | 249 | ast: { |
248 | "SourceFile": ( | 250 | "SourceFile": ( |
@@ -293,7 +295,7 @@ Grammar( | |||
293 | "EnumVariantList": ( collections: [["variants", "EnumVariant"]] ), | 295 | "EnumVariantList": ( collections: [["variants", "EnumVariant"]] ), |
294 | "EnumVariant": ( traits: ["NameOwner", "DocCommentsOwner", "AttrsOwner"], options: ["Expr"] ), | 296 | "EnumVariant": ( traits: ["NameOwner", "DocCommentsOwner", "AttrsOwner"], options: ["Expr"] ), |
295 | "TraitDef": ( | 297 | "TraitDef": ( |
296 | traits: ["VisibilityOwner", "NameOwner", "AttrsOwner", "DocCommentsOwner", "TypeParamsOwner"], | 298 | traits: ["VisibilityOwner", "NameOwner", "AttrsOwner", "DocCommentsOwner", "TypeParamsOwner", "TypeBoundsOwner"], |
297 | options: ["ItemList"] | 299 | options: ["ItemList"] |
298 | ), | 300 | ), |
299 | "Module": ( | 301 | "Module": ( |
@@ -330,7 +332,8 @@ Grammar( | |||
330 | "NameOwner", | 332 | "NameOwner", |
331 | "TypeParamsOwner", | 333 | "TypeParamsOwner", |
332 | "AttrsOwner", | 334 | "AttrsOwner", |
333 | "DocCommentsOwner" | 335 | "DocCommentsOwner", |
336 | "TypeBoundsOwner", | ||
334 | ], | 337 | ], |
335 | options: ["TypeRef"] | 338 | options: ["TypeRef"] |
336 | ), | 339 | ), |
@@ -347,8 +350,12 @@ Grammar( | |||
347 | "PlaceholderType": (), | 350 | "PlaceholderType": (), |
348 | "FnPointerType": (options: ["ParamList", "RetType"]), | 351 | "FnPointerType": (options: ["ParamList", "RetType"]), |
349 | "ForType": (options: ["TypeRef"]), | 352 | "ForType": (options: ["TypeRef"]), |
350 | "ImplTraitType": (), | 353 | "ImplTraitType": ( |
351 | "DynTraitType": (), | 354 | traits: ["TypeBoundsOwner"], |
355 | ), | ||
356 | "DynTraitType": ( | ||
357 | traits: ["TypeBoundsOwner"], | ||
358 | ), | ||
352 | 359 | ||
353 | "TypeRef": ( enum: [ | 360 | "TypeRef": ( enum: [ |
354 | "ParenType", | 361 | "ParenType", |
@@ -456,31 +463,7 @@ Grammar( | |||
456 | "RangeExpr": (), | 463 | "RangeExpr": (), |
457 | "BinExpr": (), | 464 | "BinExpr": (), |
458 | 465 | ||
459 | "IntNumber": ( traits: ["AstToken"] ), | 466 | "Literal": (), |
460 | "FloatNumber": ( traits: ["AstToken"] ), | ||
461 | "String": ( traits: ["AstToken"] ), | ||
462 | "RawString": ( traits: ["AstToken"] ), | ||
463 | "Byte": ( traits: ["AstToken"] ), | ||
464 | "RawByteString": ( traits: ["AstToken"] ), | ||
465 | "ByteString": ( traits: ["AstToken"] ), | ||
466 | "Char": ( traits: ["AstToken"] ), | ||
467 | "TrueKw": ( traits: ["AstToken"] ), | ||
468 | "FalseKw": ( traits: ["AstToken"] ), | ||
469 | "LiteralExpr": ( | ||
470 | enum: [ | ||
471 | "String", | ||
472 | "ByteString", | ||
473 | "RawString", | ||
474 | "RawByteString", | ||
475 | "Char", | ||
476 | "Byte", | ||
477 | "IntNumber", | ||
478 | "FloatNumber", | ||
479 | "TrueKw", | ||
480 | "FalseKw", | ||
481 | ] | ||
482 | ), | ||
483 | "Literal": (options: ["LiteralExpr"]), | ||
484 | 467 | ||
485 | "Expr": ( | 468 | "Expr": ( |
486 | enum: [ | 469 | enum: [ |
@@ -571,13 +554,33 @@ Grammar( | |||
571 | ["lifetime_params", "LifetimeParam" ], | 554 | ["lifetime_params", "LifetimeParam" ], |
572 | ] | 555 | ] |
573 | ), | 556 | ), |
574 | "TypeParam": ( traits: ["NameOwner", "AttrsOwner"] ), | 557 | "TypeParam": ( traits: ["NameOwner", "AttrsOwner", "TypeBoundsOwner"] ), |
575 | "LifetimeParam": ( | 558 | "LifetimeParam": ( |
576 | options: [ "Lifetime"], | ||
577 | traits: ["AttrsOwner"], | 559 | traits: ["AttrsOwner"], |
578 | ), | 560 | ), |
579 | "Lifetime": ( traits: ["AstToken"] ), | 561 | "TypeBound": ( |
580 | "WhereClause": (), | 562 | options: [ |
563 | "TypeRef", | ||
564 | ] | ||
565 | ), | ||
566 | "TypeBoundList": ( | ||
567 | collections: [ | ||
568 | ["bounds", "TypeBound"], | ||
569 | ] | ||
570 | ), | ||
571 | "WherePred": ( | ||
572 | options: [ | ||
573 | "TypeRef", | ||
574 | ], | ||
575 | traits: [ | ||
576 | "TypeBoundsOwner", | ||
577 | ], | ||
578 | ), | ||
579 | "WhereClause": ( | ||
580 | collections: [ | ||
581 | ["predicates", "WherePred"], | ||
582 | ], | ||
583 | ), | ||
581 | "ExprStmt": ( | 584 | "ExprStmt": ( |
582 | options: [ ["expr", "Expr"] ] | 585 | options: [ ["expr", "Expr"] ] |
583 | ), | 586 | ), |
@@ -612,12 +615,10 @@ Grammar( | |||
612 | ] | 615 | ] |
613 | ), | 616 | ), |
614 | "SelfParam": ( | 617 | "SelfParam": ( |
615 | options: ["SelfKw"], | ||
616 | traits: [ | 618 | traits: [ |
617 | "TypeAscriptionOwner", | 619 | "TypeAscriptionOwner", |
618 | ] | 620 | ] |
619 | ), | 621 | ), |
620 | "SelfKw": (), | ||
621 | "Param": ( | 622 | "Param": ( |
622 | options: [ "Pat" ], | 623 | options: [ "Pat" ], |
623 | traits: [ | 624 | traits: [ |
@@ -661,8 +662,7 @@ Grammar( | |||
661 | ]), | 662 | ]), |
662 | "TypeArg": (options: ["TypeRef"]), | 663 | "TypeArg": (options: ["TypeRef"]), |
663 | "AssocTypeArg": (options: ["NameRef", "TypeRef"]), | 664 | "AssocTypeArg": (options: ["NameRef", "TypeRef"]), |
664 | "LifetimeArg": (options: ["Lifetime"]), | 665 | "LifetimeArg": (), |
665 | "Comment": ( traits: ["AstToken"] ), | ||
666 | "Whitespace": ( traits: ["AstToken"] ), | 666 | "Whitespace": ( traits: ["AstToken"] ), |
667 | }, | 667 | }, |
668 | ) | 668 | ) |