From 7d0039babea7f2450526a4fbe151c8e88b7c625e Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Fri, 31 Oct 2014 11:33:19 -0700
Subject: [PATCH] cocoa: fix requirement that mac deploys have high reflection.

---
 basis/cocoa/cocoa.factor                  | 23 ++++++++---------------
 basis/ui/backend/cocoa/views/views.factor | 19 ++++++++++++++-----
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/basis/cocoa/cocoa.factor b/basis/cocoa/cocoa.factor
index 6913035709..c4ced31678 100644
--- a/basis/cocoa/cocoa.factor
+++ b/basis/cocoa/cocoa.factor
@@ -1,19 +1,16 @@
 ! Copyright (C) 2006, 2009 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
-USING: compiler io kernel cocoa.runtime cocoa.subclassing
-cocoa.messages cocoa.types sequences words vocabs parser
-core-foundation.bundles namespaces assocs hashtables
-compiler.units lexer init ;
+USING: cocoa.messages compiler.units core-foundation.bundles
+init io kernel lexer namespaces sequences sets vocabs ;
 FROM: cocoa.messages => selector ;
 IN: cocoa
 
-: (remember-send) ( selector variable -- )
-    [ dupd ?set-at ] change-global ;
-
 SYMBOL: sent-messages
 
+sent-messages [ HS{ } clone ] initialize
+
 : remember-send ( selector -- )
-    sent-messages (remember-send) ;
+    sent-messages get-global adjoin ;
 
 SYNTAX: -> scan-token dup remember-send suffix! \ send suffix! ;
 
@@ -22,16 +19,12 @@ SYNTAX: SEL:
     [ remember-send ]
     [ <selector> suffix! \ selector suffix! ] bi ;
 
-SYNTAX: SEND:
-    scan-token
-    [ remember-send ]
-    [ <selector> suffix! \ selector suffix! ]
-    [ suffix! \ lookup-sender suffix! ] tri ;
-
 SYMBOL: super-sent-messages
 
+super-sent-messages [ HS{ } clone ] initialize
+
 : remember-super-send ( selector -- )
-    super-sent-messages (remember-send) ;
+    super-sent-messages get-global adjoin ;
 
 SYNTAX: SUPER-> scan-token dup remember-super-send suffix! \ super-send suffix! ;
 
diff --git a/basis/ui/backend/cocoa/views/views.factor b/basis/ui/backend/cocoa/views/views.factor
index 949b135429..0c0d37af94 100644
--- a/basis/ui/backend/cocoa/views/views.factor
+++ b/basis/ui/backend/cocoa/views/views.factor
@@ -16,7 +16,11 @@ IN: ui.backend.cocoa.views
 
 : button ( event -- n )
     #! Cocoa -> Factor UI button mapping
-    -> buttonNumber H{ { 0 1 } { 2 2 } { 1 3 } } at ;
+    -> buttonNumber {
+        { 0 [ 1 ] }
+        { 1 [ 3 ] }
+        { 2 [ 2 ] }
+    } case ;
 
 CONSTANT: modifiers
     {
@@ -154,10 +158,12 @@ CLASS: FactorView < NSOpenGLView NSTextInput
         self SEL: setWantsBestResolutionOpenGLSurface:
         -> respondsToSelector: c-bool> [
 
-            self SEND: setWantsBestResolutionOpenGLSurface:
-            1 swap execute( x x x -- )
+            self SEL: setWantsBestResolutionOpenGLSurface: 1
+            void f "objc_msgSend" { id SEL char } alien-invoke
+
+            self SEL: backingScaleFactor
+            double f "objc_msgSend" { id SEL } alien-invoke
 
-            self SEND: backingScaleFactor execute( x x -- x )
             dup 1.0 > [
                 gl-scale-factor set-global t retina? set-global
                 cached-lines get-global clear-assoc
@@ -397,7 +403,10 @@ CLASS: FactorWindowDelegate < NSObject
 
         notification -> object dup SEL: backingScaleFactor
         -> respondsToSelector: c-bool> [
-            SEND: backingScaleFactor execute( x x -- x )
+
+            SEL: backingScaleFactor
+            double f "objc_msgSend" { id SEL } alien-invoke
+
             [ [ 1.0 > ] keep f ? gl-scale-factor set-global ]
             [ 1.0 > retina? set-global ] bi
         ] [ drop ] if