eliminate typealias and name Swift classes to match types from C API

Author: dgrove-oss

src/swift/Dispatch.swift

@@ -30,8 +30,7 @@ import CDispatch
 // returned from API methods with DISPATCH_RETURNS_RETAINED
 //////////
 
-public typealias dispatch_object_t = DispatchObject
-public class DispatchObject {
+public class dispatch_object_t {
   let cobj:OpaquePointer;
 
   deinit {
@@ -43,33 +42,22 @@ public class DispatchObject {
   }
 }
 
-public typealias dispatch_data_t = DispatchData
-public class DispatchData : DispatchObject {
+public class dispatch_data_t : dispatch_object_t {
 }
 
-
-public typealias dispatch_group_t = DispatchGroup
-public class DispatchGroup : DispatchObject {
+public class dispatch_group_t : dispatch_object_t {
 }
 
-
-public typealias dispatch_io_t = DispatchIO
-public class DispatchIO : DispatchObject {
+public class dispatch_io_t : dispatch_object_t {
 }
 
-
-public typealias dispatch_queue_t = DispatchQueue
-public class DispatchQueue : DispatchObject {
+public class dispatch_queue_t : dispatch_object_t {
 }
 
-
-public typealias dispatch_semaphore_t = DispatchSemaphore
-public class DispatchSemaphore : DispatchObject {
+public class dispatch_semaphore_t : dispatch_object_t {
 }
 
-
-public typealias dispatch_source_t = DispatchSource
-public class DispatchSource : DispatchObject {
+public class dispatch_source_t : dispatch_object_t {
 }
 
 //////////
@@ -175,7 +163,7 @@ public var DISPATCH_QUEUE_PRIORITY_BACKGROUND: dispatch_queue_priority_t {
 }
 
 public func dispatch_get_global_queue(identifier:Int, _ flags:UInt) -> dispatch_queue_t {
-  return DispatchQueue(CDispatch.dispatch_get_global_queue(identifier, flags))
+  return dispatch_queue_t(CDispatch.dispatch_get_global_queue(identifier, flags))
 }
 
 // skip dispatch_queue_attr_make_with_qos_class; no QoS on Linux
@@ -191,7 +179,7 @@ public var DISPATCH_QUEUE_CONCURRENT: dispatch_queue_attr_t {
 
 public func dispatch_queue_create(label:UnsafePointer<Int8>,
                                   _ attr:dispatch_queue_attr_t) -> dispatch_queue_t {
-  return DispatchQueue(CDispatch.dispatch_queue_create(label, attr))
+  return dispatch_queue_t(CDispatch.dispatch_queue_create(label, attr))
 }
 
 public var DISPATCH_CURRENT_QUEUE_LABEL: dispatch_queue_t? {
@@ -362,7 +350,7 @@ public func dispatch_source_create(type:dispatch_source_type_t,
                                    _ mask:UInt,
                                    _ queue:dispatch_queue_t?) -> dispatch_source_t {
   let cqueue = queue != nil ? queue!.cobj : nil
-  return DispatchSource(CDispatch.dispatch_source_create(type, handle, mask, cqueue))
+  return dispatch_source_t(CDispatch.dispatch_source_create(type, handle, mask, cqueue))
 }
 
 public func dispatch_source_set_event_handler(source:dispatch_source_t,
@@ -416,7 +404,7 @@ public func dispatch_source_set_registration_handler(source:dispatch_source_t,
 //////////
 
 public func dispatch_group_create() -> dispatch_group_t {
-  return DispatchGroup(CDispatch.dispatch_group_create())
+  return dispatch_group_t(CDispatch.dispatch_group_create())
 }
 
 public func dispatch_group_async(group:dispatch_group_t, _ queue:dispatch_queue_t,
@@ -447,7 +435,7 @@ public func dispatch_group_leave(group:dispatch_group_t) -> Void {
 
 public func dispatch_semaphore_create(value:Int) -> dispatch_semaphore_t? {
   let csem = CDispatch.dispatch_semaphore_create(value)
-  return csem != nil ? DispatchSemaphore(csem) : nil
+  return csem != nil ? dispatch_semaphore_t(csem) : nil
 }
 
 public func dispatch_semaphore_wait(dsema:dispatch_semaphore_t, _ timeout:dispatch_time_t) -> Int {
@@ -476,7 +464,7 @@ public var dispatch_data_empty: dispatch_data_t {
 
 public func dispatch_data_create(buffer:UnsafePointer<Void>, _ size:size_t,
                                  _ queue:dispatch_queue_t,    _ destructor:dispatch_block_t?) -> dispatch_data_t {
-  return DispatchData(CDispatch.dispatch_data_create(buffer, size, queue.cobj, destructor))
+  return dispatch_data_t(CDispatch.dispatch_data_create(buffer, size, queue.cobj, destructor))
 }
 
 public func dispatch_data_get_size(data:dispatch_data_t)-> size_t {
@@ -486,24 +474,24 @@ public func dispatch_data_get_size(data:dispatch_data_t)-> size_t {
 public func dispatch_data_create_map(data:dispatch_data_t,
                                      _ buffer_ptr:UnsafeMutablePointer<UnsafePointer<Void>>,
                                      _ size_ptr:UnsafeMutablePointer<size_t>) -> dispatch_data_t {
-  return DispatchData(CDispatch.dispatch_data_create_map(data.cobj, buffer_ptr, size_ptr))
+  return dispatch_data_t(CDispatch.dispatch_data_create_map(data.cobj, buffer_ptr, size_ptr))
 }
 
 public func dispatch_data_create_concat(data1:dispatch_data_t, _ data2:dispatch_data_t)->dispatch_data_t {
-  return DispatchData(CDispatch.dispatch_data_create_concat(data1.cobj, data2.cobj))
+  return dispatch_data_t(CDispatch.dispatch_data_create_concat(data1.cobj, data2.cobj))
 }
 
 public func dispatch_data_create_subrange(data:dispatch_data_t,
                                           _ offset:size_t, _ length:size_t) -> dispatch_data_t {
-  return DispatchData(CDispatch.dispatch_data_create_subrange(data.cobj, offset, length))
+  return dispatch_data_t(CDispatch.dispatch_data_create_subrange(data.cobj, offset, length))
 }
 
 // TODO: defer dispatch_data_applier_t/dispatch_data_apply
 //       a little unclear how best to unwrap/wrap within the block.
 
 public func dispatch_data_copy_region(data:dispatch_data_t, _ location:size_t,
                                       _ offset_ptr:UnsafeMutablePointer<size_t>) -> dispatch_data_t {
-  return DispatchData(CDispatch.dispatch_data_copy_region(data.cobj, location, offset_ptr))
+  return dispatch_data_t(CDispatch.dispatch_data_copy_region(data.cobj, location, offset_ptr))
 }
 
 //////////
@@ -531,22 +519,22 @@ public func dispatch_io_create(type:dispatch_io_type_t,
                                _ fd:dispatch_fd_t,
                                _ queue:dispatch_queue_t,
                                _ cleanup_handler:dispatch_io_handler_block_t) -> dispatch_io_t {
-  return DispatchIO(CDispatch.dispatch_io_create(type, fd, queue.cobj, cleanup_handler))
+  return dispatch_io_t(CDispatch.dispatch_io_create(type, fd, queue.cobj, cleanup_handler))
 }    
 
 public func dispatch_io_create_with_path(type:dispatch_io_type_t,
                                          _ path:UnsafePointer<Int8>,
                                          _ oflag:Int32, _ mode:mode_t,
                                          _ queue:dispatch_queue_t,
                                          _ cleanup_handler:dispatch_io_handler_block_t) -> dispatch_io_t {
-  return DispatchIO(CDispatch.dispatch_io_create_with_path(type, path, oflag, mode, queue.cobj, cleanup_handler))
+  return dispatch_io_t(CDispatch.dispatch_io_create_with_path(type, path, oflag, mode, queue.cobj, cleanup_handler))
 }
 
 public func dispatch_io_create_with_io(type:dispatch_io_type_t,
                                        _ io:dispatch_io_t,
                                        _ queue:dispatch_queue_t,
                                        _ cleanup_handler:dispatch_io_handler_block_t) -> dispatch_io_t {
-  return DispatchIO(CDispatch.dispatch_io_create_with_io(type, io.cobj, queue.cobj, cleanup_handler))
+  return dispatch_io_t(CDispatch.dispatch_io_create_with_io(type, io.cobj, queue.cobj, cleanup_handler))
 }
 
 // TODO: dispatch_io_handler_t (dispatch_data_t in block...)
@@ -598,7 +586,7 @@ public func dispatch_io_set_interval(channel:dispatch_io_t,
 // Internal macros and helper functions.  Not part of the exported API
 //===----------------------------------------------------------------------===//
 
-internal let mainQueue:dispatch_queue_t = DispatchQueue(CDispatch.dispatch_get_main_queue())
+internal let mainQueue:dispatch_queue_t = dispatch_queue_t(CDispatch.dispatch_get_main_queue())
 
 @_silgen_name("_swift_dispatch_object_type_punner")
 internal func _to_dot(x:OpaquePointer) -> CDispatch.dispatch_object_t