Skip to content

Commit 0090da0

Browse files
committed
Improve macro expansion indentation (#9)
Fixes a bug where the `@Register` macro expanded with correct indentation after the first bitfield. See included test diff for the improved indentation.
1 parent d895a0f commit 0090da0

File tree

2 files changed

+28
-12
lines changed

2 files changed

+28
-12
lines changed

Sources/MMIOMacros/Macros/RegisterMacro.swift

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,12 @@ extension RegisterMacro: MMIOMemberMacro {
170170
let bitFieldDeclarations: [DeclSyntax] = bitFields.map {
171171
"""
172172
\(acl)var \($0.fieldName): UInt\(raw: self.bitWidth.value) {
173-
@inline(__always) get { self._rawStorage[bits: \($0.fieldType).bitRange] }
174-
@inline(__always) set { self._rawStorage[bits: \($0.fieldType).bitRange] = newValue }
173+
@inline(__always) get {
174+
self._rawStorage[bits: \($0.fieldType).bitRange]
175+
}
176+
@inline(__always) set {
177+
self._rawStorage[bits: \($0.fieldType).bitRange] = newValue
178+
}
175179
}
176180
"""
177181
}
@@ -218,8 +222,12 @@ extension RegisterMacro: MMIOMemberMacro {
218222
.map {
219223
"""
220224
\(acl)var \($0.fieldName): UInt\(raw: self.bitWidth.value) {
221-
@inline(__always) get { self._rawStorage[bits: \($0.fieldType).bitRange] }
222-
@inline(__always) set { self._rawStorage[bits: \($0.fieldType).bitRange] = newValue }
225+
@inline(__always) get {
226+
self._rawStorage[bits: \($0.fieldType).bitRange]
227+
}
228+
@inline(__always) set {
229+
self._rawStorage[bits: \($0.fieldType).bitRange] = newValue
230+
}
223231
}
224232
"""
225233
}
@@ -251,8 +259,12 @@ extension RegisterMacro: MMIOMemberMacro {
251259
.map {
252260
"""
253261
\(acl)var \($0.fieldName): UInt\(raw: self.bitWidth.value) {
254-
@inline(__always) get { self._rawStorage[bits: \($0.fieldType).bitRange] }
255-
@inline(__always) set { self._rawStorage[bits: \($0.fieldType).bitRange] = newValue }
262+
@inline(__always) get {
263+
self._rawStorage[bits: \($0.fieldType).bitRange]
264+
}
265+
@inline(__always) set {
266+
self._rawStorage[bits: \($0.fieldType).bitRange] = newValue
267+
}
256268
}
257269
"""
258270
}
@@ -287,8 +299,12 @@ extension RegisterMacro: MMIOMemberMacro {
287299
"""
288300
\(acl)var \($0.fieldName): UInt\(raw: self.bitWidth.value) {
289301
@available(*, deprecated, message: "API misuse; read from write view returns the value to be written, not the value initially read.")
290-
@inline(__always) get { self._rawStorage[bits: \($0.fieldType).bitRange] }
291-
@inline(__always) set { self._rawStorage[bits: \($0.fieldType).bitRange] = newValue }
302+
@inline(__always) get {
303+
self._rawStorage[bits: \($0.fieldType).bitRange]
304+
}
305+
@inline(__always) set {
306+
self._rawStorage[bits: \($0.fieldType).bitRange] = newValue
307+
}
292308
}
293309
"""
294310
}

Tests/MMIOMacrosTests/Macros/RegisterMacroTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,11 +246,11 @@ final class RegisterMacroTests: XCTestCase {
246246
}
247247
var v2: UInt8 {
248248
@inline(__always) get {
249-
self._rawStorage[bits: V2.bitRange]
250-
}
249+
self._rawStorage[bits: V2.bitRange]
250+
}
251251
@inline(__always) set {
252-
self._rawStorage[bits: V2.bitRange] = newValue
253-
}
252+
self._rawStorage[bits: V2.bitRange] = newValue
253+
}
254254
}
255255
}
256256

0 commit comments

Comments
 (0)