From 6575c068165295b8757c8768e61fd22b385d31a8 Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Wed, 10 Sep 2008 21:28:38 -0700
Subject: [PATCH] oops--broke the alien>objc-types reverse mapping

---
 basis/cocoa/messages/messages.factor | 22 +++++++++++++++++-----
 basis/cocoa/types/types.factor       |  7 ++++++-
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/basis/cocoa/messages/messages.factor b/basis/cocoa/messages/messages.factor
index ba7034d012..623bfc961a 100755
--- a/basis/cocoa/messages/messages.factor
+++ b/basis/cocoa/messages/messages.factor
@@ -108,22 +108,34 @@ H{
     { "c" "char" }
     { "i" "int" }
     { "s" "short" }
-    { "l" "int" }
-    { "q" "longlong" }
     { "C" "uchar" }
     { "I" "uint" }
     { "S" "ushort" }
-    { "L" "uint" }
-    { "Q" "ulonglong" }
     { "f" "float" }
     { "d" "double" }
     { "B" "bool" }
     { "v" "void" }
     { "*" "char*" }
+    { "?" "unknown_type" }
     { "@" "id" }
     { "#" "id" }
     { ":" "SEL" }
-} objc>alien-types set-global
+}
+"ptrdiff_t" heap-size {
+    { 4 [ H{
+        { "l" "long" }
+        { "q" "longlong" }
+        { "L" "ulong" }
+        { "Q" "ulonglong" }
+    } ] }
+    { 8 [ H{
+        { "l" "long32" }
+        { "q" "long" }
+        { "L" "ulong32" }
+        { "Q" "ulong" }
+    } ] }
+} case
+assoc-union objc>alien-types set-global
 
 ! The transpose of the above map
 SYMBOL: alien>objc-types
diff --git a/basis/cocoa/types/types.factor b/basis/cocoa/types/types.factor
index acc717a61c..d02865fe43 100644
--- a/basis/cocoa/types/types.factor
+++ b/basis/cocoa/types/types.factor
@@ -27,7 +27,7 @@ C-STRUCT: NSSize
     { "CGFloat" "h" } ;
 
 TYPEDEF: NSSize _NSSize
-TYPEDEF: NSPoint CGPoint
+TYPEDEF: NSSize CGSize
 
 : <NSSize> ( w h -- size )
     "NSSize" <c-object>
@@ -75,6 +75,11 @@ C-STRUCT: NSRange
 
 TYPEDEF: NSRange _NSRange
 
+! The "lL" type encodings refer to 32-bit values even in 64-bit mode
+TYPEDEF: int long32
+TYPEDEF: uint long32
+TYPEDEF: void* unknown_type
+
 : <NSRange> ( length location -- size )
     "NSRange" <c-object>
     [ set-NSRange-length ] keep