Skip to content
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

Restructure project to test SourceGen code generation #2

Merged
merged 12 commits into from
Sep 21, 2021
Merged

Restructure project to test SourceGen code generation #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3e44ca4
Fix types coming through with whitespace
odmir Sep 16, 2021
92730b3
Structure project to be more testable
odmir Sep 17, 2021
acc3645
Restructure SourceGen for testability
odmir Sep 17, 2021
b87660d
Add test for source generation from DistributedActorDecls
odmir Sep 17, 2021
a7bdddb
Adjust SourceGen and expected code in test to have consistent formatting
odmir Sep 18, 2021
8a99d2c
Remove calls to `trimmingCharacters(in:)`
odmir Sep 18, 2021
20e79a5
Add clarifying comments and a warning for `buckets > 1`
odmir Sep 18, 2021
c8fe2ff
Revert reestructuring
odmir Sep 20, 2021
348416c
Implement naïve bucketing strategy
odmir Sep 20, 2021
7842f0f
Break up lines in test `actorDeclarations` constant
odmir Sep 20, 2021
ee1f5a8
Remove import
odmir Sep 20, 2021
54dc5c1
Always generate the requested amount of buckets
odmir Sep 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 11 additions & 4 deletions FishyTransport/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ let package = Package(
"FishyActorTransportPlugin"
]
),

// would be provided by transport library
.executable(
name: "FishyActorsGenerator",
Expand Down Expand Up @@ -80,12 +80,12 @@ let package = Package(
"FishyActorsGenerator"
]
),

.executableTarget(
name: "FishyActorsGenerator",
dependencies: [
.product(name: "SwiftSyntax", package: "swift-syntax"),
.product(name: "ArgumentParser", package: "swift-argument-parser"),
.product(name: "SwiftSyntax", package: "swift-syntax"),
]
),

Expand All @@ -94,11 +94,18 @@ let package = Package(
.testTarget(
name: "FishyActorTransportTests",
dependencies: [
"FishyActorTransport"
"FishyActorTransport",
],
swiftSettings: [
.unsafeFlags(experimentalFlags)
]
),

.testTarget(
name: "FishyActorsGeneratorTests",
dependencies: [
"FishyActorsGenerator",
]
),
]
)
10 changes: 5 additions & 5 deletions FishyTransport/Sources/FishyActorsGenerator/Analysis.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ final class Analysis: SyntaxVisitor {
self.verbose = verbose
}

func run() {
public func run() {
let enumerator = FileManager.default.enumerator(atPath: sourceDirectory)
while let path = enumerator?.nextObject() as? String {
guard path.hasSuffix(".swift") else {
Expand Down Expand Up @@ -112,7 +112,7 @@ final class Analysis: SyntaxVisitor {

let resultTypeNaive: String
if let t = node.signature.output?.returnType {
resultTypeNaive = "\(t)"
resultTypeNaive = "\(t.withoutTrivia())"
} else {
// pretty naive representation, prefer an enum
resultTypeNaive = "Void"
Expand All @@ -121,11 +121,11 @@ final class Analysis: SyntaxVisitor {
// TODO: this is just a naive implementation, we'd carry all information here
let fun = FuncDecl(
access: .internal,
name: node.identifier.text.trimmingCharacters(in: .whitespaces),
name: node.identifier.withoutTrivia().text,
params: node.signature.gatherParams(),
throwing: isThrowing,
async: isAsync,
result: resultTypeNaive.trimmingCharacters(in: .whitespaces)
result: resultTypeNaive
)
actorDecl.funcs.append(fun)

Expand Down Expand Up @@ -205,7 +205,7 @@ extension FunctionSignatureSyntax {
// ==== ----------------------------------------------------------------------------------------------------------------
// MARK: Analysis decls

struct DistributedActorDecl {
public struct DistributedActorDecl {
let access: AccessControl
let name: String
var funcs: [FuncDecl]
Expand Down