Skip to content

Match access modifier in members #10

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
keeshux merged 4 commits into from
Feb 6, 2026
Merged

Match access modifier in members #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
676c684
Make expanded members public
keeshux Feb 5, 2026
eafb6ec
Get access modifier from decl list
keeshux Feb 6, 2026
31ca466
Match declaration access modifier
keeshux Feb 6, 2026
d1619d9
Merge branch 'master' into bugfix/members-access
keeshux Feb 6, 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
5 changes: 3 additions & 2 deletions Sources/SWONMacros/Decoding.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,14 +164,15 @@ struct SWONDecodeMacro: MemberMacro {
""")
}
}
let accessLevel = declaration.modifiers.accessLevel
return [
DeclSyntax(stringLiteral: """
init(fromSWON root: swon_t) throws {
\(accessLevel) init(fromSWON root: swon_t) throws {
\(assignments.joined(separator: "\n"))
}
"""),
DeclSyntax(stringLiteral: """
init(fromJSON json: String) throws {
\(accessLevel) init(fromJSON json: String) throws {
var root = swon_t()
defer { swon_free(&root) }
guard swon_parse(&root, json) == SWONResultValid else {
Expand Down
5 changes: 3 additions & 2 deletions Sources/SWONMacros/Encoding.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,10 @@ struct SWONEncodeMacro: MemberMacro {
// message: SWONMessage(message: "Assignments: \(assignments)")
// )
// )
let accessLevel = declaration.modifiers.accessLevel
return [
DeclSyntax(stringLiteral: """
func toSWON() throws -> swon_t {
\(accessLevel) func toSWON() throws -> swon_t {
var root = swon_t()
guard swon_create_object(&root) else {
throw SWONError.invalid("Unable to create root")
Expand All @@ -223,7 +224,7 @@ struct SWONEncodeMacro: MemberMacro {
}
"""),
DeclSyntax(stringLiteral: """
func toJSON() throws -> String {
\(accessLevel) func toJSON() throws -> String {
var item = try toSWON()
defer { swon_free(&item) }
guard let cjson = swon_encode(item) else {
Expand Down
20 changes: 20 additions & 0 deletions Sources/SWONMacros/Helpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,26 @@ extension EnumDeclSyntax {
}
}

extension DeclModifierListSyntax {
var accessLevel: String {
for modifier in self {
switch modifier.name.tokenKind {
case .keyword(.public):
return "public"
case .keyword(.internal):
return "internal"
case .keyword(.fileprivate):
return "fileprivate"
case .keyword(.private):
return "private"
default:
continue
}
}
return ""
}
}

extension PatternBindingSyntax {
var isComputed: Bool {
accessorBlock != nil
Expand Down