Clean up shared base types

Author: LunaTheFoxgirl

source/corefoundation/core.d

@@ -7,6 +7,7 @@
 */
 module corefoundation.core;
 import numem.core.types;
+public import objc.basetypes;
 public import objc.bridge : objd_bridge;
 
 extern(C) @nogc nothrow:
@@ -89,32 +90,6 @@ struct CFRange {
     CFIndex location;
 }
 
-// Declaration of base types.
-alias Boolean           = bool;
-alias UInt8             = ubyte;
-alias SInt8             = byte;
-alias UInt16            = ushort;
-alias SInt16            = short;
-alias UInt32            = uint;
-alias SInt32            = int;
-alias UInt64            = ulong;
-alias SInt64            = long;
-alias Int               = ptrdiff_t;
-alias UInt              = size_t;
-alias UniChar           = wchar;
-alias StringPtr         = const(char)*;
-alias Str255            = const(char)[255];
-alias ConstStr255Param  = const(char)*;
-alias OSErr             = UInt16;
-alias OSStatus          = UInt32;
-alias UTF32Char         = dchar;
-alias UTF16Char         = wchar;
-alias UTF8Char          = char;
-alias LangCode          = ushort;
-alias RegionCode        = ushort;
-alias FourCharCode      = uint;
-alias OSType            = FourCharCode;
-
 extern(C) @nogc nothrow:
 
 /**
@@ -191,8 +166,8 @@ extern CFTypeID CFGetTypeID(CFTypeRef cfObject);
     Generic CoreFoundation reference, essentially equivalent to
     NSObject
 */
-alias CFTypeRef = __CFType*;
 struct __CFType; /// ditto
+alias CFTypeRef = __CFType*;
 
 /**
     Defines a CFTypeRef subtype; said subtype can be cast down to
@@ -206,6 +181,6 @@ template CFSubType(string name, AllowedBridge...) {
     import objc.bridge : objd_bridge;
 
     @objd_bridge!(AllowedBridge)
-    struct __CFSubType(string name) { alias self this; __CFType* self; }
-    alias CFSubType = __CFSubType!name;
+    struct __CFSubType(string name) { alias isa this; __CFType* isa; }
+    alias CFSubType = __CFSubType!(name)*;
 }

source/foundation/core.d

@@ -6,69 +6,7 @@
     Authors:   Luna Nielsen
 */
 module foundation.core;
-
-/**
-    A structure used to describe a portion of a series, such as characters in a string or objects in an array.
-*/
-struct NSRange {
-nothrow @nogc:
-
-    /**
-        The index of the first member of the range.
-    */
-    NSUInteger location;
-
-    /**
-        The number of items in the range.
-    */
-    NSUInteger length;
-
-    /**
-        Returns the sum of the location and length of the range.
-    */
-    @property max() => location+length;
-
-    /**
-        Returns a Boolean value that indicates whether two given ranges are equal.
-    */
-    bool opEquals(const(NSRange) other) const {
-        return this.location == other.location && this.length == other.length;
-    }
-
-    /**
-        Returns a Boolean value that indicates whether a specified position is in a given range.
-    */
-    bool inRange(NSUInteger location) => this.location >= location && location < this.max();
-
-    /**
-        Returns the intersection of the specified ranges.
-
-        Returns:  
-            A range describing the intersection of range1 and range2—that is, 
-            a range containing the indices that exist in both ranges.
-
-        If the returned range’s length field is 0, then the two ranges don’t intersect, 
-        and the value of the location field is undefined.
-    */
-    NSRange intersect(NSRange other) {
-        NSUInteger loc = NSMax(this.location, other.location);
-        return NSRange(
-            location: loc,
-            length: NSMin(this.max, other.max)-loc,
-        );
-    }
-
-    /**
-        Returns the union of the specified ranges.
-    */
-    NSRange unionize(NSRange other) {
-        NSUInteger loc = NSMin(location, other.location);
-        return NSRange(
-            location: loc,
-            length: NSMin(this.max, other.max)-loc
-        );
-    }
-}
+public import objc.basetypes;
 
 /**
     Type indicating a parameter is a pointer to an NSRange structure.

source/foundation/nsdictionary.d

@@ -113,10 +113,11 @@ public:
     /**
         Adds a given key-value pair to the dictionary.
     */
-    void opIndexAssign(Value value, Key key) {
+    final
+    extern(D) void opIndexAssign(Value value, inout(Key) key) {
         static if (is(Key : NSString))
-            this.message!void("setValue:forKey:", value, key);
+            self.send!void("setValue:forKey:", value, key);
         else
-            this.message!void("setObject:forKey:", value, key);
+            self.send!void("setObject:forKey:", value, key);
     }
 }

source/objc/basetypes.d

@@ -118,4 +118,7 @@ alias OSStatus          = UInt32;
 alias UTF32Char         = dchar;
 alias UTF16Char         = wchar;
 alias UTF8Char          = char;
-alias OSType            = uint;
+alias LangCode          = ushort;
+alias RegionCode        = ushort;
+alias FourCharCode      = uint;
+alias OSType            = FourCharCode;