Skip to content

Commit 49f7788

Browse files
committed
update swift-syntax
1 parent 997f14b commit 49f7788

File tree

5 files changed

+12
-14
lines changed

5 files changed

+12
-14
lines changed

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ let package = Package(
202202

203203
],
204204
dependencies: [
205-
.package(url: "https://github.com/swiftlang/swift-syntax", from: "601.0.1"),
205+
.package(url: "https://github.com/swiftlang/swift-syntax", from: "602.0.0"),
206206
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
207207
.package(url: "https://github.com/apple/swift-system", from: "1.4.0"),
208208

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ It is possible to generate Swift bindings to Java libraries using SwiftJava by u
5858

5959
Required language/runtime versions:
6060
- **JDK 17+**, any recent JDK installation should be sufficient, as only general reflection and JNI APIs are used by this integratio
61-
- **Swift 6.0.x**, because the library uses modern Swift macros
61+
- **Swift 6.2.x**, because the library uses modern Swift macros
6262

6363
**swift-java jextract**
6464

Sources/JExtractSwiftLib/Convenience/SwiftSyntax+Extensions.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
import SwiftDiagnostics
16-
import SwiftSyntax
16+
@_spi(ExperimentalLanguageFeatures) import SwiftSyntax
1717

1818
extension WithModifiersSyntax {
1919
var accessControlModifiers: DeclModifierListSyntax {
@@ -218,6 +218,8 @@ extension DeclSyntaxProtocol {
218218
} else {
219219
"var"
220220
}
221+
case .usingDecl(let node):
222+
node.nameForDebug
221223
}
222224
}
223225

Sources/JExtractSwiftLib/SwiftTypes/SwiftType.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ extension SwiftType {
215215
switch type.as(TypeSyntaxEnum.self) {
216216
case .arrayType, .classRestrictionType,
217217
.dictionaryType, .missingType, .namedOpaqueReturnType,
218-
.packElementType, .packExpansionType, .suppressedType:
218+
.packElementType, .packExpansionType, .suppressedType, .inlineArrayType:
219219
throw TypeTranslationError.unimplementedType(type)
220220

221221
case .attributedType(let attributedType):

Sources/JExtractSwiftLib/SwiftTypes/SwiftTypeLookupContext.swift

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,24 +42,19 @@ class SwiftTypeLookupContext {
4242
return typeDeclaration(for: names)
4343
}
4444

45-
case .fromFileScope(_, let names):
46-
if !names.isEmpty {
47-
return typeDeclaration(for: names)
48-
}
49-
50-
case .lookInMembers(let scopeNode):
45+
case .lookForMembers(let scopeNode):
5146
if let nominalDecl = try typeDeclaration(for: scopeNode, sourceFilePath: "FIXME.swift") { // FIXME: no path here // implement some node -> file
5247
if let found = symbolTable.lookupNestedType(name.name, parent: nominalDecl as! SwiftNominalTypeDeclaration) {
5348
return found
5449
}
5550
}
5651

57-
case .lookInGenericParametersOfExtendedType(let extensionNode):
52+
case .lookForGenericParameters(let extensionNode):
5853
// TODO: Implement
5954
_ = extensionNode
6055
break
6156

62-
case .mightIntroduceDollarIdentifiers:
57+
case .lookForImplicitClosureParameters:
6358
// Dollar identifier can't be a type, ignore.
6459
break
6560
}
@@ -81,8 +76,9 @@ class SwiftTypeLookupContext {
8176
// TODO: Implement
8277
_ = implicitDecl
8378
break
84-
case .dollarIdentifier:
85-
break
79+
case .equivalentNames(let equivalentNames):
80+
// TODO: Implement
81+
_ = equivalentNames
8682
}
8783
}
8884
return nil

0 commit comments

Comments
 (0)