Skip to content

Unified: Extract modifiers for function declarations #22540

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

Merged
hvitved merged 3 commits into from
Sep 11, 2026
Merged

Unified: Extract modifiers for function declarations #22540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3e90db
unified: Extract Swift function modifiers
hvitved Sep 10, 2026
c339f34
unified: Test bodyless Swift function modifiers
hvitved Sep 10, 2026
a83eb22
unified: Refresh rebased Swift corpus output
hvitved Sep 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions unified/extractor/src/languages/swift/swift.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,7 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
// an empty `block`.
rule!(
(functionDecl
modifiers: _* @mods
name: @name
genericParameterClause: (genericParameterClause parameters: _* @type_params)?
signature: (functionSignature
Expand All @@ -566,6 +567,7 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
body: (codeBlock statements: _* @body))
=>
(function_declaration
modifier: {mods}
name_node: (identifier #{name})
type_parameter: {type_params}
parameter: {params}
Expand All @@ -574,13 +576,15 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
),
rule!(
(functionDecl
modifiers: _* @mods
Comment thread
hvitved marked this conversation as resolved.
name: @name
genericParameterClause: (genericParameterClause parameters: _* @type_params)?
signature: (functionSignature
parameterClause: (functionParameterClause parameters: _* @params)
returnClause: (returnClause type: @ret)?))
=>
(function_declaration
modifier: {mods}
name_node: (identifier #{name})
type_parameter: {type_params}
parameter: {params}
Expand Down
1 change: 1 addition & 0 deletions unified/extractor/tests/corpus/swift/control-flow/discard-statement.output
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ top_level
type: unsupported_node "~Copyable"
member:
function_declaration
modifier: modifier "consuming"
name_node: identifier "close"
body:
block
Expand Down
57 changes: 57 additions & 0 deletions unified/extractor/tests/corpus/swift/types/class-function.output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
class Factory {
class func make() {}
}

---

sourceFile
endOfFileToken: endOfFile
statements:
codeBlockItem
item:
classDecl
attributes:
name: identifier "Factory"
memberBlock:
memberBlock
leftBrace: {
rightBrace: }
members:
memberBlockItem
decl:
functionDecl
attributes:
body:
codeBlock
leftBrace: {
rightBrace: }
statements:
name: identifier "make"
modifiers:
declModifier
name: class
signature:
functionSignature
parameterClause:
functionParameterClause
leftParen: (
rightParen: )
parameters:
funcKeyword: func
modifiers:
classKeyword: class

---

top_level
body:
block
stmt:
class_like_declaration
modifier: modifier "class"
name_node: identifier "Factory"
member:
function_declaration
modifier: modifier "class"
name_node: identifier "make"
body: block "class func make() {}"
3 changes: 3 additions & 0 deletions unified/extractor/tests/corpus/swift/types/class-function.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
class Factory {
class func make() {}
}
21 changes: 21 additions & 0 deletions unified/extractor/tests/corpus/swift/types/protocol-declaration.output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
protocol Drawable {
func draw()
static func make()
}

---
Expand Down Expand Up @@ -31,6 +32,22 @@ sourceFile
rightParen: )
parameters:
funcKeyword: func
memberBlockItem
decl:
functionDecl
attributes:
name: identifier "make"
modifiers:
declModifier
name: static
signature:
functionSignature
parameterClause:
functionParameterClause
leftParen: (
rightParen: )
parameters:
funcKeyword: func
modifiers:
protocolKeyword: protocol

Expand All @@ -47,3 +64,7 @@ top_level
function_declaration
name_node: identifier "draw"
body: block "func draw()"
function_declaration
modifier: modifier "static"
name_node: identifier "make"
body: block "static func make()"
1 change: 1 addition & 0 deletions unified/extractor/tests/corpus/swift/types/protocol-declaration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
protocol Drawable {
func draw()
static func make()
}
57 changes: 57 additions & 0 deletions unified/extractor/tests/corpus/swift/types/static-function.output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
class Factory {
static func make() {}
}

---

sourceFile
endOfFileToken: endOfFile
statements:
codeBlockItem
item:
classDecl
attributes:
name: identifier "Factory"
memberBlock:
memberBlock
leftBrace: {
rightBrace: }
members:
memberBlockItem
decl:
functionDecl
attributes:
body:
codeBlock
leftBrace: {
rightBrace: }
statements:
name: identifier "make"
modifiers:
declModifier
name: static
signature:
functionSignature
parameterClause:
functionParameterClause
leftParen: (
rightParen: )
parameters:
funcKeyword: func
modifiers:
classKeyword: class

---

top_level
body:
block
stmt:
class_like_declaration
modifier: modifier "class"
name_node: identifier "Factory"
member:
function_declaration
modifier: modifier "static"
name_node: identifier "make"
body: block "static func make() {}"
3 changes: 3 additions & 0 deletions unified/extractor/tests/corpus/swift/types/static-function.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
class Factory {
static func make() {}
}
Loading