Skip to content

Unified: Track all local name kinds in one pass #22284

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

Open
asgerf wants to merge 18 commits into
base: main
Choose a base branch
from
Open

Unified: Track all local name kinds in one pass #22284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
cea1106
unified: Fix extraction of type parameter bounds and constraints
asgerf Aug 5, 2026
e0e3406
unified: Support . in name test annotations
asgerf Aug 5, 2026
eef277a
unified: Add more local name binding test cases
asgerf Aug 5, 2026
3b51c4c
unified: add MISSING annotations
asgerf Aug 5, 2026
7d1b1e4
unified: Track more kinds of names as local variables
asgerf Aug 5, 2026
5d851e4
unified: More precise scoping inside classes
asgerf Aug 5, 2026
3e25c6a
unified: Rename Variables.qll -> LocalNameBinding.qll
asgerf Aug 5, 2026
6df74d7
unified: Rename 'variables' test
asgerf Aug 5, 2026
686a07d
unified: Rename 'Variable' API to use LocalName terminology
asgerf Aug 5, 2026
a5faaef
unified: Two refactorings
asgerf Aug 5, 2026
179ae25
unified: Also include declaration site access
asgerf Aug 5, 2026
427653e
unified: Replace getDefiningNode() with isDeclarationSite()
asgerf Aug 5, 2026
012b1ae
unified: Minor doc comment update
asgerf Aug 5, 2026
a3a54c3
unified: fix typo
asgerf Aug 5, 2026
6e89c7b
unified: Add mappings for type parameters on functions and type aliases
asgerf Aug 5, 2026
5a302d5
unified: Add name binding tests
asgerf Aug 5, 2026
74e46ba
unified: Add mappings for constructor calls with generic arguments
asgerf Aug 5, 2026
aaa2c1c
unified: Add test with generic constructor call
asgerf Aug 5, 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
70 changes: 70 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 @@ -185,6 +185,20 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
// the target AST has no expression-level discard (only `ignore_pattern`,
// which is a pattern), so it becomes a `name_expr` over the `_` token.
rule!((discardAssignmentExpr wildcard: @@w) => (name_expr identifier: (identifier #{w}))),
// A generic specialization in expression position (`C<Foo>`,
// `Array<Int>`) is represented by swift-syntax as a
// `genericSpecializationExpr`. When used as a call target
// (`C<Foo>()`), this should become a `call_expr` whose callee is a
// `generic_type_expr`, so we map it directly to that shape.
rule!(
(genericSpecializationExpr
expression: (declReferenceExpr baseName: @name)
genericArgumentClause: (genericArgumentClause arguments: (genericArgument argument: @args)*))
=>
(generic_type_expr
base: (named_type_expr name: (identifier #{name}))
type_argument: {args})
),
// ---- Operators ----
// The parser front-end folds operator chains into nested
// `infixOperatorExpr`s by precedence (see swift-syntax-rs), so
Expand Down Expand Up @@ -568,26 +582,30 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
rule!(
(functionDecl
name: @name
genericParameterClause: (genericParameterClause parameters: _* @type_params)?
signature: (functionSignature
parameterClause: (functionParameterClause parameters: _* @params)
returnClause: (returnClause type: @ret)?)
body: (codeBlock statements: _* @body))
=>
(function_declaration
name: (identifier #{name})
type_parameter: {type_params}
parameter: {params}
return_type: {ret}
body: (block stmt: {body}))
),
rule!(
(functionDecl
name: @name
genericParameterClause: (genericParameterClause parameters: _* @type_params)?
signature: (functionSignature
parameterClause: (functionParameterClause parameters: _* @params)
returnClause: (returnClause type: @ret)?))
=>
(function_declaration
name: (identifier #{name})
type_parameter: {type_params}
parameter: {params}
return_type: {ret}
body: (block))
Expand Down Expand Up @@ -1065,19 +1083,51 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
// A nominal type's `inheritanceClause` (`: Base, Proto`) becomes a list
// of `base_type`s, one per inherited type. Each declaration keyword
// gets its own rule; the bodies are identical but for the keyword.
rule!(
(genericParameter
attributes: _* @attrs
specifier: _? @@spec
name: @@name
inheritedType: _? @bound)
Comment thread
asgerf marked this conversation as resolved.
=>
(type_parameter
modifier: {attrs}
modifier: (modifier #{spec})?
name: (identifier #{name})
bound: {bound})
),
rule!(
(genericRequirement
requirement: (conformanceRequirement leftType: @ty rightType: @bound))
=>
(bound_type_constraint type: {ty} bound: {bound})
),
rule!(
(genericRequirement
requirement: (sameTypeRequirement leftType: @left rightType: @right))
=>
(equality_type_constraint left: {left} right: {right})
),
// Class declaration with body containing members
rule!(
(classDecl
classKeyword: @kind
modifiers: _* @mods
name: @name
genericParameterClause: (genericParameterClause
parameters: _* @params
genericWhereClause: (genericWhereClause requirements: _* @parameter_constraints)?)?
inheritanceClause: (inheritanceClause inheritedTypes: (inheritedType type: @bases)*)?
genericWhereClause: (genericWhereClause requirements: _* @declaration_constraints)?
memberBlock: (memberBlock members: _* @members))
=>
(class_like_declaration
modifier: (modifier #{kind})
modifier: {mods}
name: (identifier #{name})
type_parameter: {params}
type_constraint: {parameter_constraints}
type_constraint: {declaration_constraints}
base_type: {bases.into_iter().map(|ty| tree!((base_type type: {ty})))}
member: {members})
),
Expand All @@ -1087,13 +1137,20 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
enumKeyword: @kind
modifiers: _* @mods
name: @name
genericParameterClause: (genericParameterClause
parameters: _* @params
genericWhereClause: (genericWhereClause requirements: _* @parameter_constraints)?)?
inheritanceClause: (inheritanceClause inheritedTypes: (inheritedType type: @bases)*)?
genericWhereClause: (genericWhereClause requirements: _* @declaration_constraints)?
memberBlock: (memberBlock members: _* @members))
=>
(class_like_declaration
modifier: (modifier #{kind})
modifier: {mods}
name: (identifier #{name})
type_parameter: {params}
type_constraint: {parameter_constraints}
type_constraint: {declaration_constraints}
base_type: {bases.into_iter().map(|ty| tree!((base_type type: {ty})))}
member: {members})
),
Expand All @@ -1103,13 +1160,20 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
structKeyword: @kind
modifiers: _* @mods
name: @name
genericParameterClause: (genericParameterClause
parameters: _* @params
genericWhereClause: (genericWhereClause requirements: _* @parameter_constraints)?)?
inheritanceClause: (inheritanceClause inheritedTypes: (inheritedType type: @bases)*)?
genericWhereClause: (genericWhereClause requirements: _* @declaration_constraints)?
memberBlock: (memberBlock members: _* @members))
=>
(class_like_declaration
modifier: (modifier #{kind})
modifier: {mods}
name: (identifier #{name})
type_parameter: {params}
type_constraint: {parameter_constraints}
type_constraint: {declaration_constraints}
base_type: {bases.into_iter().map(|ty| tree!((base_type type: {ty})))}
member: {members})
),
Expand All @@ -1119,13 +1183,17 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
protocolKeyword: @kind
modifiers: _* @mods
name: @name
genericParameterClause: (genericParameterClause parameters: _* @params)?
inheritanceClause: (inheritanceClause inheritedTypes: (inheritedType type: @bases)*)?
genericWhereClause: (genericWhereClause requirements: _* @declaration_constraints)?
memberBlock: (memberBlock members: _* @members))
=>
(class_like_declaration
modifier: (modifier #{kind})
modifier: {mods}
name: (identifier #{name})
type_parameter: {params}
type_constraint: {declaration_constraints}
base_type: {bases.into_iter().map(|ty| tree!((base_type type: {ty})))}
member: {members})
),
Expand Down Expand Up @@ -1180,11 +1248,13 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
(typeAliasDecl
modifiers: _* @mods
name: @@name
genericParameterClause: (genericParameterClause parameters: _* @type_params)?
initializer: (typeInitializerClause value: @val))
=>
(type_alias_declaration
modifier: {mods}
name: (identifier #{name})
type_parameter: {type_params}
r#type: {val})
),
// Associated type declaration (with optional bound)
Expand Down
9 changes: 8 additions & 1 deletion unified/extractor/tests/corpus/swift/expressions/generic-specialization-expression.output
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,11 @@ top_level
identifier: identifier "numbers"
value:
call_expr
callee: unsupported_node "Array<Int>"
callee:
generic_type_expr
base:
named_type_expr
name: identifier "Array"
type_argument:
named_type_expr
name: identifier "Int"
106 changes: 106 additions & 0 deletions unified/extractor/tests/corpus/swift/functions/constructor-call-with-type-arguments.output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
class Foo {}
class C<T> {}
let x = C<Foo>()

---

sourceFile
endOfFileToken: endOfFile
statements:
codeBlockItem
item:
classDecl
attributes:
name: identifier "Foo"
memberBlock:
memberBlock
leftBrace: {
rightBrace: }
members:
modifiers:
classKeyword: class
codeBlockItem
item:
classDecl
attributes:
name: identifier "C"
genericParameterClause:
genericParameterClause
parameters:
genericParameter
attributes:
name: identifier "T"
leftAngle: <
rightAngle: >
memberBlock:
memberBlock
leftBrace: {
rightBrace: }
members:
modifiers:
classKeyword: class
codeBlockItem
item:
variableDecl
attributes:
modifiers:
bindingSpecifier: let
bindings:
patternBinding
initializer:
initializerClause
equal: =
value:
functionCallExpr
leftParen: (
rightParen: )
arguments:
additionalTrailingClosures:
calledExpression:
genericSpecializationExpr
expression:
declReferenceExpr
baseName: identifier "C"
genericArgumentClause:
genericArgumentClause
arguments:
genericArgument
argument:
identifierType
name: identifier "Foo"
leftAngle: <
rightAngle: >
pattern:
identifierPattern
identifier: identifier "x"

---

top_level
body:
block
stmt:
class_like_declaration
modifier: modifier "class"
name: identifier "Foo"
class_like_declaration
modifier: modifier "class"
name: identifier "C"
type_parameter:
type_parameter
name: identifier "T"
variable_declaration
modifier: modifier "let"
pattern:
name_pattern
identifier: identifier "x"
value:
call_expr
callee:
generic_type_expr
base:
named_type_expr
name: identifier "C"
type_argument:
named_type_expr
name: identifier "Foo"
3 changes: 3 additions & 0 deletions unified/extractor/tests/corpus/swift/functions/constructor-call-with-type-arguments.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
class Foo {}
class C<T> {}
let x = C<Foo>()
3 changes: 3 additions & 0 deletions unified/extractor/tests/corpus/swift/functions/generic-function.output
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ top_level
stmt:
function_declaration
name: identifier "identity"
type_parameter:
type_parameter
name: identifier "T"
parameter:
parameter
external_name: identifier "_"
Expand Down
77 changes: 77 additions & 0 deletions unified/extractor/tests/corpus/swift/functions/generic-type-alias.output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
typealias Box<T: Equatable, U> = Dictionary<T, U>

---

sourceFile
endOfFileToken: endOfFile
statements:
codeBlockItem
item:
typeAliasDecl
attributes:
name: identifier "Box"
genericParameterClause:
genericParameterClause
parameters:
genericParameter
colon: :
attributes:
name: identifier "T"
trailingComma: ,
inheritedType:
identifierType
name: identifier "Equatable"
genericParameter
attributes:
name: identifier "U"
leftAngle: <
rightAngle: >
modifiers:
initializer:
typeInitializerClause
equal: =
value:
identifierType
name: identifier "Dictionary"
genericArgumentClause:
genericArgumentClause
arguments:
genericArgument
trailingComma: ,
argument:
identifierType
name: identifier "T"
genericArgument
argument:
identifierType
name: identifier "U"
leftAngle: <
rightAngle: >
typealiasKeyword: typealias

---

top_level
body:
block
stmt:
type_alias_declaration
name: identifier "Box"
type_parameter:
type_parameter
name: identifier "T"
bound:
named_type_expr
name: identifier "Equatable"
type_parameter
name: identifier "U"
type:
generic_type_expr
base:
named_type_expr
name: identifier "Dictionary"
type_argument:
named_type_expr
name: identifier "T"
named_type_expr
name: identifier "U"
1 change: 1 addition & 0 deletions unified/extractor/tests/corpus/swift/functions/generic-type-alias.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
typealias Box<T: Equatable, U> = Dictionary<T, U>
Loading
Loading