Skip to content

Commit 5794555

Browse files
stephencelisstephencelis
committed
Standardize void types
Let's follow the Apple convention: - () for parameters - Void for return types https://devforums.apple.com/message/1133616#1133616 Signed-off-by: Stephen Celis <stephen@stephencelis.com>
1 parent 533e47e commit 5794555

File tree

10 files changed

+117
-117
lines changed

10 files changed

+117
-117
lines changed

‎SQLite Tests/DatabaseTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ class DatabaseTests: SQLiteTestCase {
378378
XCTAssertEqual(1, db.scalar("SELECT ? = ? COLLATE \"NO DIACRITIC\"", "cafe", "café") as! Int64)
379379
}
380380

381-
func executeAndWait(block: () -> ()) {
381+
func executeAndWait(block: () -> Void) {
382382
dispatch_async(dispatch_get_main_queue(), block)
383383
waitForExpectationsWithTimeout(5) { error in
384384
if let error = error {

‎SQLite Tests/StatementTests.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@ class StatementTests: SQLiteTestCase {
150150

151151
}
152152

153-
func withBlob(block: Blob -> ()) {
153+
func withBlob(block: Blob -> Void) {
154154
let length = 1
155155
let buflen = Int(length) + 1
156-
let buffer = UnsafeMutablePointer<()>.alloc(buflen)
156+
let buffer = UnsafeMutablePointer<Void>.alloc(buflen)
157157
memcpy(buffer, "4", length)
158158
block(Blob(bytes: buffer, length: length))
159159
buffer.dealloc(buflen)

‎SQLite.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
DCC6B3A31A9194A800734B78 /* Cipher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Cipher.swift; sourceTree = "<group>"; };
155155
DCC6B3A51A9194FB00734B78 /* CipherTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CipherTests.swift; sourceTree = "<group>"; };
156156
DCF37F8119DDAC2D001534AA /* DatabaseTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DatabaseTests.swift; sourceTree = "<group>"; };
157-
DCF37F8419DDAF3F001534AA /* StatementTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatementTests.swift; sourceTree = "<group>"; };
157+
DCF37F8419DDAF3F001534AA /* StatementTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = StatementTests.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
158158
DCF37F8719DDAF79001534AA /* TestHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestHelper.swift; sourceTree = "<group>"; };
159159
/* End PBXFileReference section */
160160

‎SQLite/Database.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ public final class Database {
392392
/// :param: callback This block is invoked when a statement is executed with
393393
/// the compiled SQL as its argument. E.g., pass `println`
394394
/// to act as a logger.
395-
public func trace(callback: ((SQL: String) -> ())?) {
395+
public func trace(callback: ((SQL: String) -> Void)?) {
396396
if let callback = callback {
397397
trace = { callback(SQL: String.fromCString($0)!) }
398398
} else {
@@ -435,7 +435,7 @@ public final class Database {
435435
/// :param: callback A callback invoked with the `Operation` (one
436436
/// of `.Insert`, `.Update`, or `.Delete`), database name,
437437
/// table name, and rowid.
438-
public func updateHook(callback: ((operation: Operation, db: String, table: String, rowid: Int64) -> ())?) {
438+
public func updateHook(callback: ((operation: Operation, db: String, table: String, rowid: Int64) -> Void)?) {
439439
if let callback = callback {
440440
updateHook = { operation, db, table, rowid in
441441
callback(
@@ -470,7 +470,7 @@ public final class Database {
470470
/// Registers a callback to be invoked whenever a transaction rolls back.
471471
///
472472
/// :param: callback A callback invoked when a transaction is rolled back.
473-
public func rollbackHook(callback: (() -> ())?) {
473+
public func rollbackHook(callback: (() -> Void)?) {
474474
rollbackHook = callback.map { $0 }
475475
_SQLiteRollbackHook(handle, rollbackHook)
476476
}
@@ -570,7 +570,7 @@ public final class Database {
570570

571571
private let queue = dispatch_queue_create("SQLite.Database", DISPATCH_QUEUE_SERIAL)
572572

573-
internal func perform(block: () -> ()) { dispatch_sync(queue, block) }
573+
internal func perform(block: () -> Void) { dispatch_sync(queue, block) }
574574

575575
}
576576

‎SQLite/Expression.swift‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -90,26 +90,26 @@ public struct Expression<T> {
9090
return expression
9191
}
9292

93-
internal static func join(separator: String, _ expressions: [Expressible]) -> Expression<()> {
93+
internal static func join(separator: String, _ expressions: [Expressible]) -> Expression<Void> {
9494
var (SQL, bindings) = ([String](), [Binding?]())
9595
for expressible in expressions {
9696
let expression = expressible.expression
9797
SQL.append(expression.SQL)
9898
bindings.extend(expression.bindings)
9999
}
100-
return Expression<()>(literal: Swift.join(separator, SQL), bindings)
100+
return Expression<Void>(literal: Swift.join(separator, SQL), bindings)
101101
}
102102

103103
internal init<V>(_ expression: Expression<V>) {
104104
self.init(literal: expression.SQL, expression.bindings)
105105
(ascending, original) = (expression.ascending, expression.original)
106106
}
107107

108-
internal var ordered: Expression<()> {
108+
internal var ordered: Expression<Void> {
109109
if let ascending = ascending {
110110
return Expression.join(" ", [self, Expression(literal: ascending ? "ASC" : "DESC")])
111111
}
112-
return Expression<()>(self)
112+
return Expression<Void>(self)
113113
}
114114

115115
internal var aliased: Expression {
@@ -142,37 +142,37 @@ public struct Expression<T> {
142142

143143
public protocol Expressible {
144144

145-
var expression: Expression<()> { get }
145+
var expression: Expression<Void> { get }
146146

147147
}
148148

149149
extension Blob: Expressible {
150150

151-
public var expression: Expression<()> {
151+
public var expression: Expression<Void> {
152152
return Expression(binding: self)
153153
}
154154

155155
}
156156

157157
extension Bool: Expressible {
158158

159-
public var expression: Expression<()> {
159+
public var expression: Expression<Void> {
160160
return Expression(value: self)
161161
}
162162

163163
}
164164

165165
extension Double: Expressible {
166166

167-
public var expression: Expression<()> {
167+
public var expression: Expression<Void> {
168168
return Expression(binding: self)
169169
}
170170

171171
}
172172

173173
extension Int: Expressible {
174174

175-
public var expression: Expression<()> {
175+
public var expression: Expression<Void> {
176176
// FIXME: rdar://TODO segfaults during archive // return Expression(value: self)
177177
return Expression(binding: datatypeValue)
178178
}
@@ -181,31 +181,31 @@ extension Int: Expressible {
181181

182182
extension Int64: Expressible {
183183

184-
public var expression: Expression<()> {
184+
public var expression: Expression<Void> {
185185
return Expression(binding: self)
186186
}
187187

188188
}
189189

190190
extension String: Expressible {
191191

192-
public var expression: Expression<()> {
192+
public var expression: Expression<Void> {
193193
return Expression(binding: self)
194194
}
195195

196196
}
197197

198198
extension Expression: Expressible {
199199

200-
public var expression: Expression<()> {
201-
return Expression<()>(self)
200+
public var expression: Expression<Void> {
201+
return Expression<Void>(self)
202202
}
203203

204204
}
205205

206206
extension Query: Expressible {
207207

208-
public var expression: Expression<()> {
208+
public var expression: Expression<Void> {
209209
if tableName.original != nil {
210210
return selectExpression.alias(tableName)
211211
}
@@ -587,17 +587,17 @@ public func abs<V: Value where V.Datatype: Number>(expression: Expression<V?>) -
587587

588588
// FIXME: support Expression<V?>..., Expression<V> when Swift supports inner variadic signatures
589589
public func coalesce<V>(expressions: Expression<V?>...) -> Expression<V?> {
590-
return wrap(__FUNCTION__, Expression<()>.join(", ", expressions.map { $0 } as [Expressible]))
590+
return wrap(__FUNCTION__, Expression<Void>.join(", ", expressions.map { $0 } as [Expressible]))
591591
}
592592

593593
public func ifnull<V: Expressible>(expression: Expression<V?>, defaultValue: V) -> Expression<V> {
594-
return wrap(__FUNCTION__, Expression<()>.join(", ", [expression, defaultValue]))
594+
return wrap(__FUNCTION__, Expression<Void>.join(", ", [expression, defaultValue]))
595595
}
596596
public func ifnull<V: Expressible>(expression: Expression<V?>, defaultValue: Expression<V>) -> Expression<V> {
597-
return wrap(__FUNCTION__, Expression<()>.join(", ", [expression, defaultValue]))
597+
return wrap(__FUNCTION__, Expression<Void>.join(", ", [expression, defaultValue]))
598598
}
599599
public func ifnull<V: Expressible>(expression: Expression<V?>, defaultValue: Expression<V?>) -> Expression<V> {
600-
return wrap(__FUNCTION__, Expression<()>.join(", ", [expression, defaultValue]))
600+
return wrap(__FUNCTION__, Expression<Void>.join(", ", [expression, defaultValue]))
601601
}
602602
public func ?? <V: Expressible>(expression: Expression<V?>, defaultValue: V) -> Expression<V> {
603603
return ifnull(expression, defaultValue)
@@ -619,51 +619,51 @@ public func ltrim(expression: Expression<String>) -> Expression<String> { return
619619
public func ltrim(expression: Expression<String?>) -> Expression<String?> { return wrap(__FUNCTION__, expression) }
620620

621621
public func ltrim(expression: Expression<String>, characters: String) -> Expression<String> {
622-
return wrap(__FUNCTION__, Expression<()>.join(", ", [expression, characters]))
622+
return wrap(__FUNCTION__, Expression<Void>.join(", ", [expression, characters]))
623623
}
624624
public func ltrim(expression: Expression<String?>, characters: String) -> Expression<String?> {
625-
return wrap(__FUNCTION__, Expression<()>.join(", ", [expression, characters]))
625+
return wrap(__FUNCTION__, Expression<Void>.join(", ", [expression, characters]))
626626
}
627627

628628
public func random() -> Expression<Int> { return Expression(literal: __FUNCTION__) }
629629

630630
public func replace(expression: Expression<String>, match: String, subtitute: String) -> Expression<String> {
631-
return wrap(__FUNCTION__, Expression<()>.join(", ", [expression, match, subtitute]))
631+
return wrap(__FUNCTION__, Expression<Void>.join(", ", [expression, match, subtitute]))
632632
}
633633
public func replace(expression: Expression<String?>, match: String, subtitute: String) -> Expression<String?> {
634-
return wrap(__FUNCTION__, Expression<()>.join(", ", [expression, match, subtitute]))
634+
return wrap(__FUNCTION__, Expression<Void>.join(", ", [expression, match, subtitute]))
635635
}
636636

637637
public func round(expression: Expression<Double>) -> Expression<Double> { return wrap(__FUNCTION__, expression) }
638638
public func round(expression: Expression<Double?>) -> Expression<Double?> { return wrap(__FUNCTION__, expression) }
639639
public func round(expression: Expression<Double>, precision: Int) -> Expression<Double> {
640-
return wrap(__FUNCTION__, Expression<()>.join(", ", [expression, precision]))
640+
return wrap(__FUNCTION__, Expression<Void>.join(", ", [expression, precision]))
641641
}
642642
public func round(expression: Expression<Double?>, precision: Int) -> Expression<Double?> {
643-
return wrap(__FUNCTION__, Expression<()>.join(", ", [expression, precision]))
643+
return wrap(__FUNCTION__, Expression<Void>.join(", ", [expression, precision]))
644644
}
645645

646646
public func rtrim(expression: Expression<String>) -> Expression<String> { return wrap(__FUNCTION__, expression) }
647647
public func rtrim(expression: Expression<String?>) -> Expression<String?> { return wrap(__FUNCTION__, expression) }
648648
public func rtrim(expression: Expression<String>, characters: String) -> Expression<String> {
649-
return wrap(__FUNCTION__, Expression<()>.join(", ", [expression, characters]))
649+
return wrap(__FUNCTION__, Expression<Void>.join(", ", [expression, characters]))
650650
}
651651
public func rtrim(expression: Expression<String?>, characters: String) -> Expression<String?> {
652-
return wrap(__FUNCTION__, Expression<()>.join(", ", [expression, characters]))
652+
return wrap(__FUNCTION__, Expression<Void>.join(", ", [expression, characters]))
653653
}
654654

655655
public func substr(expression: Expression<String>, startIndex: Int) -> Expression<String> {
656-
return wrap(__FUNCTION__, Expression<()>.join(", ", [expression, startIndex]))
656+
return wrap(__FUNCTION__, Expression<Void>.join(", ", [expression, startIndex]))
657657
}
658658
public func substr(expression: Expression<String?>, startIndex: Int) -> Expression<String?> {
659-
return wrap(__FUNCTION__, Expression<()>.join(", ", [expression, startIndex]))
659+
return wrap(__FUNCTION__, Expression<Void>.join(", ", [expression, startIndex]))
660660
}
661661

662662
public func substr(expression: Expression<String>, position: Int, length: Int) -> Expression<String> {
663-
return wrap(__FUNCTION__, Expression<()>.join(", ", [expression, position, length]))
663+
return wrap(__FUNCTION__, Expression<Void>.join(", ", [expression, position, length]))
664664
}
665665
public func substr(expression: Expression<String?>, position: Int, length: Int) -> Expression<String?> {
666-
return wrap(__FUNCTION__, Expression<()>.join(", ", [expression, position, length]))
666+
return wrap(__FUNCTION__, Expression<Void>.join(", ", [expression, position, length]))
667667
}
668668

669669
public func substr(expression: Expression<String>, subRange: Range<Int>) -> Expression<String> {
@@ -676,10 +676,10 @@ public func substr(expression: Expression<String?>, subRange: Range<Int>) -> Exp
676676
public func trim(expression: Expression<String>) -> Expression<String> { return wrap(__FUNCTION__, expression) }
677677
public func trim(expression: Expression<String?>) -> Expression<String?> { return wrap(__FUNCTION__, expression) }
678678
public func trim(expression: Expression<String>, characters: String) -> Expression<String> {
679-
return wrap(__FUNCTION__, Expression<()>.join(", ", [expression, characters]))
679+
return wrap(__FUNCTION__, Expression<Void>.join(", ", [expression, characters]))
680680
}
681681
public func trim(expression: Expression<String?>, characters: String) -> Expression<String?> {
682-
return wrap(__FUNCTION__, Expression<()>.join(", ", [expression, characters]))
682+
return wrap(__FUNCTION__, Expression<Void>.join(", ", [expression, characters]))
683683
}
684684

685685
public func upper(expression: Expression<String>) -> Expression<String> { return wrap(__FUNCTION__, expression) }
@@ -727,16 +727,16 @@ public func total<V: Value where V.Datatype: Number>(#distinct: Expression<V>) -
727727
public func total<V: Value where V.Datatype: Number>(#distinct: Expression<V?>) -> Expression<Double> { return wrapDistinct("total", distinct) }
728728

729729
private func wrapDistinct<V, U>(function: String, expression: Expression<V>) -> Expression<U> {
730-
return wrap(function, Expression<()>.join(" ", [Expression<()>(literal: "DISTINCT"), expression]))
730+
return wrap(function, Expression<Void>.join(" ", [Expression<Void>(literal: "DISTINCT"), expression]))
731731
}
732732

733733
// MARK: - Helper
734734

735735
public let rowid = Expression<Int64>("ROWID")
736736

737-
public typealias Star = (Expression<Binding>?, Expression<Binding>?) -> Expression<()>
737+
public typealias Star = (Expression<Binding>?, Expression<Binding>?) -> Expression<Void>
738738

739-
public func * (Expression<Binding>?, Expression<Binding>?) -> Expression<()> {
739+
public func * (Expression<Binding>?, Expression<Binding>?) -> Expression<Void> {
740740
return Expression(literal: "*")
741741
}
742742
public func contains<V: Value, C: CollectionType where C.Generator.Element == V, C.Index.Distance == Int>(values: C, column: Expression<V>) -> Expression<Bool> {
@@ -747,7 +747,7 @@ public func contains<V: Value, C: CollectionType where C.Generator.Element == V,
747747
return contains(values, Expression<V>(column))
748748
}
749749
public func contains<V: Value>(values: Query, column: Expression<V>) -> Expression<Bool> {
750-
return infix("IN", column, wrap("", values.selectExpression) as Expression<()>)
750+
return infix("IN", column, wrap("", values.selectExpression) as Expression<Void>)
751751
}
752752

753753
// MARK: - Modifying
@@ -764,10 +764,10 @@ public typealias Setter = (Expressible, Expressible)
764764
/// :returns: A setter that can be used in a Query’s insert and update
765765
/// functions.
766766
public func set<V: Value>(column: Expression<V>, value: V) -> Setter {
767-
return (column, Expression<()>(value: value))
767+
return (column, Expression<Void>(value: value))
768768
}
769769
public func set<V: Value>(column: Expression<V?>, value: V?) -> Setter {
770-
return (column, Expression<()>(value: value))
770+
return (column, Expression<Void>(value: value))
771771
}
772772
public func set<V: Value>(column: Expression<V>, value: Expression<V>) -> Setter { return (column, value) }
773773
public func set<V: Value>(column: Expression<V>, value: Expression<V?>) -> Setter { return (column, value) }

‎SQLite/FTS.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,23 @@
2222
// THE SOFTWARE.
2323
//
2424

25-
public func fts4(columns: Expression<String>...) -> Expression<()> {
25+
public func fts4(columns: Expression<String>...) -> Expression<Void> {
2626
return fts4(columns)
2727
}
2828

2929
// TODO: matchinfo, compress, uncompress
30-
public func fts4(columns: [Expression<String>], tokenize tokenizer: Tokenizer? = nil) -> Expression<()> {
30+
public func fts4(columns: [Expression<String>], tokenize tokenizer: Tokenizer? = nil) -> Expression<Void> {
3131
var options = [String: String]()
3232
options["tokenize"] = tokenizer?.description
3333
return fts("fts4", columns, options)
3434
}
3535

36-
private func fts(function: String, columns: [Expression<String>], options: [String: String]) -> Expression<()> {
36+
private func fts(function: String, columns: [Expression<String>], options: [String: String]) -> Expression<Void> {
3737
var definitions: [Expressible] = columns.map { $0.expression }
3838
for (key, value) in options {
39-
definitions.append(Expression<()>(literal: "\(key)=\(value)"))
39+
definitions.append(Expression<Void>(literal: "\(key)=\(value)"))
4040
}
41-
return wrap(function, Expression<()>.join(", ", definitions))
41+
return wrap(function, Expression<Void>.join(", ", definitions))
4242
}
4343

4444
public enum Tokenizer {

0 commit comments

Comments
 (0)