Skip to content

[Syntax] Clean up syntax grammar for declaration nodes #60052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 10 commits into from
Jul 20, 2022
Merged

[Syntax] Clean up syntax grammar for declaration nodes #60052

merged 10 commits into from
Jul 20, 2022

Conversation

DougGregor
Copy link
Member

Collected cleanups for the declaration grammar used by SwiftSyntax/libSyntax:

  • Split ActorDecl into its own syntax node, separate from ClassDecl
  • Update the list of declaration modifiers to match that of the language
  • Use FunctionSignature for initializers rather than its own parameter clause, which picks up (e.g.) proper support for async and the experimental reasync, and also unifies their parameter lists with that of function declarations
  • Factored out the "detail" of a decl modifier, so we have an optional parenthesized detail list rather than optional components
  • TypeAliasDecl's initializer (the = type) is not optional, so remove its optionality

DougGregor added 10 commits July 13, 2022 21:49
@DougGregor
[Syntax] Split ActorDecl into its own syntax node apart from ClassDecl.
9b17cc4
@DougGregor
[Parser] Produce the appropriate syntax node kind for actors.
188cf5c
@DougGregor
[Syntax] Fix distributed actor syntax test
d1c7c72
@DougGregor
[Syntax] Update declaration modifiers list.
2f5b638
@DougGregor
[Syntax] Use FunctionSignature for initializer declarations.
1b41972 
Initializer declarations were missing support for `async`, in part
because they deplicated most of the `FunctionSignature` production.
Instead, use `FunctionSignature` consistently and let the presence of a
result type be a semantic error.
@DougGregor
[Syntax] The body of a deinitializer is optional
6552d86
@DougGregor
Parse a general function-signature for an initializer.
d7ea96b 
This helps unify the parse trees with function declarations.
@DougGregor
[Syntax] Factor out the detail for a declaration modifier.
73debb4
@DougGregor
[Syntax] TypeAliasDecl's initializer is not optional
7c199b7
@DougGregor
[Syntax] Update round-trip syntax for initializer function signatures
79d1b5a
@DougGregor
Copy link
Member Author

swiftlang/swift-syntax#499

@swift-ci please clean test

ahoppen
ahoppen reviewed Jul 14, 2022
View reviewed changes
@DougGregor
Copy link
Member Author

swiftlang/swift-syntax#499
swiftlang/swift-stress-tester#180

@swift-ci please clean test

2 similar comments
@DougGregor
Copy link
Member Author

swiftlang/swift-syntax#499
swiftlang/swift-stress-tester#180

@swift-ci please clean test

@DougGregor
Copy link
Member Author

swiftlang/swift-syntax#499
swiftlang/swift-stress-tester#180

@swift-ci please clean test

@DougGregor
Copy link
Member Author

swiftlang/swift-syntax#499
swiftlang/swift-stress-tester#180

@swift-ci please test macOS

@DougGregor
Copy link
Member Author

swiftlang/swift-syntax#499
swiftlang/swift-stress-tester#180
swiftlang/swift-driver#1140

@swift-ci please test macOS

1 similar comment
@DougGregor
Copy link
Member Author

swiftlang/swift-syntax#499
swiftlang/swift-stress-tester#180
swiftlang/swift-driver#1140

@swift-ci please test macOS

@DougGregor DougGregor mentioned this pull request Jul 18, 2022
Merged
@DougGregor
Copy link
Member Author

swiftlang/swift-syntax#499
swiftlang/swift-stress-tester#180

@swift-ci please test macOS

@DougGregor
Copy link
Member Author

swiftlang/swift-syntax#499
swiftlang/swift-stress-tester#180

@swift-ci please test macOS

2 similar comments
@DougGregor
Copy link
Member Author

swiftlang/swift-syntax#499
swiftlang/swift-stress-tester#180

@swift-ci please test macOS

@DougGregor
Copy link
Member Author

swiftlang/swift-syntax#499
swiftlang/swift-stress-tester#180

@swift-ci please test macOS

@DougGregor
Copy link
Member Author

Different spurious failure, this time from LLDB. Trying again...

@DougGregor
Copy link
Member Author

swiftlang/swift-syntax#499
swiftlang/swift-stress-tester#180

@swift-ci please test macOS

@DougGregor DougGregor merged commit 3e53290 into swiftlang:main Jul 20, 2022
@DougGregor DougGregor deleted the syntax-decl-cleanup branch July 20, 2022 23:09
@DougGregor DougGregor mentioned this pull request Jul 20, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahoppen ahoppen ahoppen approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@DougGregor @ahoppen