Skip to content

Commit dec3553

Browse files
kateinoigakukunkateinoigakukun
committed
WIT: Add @since, @unstable, and @deprecated attr support
1 parent a70249a commit dec3553

File tree

12 files changed

+292
-66
lines changed

12 files changed

+292
-66
lines changed

‎Sources/WIT/AST.swift‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,15 @@ public struct PackageNameSyntax: Equatable, Hashable, CustomStringConvertible {
6868
}
6969

7070
public struct TopLevelUseSyntax: Equatable, Hashable, SyntaxNodeProtocol {
71+
var attributes: [AttributeSyntax]
7172
var item: UsePathSyntax
7273
var asName: Identifier?
7374
}
7475

7576
public struct WorldSyntax: Equatable, Hashable, SyntaxNodeProtocol {
7677
public typealias Parent = SourceFileSyntax
7778
public var documents: DocumentsSyntax
79+
public var attributes: [AttributeSyntax]
7880
public var name: Identifier
7981
public var items: [WorldItemSyntax]
8082
}
@@ -89,11 +91,13 @@ public enum WorldItemSyntax: Equatable, Hashable {
8991

9092
public struct ImportSyntax: Equatable, Hashable {
9193
public var documents: DocumentsSyntax
94+
public var attributes: [AttributeSyntax]
9295
public var kind: ExternKindSyntax
9396
}
9497

9598
public struct ExportSyntax: Equatable, Hashable {
9699
public var documents: DocumentsSyntax
100+
public var attributes: [AttributeSyntax]
97101
public var kind: ExternKindSyntax
98102
}
99103

@@ -105,6 +109,7 @@ public enum ExternKindSyntax: Equatable, Hashable {
105109

106110
public struct InterfaceSyntax: Equatable, Hashable, CustomStringConvertible, SyntaxNodeProtocol {
107111
public var documents: DocumentsSyntax
112+
public var attributes: [AttributeSyntax]
108113
public var name: Identifier
109114
public var items: [InterfaceItemSyntax]
110115

@@ -121,6 +126,7 @@ public enum InterfaceItemSyntax: Equatable, Hashable, SyntaxNodeProtocol {
121126

122127
public struct TypeDefSyntax: Equatable, Hashable, SyntaxNodeProtocol {
123128
public var documents: DocumentsSyntax
129+
public var attributes: [AttributeSyntax]
124130
public var name: Identifier
125131
public var body: TypeDefBodySyntax
126132
}
@@ -240,6 +246,7 @@ public struct StreamSyntax: Equatable, Hashable {
240246

241247
public struct NamedFunctionSyntax: Equatable, Hashable, SyntaxNodeProtocol {
242248
public var documents: DocumentsSyntax
249+
public var attributes: [AttributeSyntax]
243250
public var name: Identifier
244251
public var function: FunctionSyntax
245252
}
@@ -281,6 +288,7 @@ public struct FunctionSyntax: Equatable, Hashable {
281288
}
282289

283290
public struct UseSyntax: Equatable, Hashable, SyntaxNodeProtocol {
291+
public var attributes: [AttributeSyntax]
284292
public var from: UsePathSyntax
285293
public var names: [UseNameSyntax]
286294
}
@@ -303,6 +311,7 @@ public struct UseNameSyntax: Equatable, Hashable {
303311
}
304312

305313
public struct IncludeSyntax: Equatable, Hashable {
314+
var attributes: [AttributeSyntax]
306315
var from: UsePathSyntax
307316
var names: [IncludeNameSyntax]
308317
}
@@ -324,3 +333,25 @@ public struct Identifier: Equatable, Hashable, CustomStringConvertible {
324333
public struct DocumentsSyntax: Equatable, Hashable {
325334
var comments: [String]
326335
}
336+
337+
public enum AttributeSyntax: Equatable, Hashable {
338+
case since(SinceAttributeSyntax)
339+
case unstable(UnstableAttributeSyntax)
340+
case deprecated(DeprecatedAttributeSyntax)
341+
}
342+
343+
public struct SinceAttributeSyntax: Equatable, Hashable {
344+
let version: Version
345+
let feature: Identifier?
346+
let textRange: TextRange
347+
}
348+
349+
public struct UnstableAttributeSyntax: Equatable, Hashable {
350+
let textRange: TextRange
351+
let feature: Identifier
352+
}
353+
354+
public struct DeprecatedAttributeSyntax: Equatable, Hashable {
355+
let textRange: TextRange
356+
let version: Version
357+
}

‎Sources/WIT/Lexer.swift‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ struct Lexer {
4444
}
4545

4646
var cursor: Cursor
47+
let requireSemicolon: Bool
48+
49+
init(cursor: Cursor, requireSemicolon: Bool = false) {
50+
self.cursor = cursor
51+
self.requireSemicolon = requireSemicolon
52+
}
4753

4854
mutating func advanceToEndOfBlockComment() -> Diagnostic? {
4955
var depth = 1
@@ -245,6 +251,24 @@ struct Lexer {
245251
return actual
246252
}
247253

254+
@discardableResult
255+
mutating func expectIdentifier(_ expected: String) throws -> Lexer.Lexeme {
256+
let lexme = try self.expect(.id)
257+
let actualText = self.parseText(in: lexme.textRange)
258+
guard actualText == expected else {
259+
throw ParseError(description: "\(expected) expected but got \(actualText)")
260+
}
261+
return lexme
262+
}
263+
264+
mutating func expectSemicolon() throws {
265+
if self.requireSemicolon {
266+
try self.expect(.semicolon)
267+
} else {
268+
self.eat(.semicolon)
269+
}
270+
}
271+
248272
@discardableResult
249273
mutating func eat(_ expected: TokenKind) -> Bool {
250274
var other = self

‎Sources/WIT/TextParser/ParseFunctionDecl.swift‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
extension ResourceFunctionSyntax {
2-
static func parse(lexer: inout Lexer, documents: DocumentsSyntax) throws -> ResourceFunctionSyntax {
2+
static func parse(
3+
lexer: inout Lexer,
4+
documents: DocumentsSyntax,
5+
attributes: [AttributeSyntax]
6+
) throws -> ResourceFunctionSyntax {
37
guard let token = lexer.peek() else {
48
throw ParseError(description: "`constructor` or identifier expected but got nothing")
59
}
@@ -18,10 +22,12 @@ extension ResourceFunctionSyntax {
1822
let type = try TypeReprSyntax.parse(lexer: &lexer)
1923
return ParameterSyntax(name: name, type: type, textRange: start..<lexer.cursor.nextIndex)
2024
}
25+
try lexer.expectSemicolon()
2126
return .constructor(
2227
.init(
2328
syntax: NamedFunctionSyntax(
2429
documents: documents,
30+
attributes: attributes,
2531
name: Identifier(text: "constructor", textRange: token.textRange),
2632
function: FunctionSyntax(
2733
parameters: params,
@@ -41,11 +47,13 @@ extension ResourceFunctionSyntax {
4147
ctor = ResourceFunctionSyntax.method
4248
}
4349
let function = try FunctionSyntax.parse(lexer: &lexer)
50+
try lexer.expectSemicolon()
4451
return ctor(
4552
.init(
4653
syntax:
4754
NamedFunctionSyntax(
4855
documents: documents,
56+
attributes: attributes,
4957
name: name,
5058
function: function
5159
)
@@ -95,6 +103,7 @@ extension NamedFunctionSyntax {
95103
let name = try Identifier.parse(lexer: &lexer)
96104
try lexer.expect(.colon)
97105
let function = try FunctionSyntax.parse(lexer: &lexer)
98-
return .init(syntax: NamedFunctionSyntax(documents: documents, name: name, function: function))
106+
try lexer.expectSemicolon()
107+
return .init(syntax: NamedFunctionSyntax(documents: documents, attributes: [], name: name, function: function))
99108
}
100109
}

‎Sources/WIT/TextParser/ParseInterface.swift‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
extension InterfaceSyntax {
22
static func parse(
3-
lexer: inout Lexer, documents: DocumentsSyntax
3+
lexer: inout Lexer, documents: DocumentsSyntax, attributes: [AttributeSyntax]
44
) throws -> SyntaxNode<InterfaceSyntax> {
55
try lexer.expect(.interface)
66
let name = try Identifier.parse(lexer: &lexer)
77
let items = try parseItems(lexer: &lexer)
8-
return .init(syntax: InterfaceSyntax(documents: documents, name: name, items: items))
8+
return .init(
9+
syntax: InterfaceSyntax(
10+
documents: documents, attributes: attributes, name: name, items: items
11+
))
912
}
1013

1114
static func parseItems(lexer: inout Lexer) throws -> [InterfaceItemSyntax] {
@@ -16,29 +19,30 @@ extension InterfaceSyntax {
1619
if lexer.eat(.rightBrace) {
1720
break
1821
}
19-
items.append(try InterfaceItemSyntax.parse(lexer: &lexer, documents: docs))
22+
let attributes = try AttributeSyntax.parseItems(lexer: &lexer)
23+
items.append(try InterfaceItemSyntax.parse(lexer: &lexer, documents: docs, attributes: attributes))
2024
}
2125
return items
2226
}
2327
}
2428

2529
extension InterfaceItemSyntax {
26-
static func parse(lexer: inout Lexer, documents: DocumentsSyntax) throws -> InterfaceItemSyntax {
30+
static func parse(lexer: inout Lexer, documents: DocumentsSyntax, attributes: [AttributeSyntax]) throws -> InterfaceItemSyntax {
2731
switch lexer.peek()?.kind {
2832
case .type:
29-
return try .typeDef(.init(syntax: .parse(lexer: &lexer, documents: documents)))
33+
return try .typeDef(.init(syntax: .parse(lexer: &lexer, documents: documents, attributes: attributes)))
3034
case .flags:
31-
return try .typeDef(.init(syntax: .parseFlags(lexer: &lexer, documents: documents)))
35+
return try .typeDef(.init(syntax: .parseFlags(lexer: &lexer, documents: documents, attributes: attributes)))
3236
case .enum:
33-
return try .typeDef(.init(syntax: .parseEnum(lexer: &lexer, documents: documents)))
37+
return try .typeDef(.init(syntax: .parseEnum(lexer: &lexer, documents: documents, attributes: attributes)))
3438
case .variant:
35-
return try .typeDef(.init(syntax: .parseVariant(lexer: &lexer, documents: documents)))
39+
return try .typeDef(.init(syntax: .parseVariant(lexer: &lexer, documents: documents, attributes: attributes)))
3640
case .resource:
37-
return try .typeDef(TypeDefSyntax.parseResource(lexer: &lexer, documents: documents))
41+
return try .typeDef(TypeDefSyntax.parseResource(lexer: &lexer, documents: documents, attributes: attributes))
3842
case .record:
39-
return try .typeDef(.init(syntax: .parseRecord(lexer: &lexer, documents: documents)))
43+
return try .typeDef(.init(syntax: .parseRecord(lexer: &lexer, documents: documents, attributes: attributes)))
4044
case .union:
41-
return try .typeDef(.init(syntax: .parseUnion(lexer: &lexer, documents: documents)))
45+
return try .typeDef(.init(syntax: .parseUnion(lexer: &lexer, documents: documents, attributes: attributes)))
4246
case .id, .explicitId:
4347
return try .function(NamedFunctionSyntax.parse(lexer: &lexer, documents: documents))
4448
case .use:

‎Sources/WIT/TextParser/ParseTop.swift‎

Lines changed: 91 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ extension SourceFileSyntax {
33
var packageId: PackageNameSyntax?
44
if lexer.peek()?.kind == .package {
55
packageId = try PackageNameSyntax.parse(lexer: &lexer)
6+
try lexer.expectSemicolon()
67
}
78

89
var items: [ASTItemSyntax] = []
@@ -136,27 +137,43 @@ extension ASTItemSyntax {
136137
static func parse(
137138
lexer: inout Lexer, documents: DocumentsSyntax
138139
) throws -> ASTItemSyntax {
140+
let attributes = try AttributeSyntax.parseItems(lexer: &lexer)
139141
switch lexer.peek()?.kind {
140142
case .interface:
141-
return try .interface(InterfaceSyntax.parse(lexer: &lexer, documents: documents))
143+
return try .interface(
144+
InterfaceSyntax.parse(
145+
lexer: &lexer, documents: documents, attributes: attributes
146+
))
142147
case .world:
143-
return try .world(WorldSyntax.parse(lexer: &lexer, documents: documents))
144-
case .use: return try .use(.init(syntax: .parse(lexer: &lexer, documents: documents)))
148+
return try .world(
149+
WorldSyntax.parse(
150+
lexer: &lexer, documents: documents, attributes: attributes
151+
))
152+
case .use:
153+
return try .use(
154+
.init(
155+
syntax: .parse(
156+
lexer: &lexer, documents: documents, attributes: attributes
157+
)))
145158
default:
146159
throw ParseError(description: "`world`, `interface` or `use` expected")
147160
}
148161
}
149162
}
150163

151164
extension TopLevelUseSyntax {
152-
static func parse(lexer: inout Lexer, documents: DocumentsSyntax) throws -> TopLevelUseSyntax {
165+
static func parse(
166+
lexer: inout Lexer,
167+
documents: DocumentsSyntax, attributes: [AttributeSyntax]
168+
) throws -> TopLevelUseSyntax {
153169
try lexer.expect(.use)
154170
let item = try UsePathSyntax.parse(lexer: &lexer)
155171
var asName: Identifier?
156172
if lexer.eat(.as) {
157173
asName = try .parse(lexer: &lexer)
158174
}
159-
return TopLevelUseSyntax(item: item, asName: asName)
175+
try lexer.expectSemicolon()
176+
return TopLevelUseSyntax(attributes: attributes, item: item, asName: asName)
160177
}
161178
}
162179

@@ -179,7 +196,8 @@ extension UseSyntax {
179196
break
180197
}
181198
}
182-
return .init(syntax: UseSyntax(from: from, names: names))
199+
try lexer.expectSemicolon()
200+
return .init(syntax: UseSyntax(attributes: [], from: from, names: names))
183201
}
184202
}
185203

@@ -222,3 +240,70 @@ extension DocumentsSyntax {
222240
return DocumentsSyntax(comments: comments)
223241
}
224242
}
243+
244+
extension AttributeSyntax {
245+
static func parseItems(lexer: inout Lexer) throws -> [AttributeSyntax] {
246+
var items: [AttributeSyntax] = []
247+
while lexer.eat(.at) {
248+
let id = try Identifier.parse(lexer: &lexer)
249+
let item: AttributeSyntax
250+
switch id.text {
251+
case "since": item = .since(try .parse(lexer: &lexer, id: id))
252+
case "unstable": item = .unstable(try .parse(lexer: &lexer, id: id))
253+
case "deprecated": item = .deprecated(try .parse(lexer: &lexer, id: id))
254+
default:
255+
throw ParseError(description: "Unexpected attribute: \(id.text)")
256+
}
257+
items.append(item)
258+
}
259+
return items
260+
}
261+
}
262+
263+
extension SinceAttributeSyntax {
264+
static func parse(lexer: inout Lexer, id: Identifier) throws -> SinceAttributeSyntax {
265+
try lexer.expect(.leftParen)
266+
try lexer.expectIdentifier("version")
267+
try lexer.expect(.equals)
268+
let version = try Version.parse(lexer: &lexer)
269+
var feature: Identifier?
270+
if lexer.eat(.comma) {
271+
try lexer.expectIdentifier("feature")
272+
try lexer.expect(.equals)
273+
feature = try Identifier.parse(lexer: &lexer)
274+
}
275+
try lexer.expect(.rightParen)
276+
return SinceAttributeSyntax(
277+
version: version, feature: feature,
278+
textRange: id.textRange.lowerBound..<lexer.cursor.nextIndex
279+
)
280+
}
281+
}
282+
283+
extension UnstableAttributeSyntax {
284+
static func parse(lexer: inout Lexer, id: Identifier) throws -> UnstableAttributeSyntax {
285+
try lexer.expect(.leftParen)
286+
try lexer.expectIdentifier("feature")
287+
try lexer.expect(.equals)
288+
let feature = try Identifier.parse(lexer: &lexer)
289+
try lexer.expect(.rightParen)
290+
return UnstableAttributeSyntax(
291+
textRange: id.textRange.lowerBound..<lexer.cursor.nextIndex,
292+
feature: feature
293+
)
294+
}
295+
}
296+
297+
extension DeprecatedAttributeSyntax {
298+
static func parse(lexer: inout Lexer, id: Identifier) throws -> DeprecatedAttributeSyntax {
299+
try lexer.expect(.leftParen)
300+
try lexer.expectIdentifier("version")
301+
try lexer.expect(.equals)
302+
let version = try Version.parse(lexer: &lexer)
303+
try lexer.expect(.rightParen)
304+
return DeprecatedAttributeSyntax(
305+
textRange: id.textRange.lowerBound..<lexer.cursor.nextIndex,
306+
version: version
307+
)
308+
}
309+
}

0 commit comments

Comments
 (0)