From 9de9695c0cdfae3effd46563b9898d34514305aa Mon Sep 17 00:00:00 2001
From: Bruce Mitchener <bruce.mitchener@gmail.com>
Date: Sat, 9 Jan 2016 08:39:27 -0500
Subject: [PATCH] Use <raw-c-pointer> instead of <raw-machine-word>.

This makes usage of <raw-c-pointer> and primitive-unwrap-c-pointer
consistent and reduces the number of problems with LLVM builds.
---
 objective-c/class.dylan    | 138 +++++++++++++++++++------------------
 objective-c/instance.dylan |  58 ++++++++--------
 objective-c/method.dylan   |  19 +++--
 objective-c/protocol.dylan |  41 +++++------
 objective-c/selector.dylan |  26 ++++---
 5 files changed, 138 insertions(+), 144 deletions(-)

diff --git a/objective-c/class.dylan b/objective-c/class.dylan
index 2c126da..24827c3 100644
--- a/objective-c/class.dylan
+++ b/objective-c/class.dylan
@@ -9,10 +9,6 @@ define constant $class-registry :: <table> = make(<table>);
 define C-subtype <objc/class> (<C-statically-typed-pointer>)
 end;
 
-define inline function as-raw-class (objc-class :: <objc/class>)
-  primitive-unwrap-c-pointer(objc-class)
-end;
-
 define sealed method \=
     (class1 :: <objc/class>, class2 :: <objc/class>)
  => (equal? :: <boolean>)
@@ -68,11 +64,12 @@ define function objc/get-class (name :: <string>)
  => (objc-class :: false-or(<objc/class>))
   let raw-objc-class
     = primitive-wrap-machine-word
-        (%call-c-function ("objc_getClass")
-              (name :: <raw-byte-string>)
-           => (object :: <raw-machine-word>)
-            (primitive-string-as-raw(name))
-         end);
+        (primitive-cast-pointer-as-raw
+          (%call-c-function ("objc_getClass")
+                (name :: <raw-byte-string>)
+             => (object :: <raw-c-pointer>)
+              (primitive-string-as-raw(name))
+           end));
   if (raw-objc-class ~= 0)
     make(<objc/class>, address: raw-objc-class)
   else
@@ -84,11 +81,12 @@ define inline function objc/super-class (objc-class :: <objc/class>)
  => (objc-class :: false-or(<objc/class>))
   let raw-objc-class
     = primitive-wrap-machine-word
-        (%call-c-function ("class_getSuperclass")
-              (objc-class :: <raw-machine-word>)
-           => (objc-class :: <raw-machine-word>)
-            (objc-class.as-raw-class)
-         end);
+        (primitive-cast-pointer-as-raw
+          (%call-c-function ("class_getSuperclass")
+                (objc-class :: <raw-c-pointer>)
+             => (objc-class :: <raw-c-pointer>)
+                (primitive-unwrap-c-pointer(objc-class))
+           end));
   if (raw-objc-class ~= 0)
     make(<objc/class>, address: raw-objc-class)
   else
@@ -96,23 +94,24 @@ define inline function objc/super-class (objc-class :: <objc/class>)
   end if
 end;
 
-define inline function objc/raw-super-class (objc-class :: <machine-word>)
+define inline function objc/raw-super-class (raw-objc-class :: <machine-word>)
  => (raw-objc-class :: <machine-word>)
   primitive-wrap-machine-word
-    (%call-c-function ("class_getSuperclass")
-          (objc-class :: <raw-machine-word>)
-       => (objc-class :: <raw-machine-word>)
-        (primitive-unwrap-machine-word(objc-class))
-     end)
+    (primitive-cast-pointer-as-raw
+      (%call-c-function ("class_getSuperclass")
+            (objc-class :: <raw-c-pointer>)
+         => (objc-class :: <raw-c-pointer>)
+            (primitive-cast-raw-as-pointer(primitive-unwrap-machine-word(raw-objc-class)))
+       end))
 end;
 
 define inline method objc/class-name (objc-class :: <objc/class>)
  => (objc-class-name :: <string>)
   primitive-raw-as-string
       (%call-c-function ("class_getName")
-            (objc-class :: <raw-machine-word>)
+            (objc-class :: <raw-c-pointer>)
          => (name :: <raw-byte-string>)
-          (objc-class.as-raw-class)
+            (primitive-unwrap-c-pointer(objc-class))
        end)
 end;
 
@@ -120,9 +119,9 @@ define inline method objc/class-name (raw-objc-class :: <machine-word>)
  => (objc-class-name :: <string>)
   primitive-raw-as-string
       (%call-c-function ("class_getName")
-            (objc-class :: <raw-machine-word>)
+            (objc-class :: <raw-c-pointer>)
          => (name :: <raw-byte-string>)
-          (primitive-unwrap-machine-word(raw-objc-class))
+            (primitive-cast-raw-as-pointer(primitive-unwrap-machine-word(raw-objc-class)))
        end)
 end;
 
@@ -131,11 +130,11 @@ define inline function objc/class-responds-to-selector?
  => (well? :: <boolean>)
   primitive-raw-as-boolean
     (%call-c-function ("class_respondsToSelector")
-        (objc-class :: <raw-machine-word>,
-         selector :: <raw-machine-word>)
+        (objc-class :: <raw-c-pointer>,
+         selector :: <raw-c-pointer>)
      => (well? :: <raw-boolean>)
-      (objc-class.as-raw-class,
-       selector.as-raw-selector)
+      (primitive-unwrap-c-pointer(objc-class),
+       primitive-unwrap-c-pointer(selector))
     end);
 end;
 
@@ -143,9 +142,9 @@ define inline function objc/instance-size (objc-class :: <objc/class>)
  => (objc-instance-size :: <integer>)
   raw-as-integer
       (%call-c-function ("class_getInstanceSize")
-            (objc-class :: <raw-machine-word>)
+            (objc-class :: <raw-c-pointer>)
          => (size :: <raw-machine-word>)
-          (objc-class.as-raw-class)
+          (primitive-unwrap-c-pointer(objc-class))
        end)
 end;
 
@@ -154,13 +153,14 @@ define inline function objc/get-class-method
  => (method? :: false-or(<objc/method>))
   let raw-method
     = primitive-wrap-machine-word
-        (%call-c-function ("class_getClassMethod")
-             (objc-class :: <raw-machine-word>,
-              selector :: <raw-machine-word>)
-          => (method? :: <raw-machine-word>)
-           (objc-class.as-raw-class,
-            selector.as-raw-selector)
-         end);
+        (primitive-cast-pointer-as-raw
+          (%call-c-function ("class_getClassMethod")
+               (objc-class :: <raw-c-pointer>,
+                selector :: <raw-c-pointer>)
+            => (method? :: <raw-c-pointer>)
+             (primitive-unwrap-c-pointer(objc-class),
+              primitive-unwrap-c-pointer(selector))
+           end));
   if (raw-method ~= 0)
     make(<objc/method>, address: raw-method)
   else
@@ -173,13 +173,14 @@ define inline function objc/get-instance-method
  => (method? :: false-or(<objc/method>))
   let raw-method
     = primitive-wrap-machine-word
-        (%call-c-function ("class_getInstanceMethod")
-             (objc-class :: <raw-machine-word>,
-              selector :: <raw-machine-word>)
-          => (method? :: <raw-machine-word>)
-           (objc-class.as-raw-class,
-            selector.as-raw-selector)
-         end);
+        (primitive-cast-pointer-as-raw
+          (%call-c-function ("class_getInstanceMethod")
+               (objc-class :: <raw-c-pointer>,
+                selector :: <raw-c-pointer>)
+            => (method? :: <raw-c-pointer>)
+             (primitive-unwrap-c-pointer(objc-class),
+              primitive-unwrap-c-pointer(selector))
+           end));
   if (raw-method ~= 0)
     make(<objc/method>, address: raw-method)
   else
@@ -194,15 +195,16 @@ define inline function objc/allocate-class-pair
   let super-class = objc/class-for-shadow(super-class);
   let raw-class
     = primitive-wrap-machine-word
-        (%call-c-function ("objc_allocateClassPair")
-             (super-class :: <raw-machine-word>,
-              class-name :: <raw-byte-string>,
-              extra-bytes :: <raw-machine-word>)
-          => (objc-class :: <raw-machine-word>)
-           (super-class.as-raw-class,
-            primitive-string-as-raw(class-name),
-            integer-as-raw(0))
-         end);
+        (primitive-cast-pointer-as-raw
+          (%call-c-function ("objc_allocateClassPair")
+               (super-class :: <raw-c-pointer>,
+                class-name :: <raw-byte-string>,
+                extra-bytes :: <raw-machine-word>)
+            => (objc-class :: <raw-c-pointer>)
+             (primitive-unwrap-c-pointer(super-class),
+              primitive-string-as-raw(class-name),
+              integer-as-raw(0))
+           end));
   make(<objc/class>, address: raw-class)
 end;
 
@@ -210,9 +212,9 @@ define inline function objc/register-class-pair
     (objc-class :: <objc/class>)
  => ()
   %call-c-function ("objc_registerClassPair")
-      (objc-class :: <raw-machine-word>)
+      (objc-class :: <raw-c-pointer>)
    => (nothing :: <raw-c-void>)
-    (objc-class.as-raw-class)
+    (primitive-unwrap-c-pointer(objc-class))
   end;
 end;
 
@@ -224,13 +226,13 @@ define inline function objc/add-method
  => (added? :: <boolean>)
   primitive-raw-as-boolean
     (%call-c-function ("class_addMethod")
-         (objc-class :: <raw-machine-word>,
-          selector :: <raw-machine-word>,
-          implementation :: <raw-machine-word>,
+         (objc-class :: <raw-c-pointer>,
+          selector :: <raw-c-pointer>,
+          implementation :: <raw-c-pointer>,
           types :: <raw-byte-string>)
       => (added? :: <raw-boolean>)
-       (objc-class.as-raw-class,
-        selector.as-raw-selector,
+       (primitive-unwrap-c-pointer(objc-class),
+        primitive-unwrap-c-pointer(selector),
         primitive-unwrap-c-pointer(implementation),
         primitive-string-as-raw(types))
      end)
@@ -242,11 +244,11 @@ define inline method objc/conforms-to-protocol?
  => (conforms? :: <boolean>)
   primitive-raw-as-boolean
     (%call-c-function ("class_conformsToProtocol")
-         (objc-class :: <raw-machine-word>,
-          protocol :: <raw-machine-word>)
+         (objc-class :: <raw-c-pointer>,
+          protocol :: <raw-c-pointer>)
       => (conforms? :: <raw-boolean>)
-       (objc-class.as-raw-class,
-        protocol.as-raw-protocol)
+       (primitive-unwrap-c-pointer(objc-class),
+        primitive-unwrap-c-pointer(protocol))
      end)
 end;
 
@@ -256,10 +258,10 @@ define inline method objc/add-protocol
  => (added? :: <boolean>)
   primitive-raw-as-boolean
     (%call-c-function ("class_addProtocol")
-         (objc-class :: <raw-machine-word>,
-          protocol :: <raw-machine-word>)
+         (objc-class :: <raw-c-pointer>,
+          protocol :: <raw-c-pointer>)
       => (added? :: <raw-boolean>)
-       (objc-class.as-raw-class,
-        protocol.as-raw-protocol)
+       (primitive-unwrap-c-pointer(objc-class),
+        primitive-unwrap-c-pointer(protocol))
      end)
 end;
diff --git a/objective-c/instance.dylan b/objective-c/instance.dylan
index bdc8e2c..a0b4798 100644
--- a/objective-c/instance.dylan
+++ b/objective-c/instance.dylan
@@ -11,10 +11,6 @@ define C-mapped-subtype <objc/instance> (<C-statically-typed-pointer>)
       end;
 end;
 
-define inline function as-raw-instance (objc-instance :: <objc/instance>)
-  primitive-unwrap-c-pointer(objc-instance)
-end;
-
 define sealed method \=
     (instance1 :: <objc/instance>, instance2 :: <objc/instance>)
  => (equal? :: <boolean>)
@@ -33,31 +29,33 @@ define function objc/instance-class (objc-instance :: <objc/instance>)
  => (objc-class :: <objc/class>)
   let raw-objc-class
     = primitive-wrap-machine-word
-        (%call-c-function ("object_getClass")
-              (objc-instance :: <raw-machine-word>)
-           => (objc-class :: <raw-machine-word>)
-            (objc-instance.as-raw-instance)
-         end);
+        (primitive-cast-pointer-as-raw
+          (%call-c-function ("object_getClass")
+                (objc-instance :: <raw-c-pointer>)
+             => (objc-class :: <raw-c-pointer>)
+              (primitive-unwrap-c-pointer(objc-instance))
+           end));
   make(<objc/class>, address: raw-objc-class)
 end;
 
 define inline function objc/raw-instance-class (objc-instance :: <machine-word>)
  => (raw-objc-class :: <machine-word>)
   primitive-wrap-machine-word
-    (%call-c-function ("object_getClass")
-          (objc-instance :: <raw-machine-word>)
-       => (objc-class :: <raw-machine-word>)
-        (primitive-unwrap-machine-word(objc-instance))
-     end)
+    (primitive-cast-pointer-as-raw
+      (%call-c-function ("object_getClass")
+            (objc-instance :: <raw-c-pointer>)
+         => (objc-class :: <raw-c-pointer>)
+          (primitive-unwrap-machine-word(objc-instance))
+       end))
 end;
 
 define function objc/instance-class-name (objc-instance :: <objc/instance>)
  => (objc-class-name :: <string>)
    primitive-raw-as-string
       (%call-c-function ("object_getClassName")
-            (objc-instance :: <raw-machine-word>)
+            (objc-instance :: <raw-c-pointer>)
          => (name :: <raw-byte-string>)
-          (objc-instance.as-raw-instance)
+          (primitive-unwrap-c-pointer(objc-instance))
        end)
 end;
 
@@ -83,13 +81,14 @@ define inline function objc/associated-object-inner
  => (objc-instance :: <objc/instance>)
   let raw-associated-object
     = primitive-wrap-machine-word
-        (%call-c-function ("objc_getAssociatedObject")
-              (objc-instance :: <raw-machine-word>,
-               key :: <raw-machine-word>)
-           => (associated-object :: <raw-machine-word>)
-            (objc-instance.as-raw-instance,
-             primitive-unwrap-machine-word(key))
-         end);
+        (primitive-cast-pointer-as-raw
+          (%call-c-function ("objc_getAssociatedObject")
+                (objc-instance :: <raw-c-pointer>,
+                 key :: <raw-machine-word>)
+             => (associated-object :: <raw-c-pointer>)
+              (primitive-unwrap-c-pointer(objc-instance),
+               primitive-unwrap-machine-word(key))
+           end));
   if (raw-associated-object ~= 0)
     objc/make-instance(raw-associated-object);
   else
@@ -130,13 +129,14 @@ define inline function objc/set-associated-object-inner
      value :: <objc/instance>, association-policy :: <integer>)
  => ()
   %call-c-function ("objc_setAssociatedObject")
-      (objc-instance :: <raw-machine-word>,
-       key :: <raw-machine-word>, value :: <raw-machine-word>,
+      (objc-instance :: <raw-c-pointer>,
+       key :: <raw-machine-word>,
+       value :: <raw-c-pointer>,
        association-policy :: <raw-c-unsigned-int>)
    => (nothing :: <raw-c-void>)
-    (objc-instance.as-raw-instance,
+    (primitive-unwrap-c-pointer(objc-instance),
      primitive-unwrap-machine-word(key),
-     value.as-raw-instance,
+     primitive-unwrap-c-pointer(value),
      integer-as-raw(association-policy))
   end;
 end;
@@ -145,8 +145,8 @@ define function objc/remove-associated-objects
     (objc-instance :: <objc/instance>)
  => ()
   %call-c-function ("objc_removeAssociatedObjects")
-      (objc-instance :: <raw-machine-word>)
+      (objc-instance :: <raw-c-pointer>)
    => (nothing :: <raw-c-void>)
-    (objc-instance.as-raw-instance)
+    (primitive-unwrap-c-pointer(objc-instance))
   end;
 end;
diff --git a/objective-c/method.dylan b/objective-c/method.dylan
index 1bc0adb..2c1a8c7 100644
--- a/objective-c/method.dylan
+++ b/objective-c/method.dylan
@@ -6,10 +6,6 @@ copyright: See LICENSE file in this distribution.
 define C-subtype <objc/method> (<C-statically-typed-pointer>)
 end;
 
-define inline function as-raw-method (objc-method :: <objc/method>)
-  primitive-unwrap-c-pointer(objc-method)
-end;
-
 define sealed method \=
     (method1 :: <objc/method>, method2 :: <objc/method>)
  => (equal? :: <boolean>)
@@ -20,17 +16,18 @@ define function objc/method-name (objc-method :: <objc/method>)
  => (objc-method-selector :: <objc/selector>)
   let raw-objc-selector
     = primitive-wrap-machine-word
-        (%call-c-function ("method_getName")
-              (raw-method :: <raw-machine-word>)
-           => (name :: <raw-machine-word>)
-            (objc-method.as-raw-method)
-         end);
+        (primitive-cast-pointer-as-raw
+          (%call-c-function ("method_getName")
+                (raw-method :: <raw-c-pointer>)
+             => (name :: <raw-c-pointer>)
+              (primitive-unwrap-c-pointer(objc-method))
+           end));
   let type-encoding
     = primitive-raw-as-string
         (%call-c-function ("method_getTypeEncoding")
-              (raw-method :: <raw-machine-word>)
+              (raw-method :: <raw-c-pointer>)
            => (encoding :: <raw-byte-string>)
-            (objc-method.as-raw-method)
+            (primitive-unwrap-c-pointer(objc-method))
          end);
   make(<objc/selector>,
        address: raw-objc-selector,
diff --git a/objective-c/protocol.dylan b/objective-c/protocol.dylan
index f541d51..8cf6bd5 100644
--- a/objective-c/protocol.dylan
+++ b/objective-c/protocol.dylan
@@ -6,10 +6,6 @@ copyright: See LICENSE file in this distribution.
 define C-subtype <objc/protocol> (<C-statically-typed-pointer>)
 end;
 
-define inline function as-raw-protocol (objc-protocol :: <objc/protocol>)
-  primitive-unwrap-c-pointer(objc-protocol)
-end;
-
 define sideways method print-object
     (s :: <objc/protocol>, stream :: <stream>)
  => ()
@@ -20,11 +16,12 @@ define function objc/get-protocol (name :: <string>)
  => (objc-protocol? :: false-or(<objc/protocol>))
   let raw-objc-protocol
     = primitive-wrap-machine-word
-        (%call-c-function ("objc_getProtocol")
-              (name :: <raw-byte-string>)
-           => (object :: <raw-machine-word>)
-            (primitive-string-as-raw(name))
-         end);
+        (primitive-cast-pointer-as-raw
+          (%call-c-function ("objc_getProtocol")
+                (name :: <raw-byte-string>)
+             => (object :: <raw-c-pointer>)
+                (primitive-string-as-raw(name))
+           end));
   if (raw-objc-protocol ~= 0)
     make(<objc/protocol>, address: raw-objc-protocol)
   else
@@ -36,9 +33,9 @@ define function objc/protocol-name (objc-protocol :: <objc/protocol>)
  => (protocol-name :: <string>)
   primitive-raw-as-string
       (%call-c-function ("protocol_getName")
-            (objc-protocol :: <raw-machine-word>)
+            (objc-protocol :: <raw-c-pointer>)
          => (name :: <raw-byte-string>)
-          (objc-protocol.as-raw-protocol)
+          (primitive-unwrap-c-pointer(objc-protocol))
        end)
 end;
 
@@ -47,10 +44,10 @@ define sealed method \=
  => (equal? :: <boolean>)
   primitive-raw-as-boolean
     (%call-c-function ("protocol_isEqual")
-        (prtcl1 :: <raw-machine-word>,
-         prtcl2 :: <raw-machine-word>)
+        (prtcl1 :: <raw-c-pointer>,
+         prtcl2 :: <raw-c-pointer>)
      => (equal? :: <raw-boolean>)
-      (prtcl1.as-raw-protocol, prtcl2.as-raw-protocol)
+      (primitive-unwrap-c-pointer(prtcl1), primitive-unwrap-c-pointer(prtcl2))
     end)
 end;
 
@@ -60,11 +57,11 @@ define method objc/conforms-to-protocol?
  => (conforms? :: <boolean>)
   primitive-raw-as-boolean
     (%call-c-function ("protocol_conformsToProtocol")
-         (objc-protocol :: <raw-machine-word>,
-          protocol :: <raw-machine-word>)
+         (objc-protocol :: <raw-c-pointer>,
+          protocol :: <raw-c-pointer>)
       => (conforms? :: <raw-boolean>)
-       (objc-protocol.as-raw-protocol,
-        protocol.as-raw-protocol)
+       (primitive-unwrap-c-pointer(objc-protocol),
+        primitive-unwrap-c-pointer(protocol))
      end)
 end;
 
@@ -74,10 +71,10 @@ define method objc/add-protocol
  => (added? :: <boolean>)
   primitive-raw-as-boolean
     (%call-c-function ("protocol_addProtocol")
-         (objc-protocol :: <raw-machine-word>,
-          protocol :: <raw-machine-word>)
+         (objc-protocol :: <raw-c-pointer>,
+          protocol :: <raw-c-pointer>)
       => (added? :: <raw-boolean>)
-       (objc-protocol.as-raw-protocol,
-        protocol.as-raw-protocol)
+       (primitive-unwrap-c-pointer(objc-protocol),
+        primitive-unwrap-c-pointer(protocol))
      end)
 end;
diff --git a/objective-c/selector.dylan b/objective-c/selector.dylan
index df1b49b..9be5d38 100644
--- a/objective-c/selector.dylan
+++ b/objective-c/selector.dylan
@@ -8,10 +8,6 @@ define C-subtype <objc/selector> (<C-statically-typed-pointer>)
     init-keyword: encoding:;
 end;
 
-define inline function as-raw-selector (objc-selector :: <objc/selector>)
-  primitive-unwrap-c-pointer(objc-selector)
-end;
-
 define sideways method print-object
     (s :: <objc/selector>, stream :: <stream>)
  => ()
@@ -23,11 +19,12 @@ define function objc/register-selector
  => (objc-selector :: <objc/selector>)
   let raw-objc-selector
     = primitive-wrap-machine-word
-        (%call-c-function ("sel_registerName")
-              (name :: <raw-byte-string>)
-           => (object :: <raw-machine-word>)
-            (primitive-string-as-raw(name))
-         end);
+        (primitive-cast-pointer-as-raw
+          (%call-c-function ("sel_registerName")
+                (name :: <raw-byte-string>)
+             => (object :: <raw-c-pointer>)
+                (primitive-string-as-raw(name))
+           end));
   make(<objc/selector>, encoding: encoding, address: raw-objc-selector)
 end;
 
@@ -35,9 +32,9 @@ define function objc/selector-name (objc-selector :: <objc/selector>)
  => (selector-name :: <string>)
   primitive-raw-as-string
       (%call-c-function ("sel_getName")
-            (objc-selector :: <raw-machine-word>)
+            (objc-selector :: <raw-c-pointer>)
          => (name :: <raw-byte-string>)
-          (objc-selector.as-raw-selector)
+          (primitive-unwrap-c-pointer(objc-selector))
        end)
 end;
 
@@ -46,9 +43,10 @@ define sealed method \=
  => (equal? :: <boolean>)
   primitive-raw-as-boolean
     (%call-c-function ("sel_isEqual")
-        (sel1 :: <raw-machine-word>,
-         sel2 :: <raw-machine-word>)
+        (sel1 :: <raw-c-pointer>,
+         sel2 :: <raw-c-pointer>)
      => (equal? :: <raw-boolean>)
-      (sel1.as-raw-selector, sel2.as-raw-selector)
+      (primitive-unwrap-c-pointer(sel1),
+       primitive-unwrap-c-pointer(sel2))
     end)
 end;