kernel: remove ?execute, not used much, and a little bit confusing.

diff --git a/basis/opengl/opengl.factor b/basis/opengl/opengl.factor
index 175d5ba4139ed7f8ceb2b62f36573cb936e25a85..7c3f56f1ba8e53cb6ce58597a0a945c7cecd24e0 100644 (file)
--- a/basis/opengl/opengl.factor
+++ b/basis/opengl/opengl.factor
@@ -5,7 +5,7 @@
 USING: alien alien.c-types alien.data assocs colors
 combinators.smart continuations fry init kernel locals macros
 math namespaces opengl.gl sequences sequences.generalizations
-specialized-arrays ;
+specialized-arrays words ;
 FROM: alien.c-types => float ;
 SPECIALIZED-ARRAY: float
 SPECIALIZED-ARRAY: uint
@@ -53,7 +53,7 @@ TUPLE: gl-error-tuple function code string ;
     over glEnableClientState dip glDisableClientState ; inline
 
 : words>values ( word/value-seq -- value-seq )
-    [ ?execute ] map ;
+    [ dup word? [ execute( -- x ) ] when ] map ;
 
 : (all-enabled) ( seq quot -- )
     [ dup [ glEnable ] each ] dip

diff --git a/basis/unicode/breaks/breaks.factor b/basis/unicode/breaks/breaks.factor
index ff1cf80934e4ffaf70be511ab6b44aaa321da41b..8d8f7c01305ea3de65a0e8f79476a9820c52cdb5 100644 (file)
--- a/basis/unicode/breaks/breaks.factor
+++ b/basis/unicode/breaks/breaks.factor
@@ -73,7 +73,8 @@ SYMBOL: table
 : finish-table ( -- table )
     table get [ [ 1 = ] map ] map ;
 
-: eval-seq ( seq -- seq ) [ ?execute ] map ;
+: eval-seq ( seq -- seq )
+    [ dup word? [ execute( -- x ) ] when ] map ;
 
 : (set-table) ( class1 class2 val -- )
     [ table get nth ] dip '[ _ or ] change-nth ;

diff --git a/core/kernel/kernel.factor b/core/kernel/kernel.factor
index e80cc551243eb4c11c3810478bae241b4488967c..72b1c59d1be120ac28775bb00a997c062c28ff85 100644 (file)
--- a/core/kernel/kernel.factor
+++ b/core/kernel/kernel.factor
@@ -21,10 +21,6 @@ GENERIC: call ( callable -- )
 
 GENERIC: execute ( word -- )
 
-GENERIC: ?execute ( word -- value )
-
-M: object ?execute ;
-
 DEFER: if
 
 : ? ( ? true false -- true/false )

diff --git a/core/words/words.factor b/core/words/words.factor
index 11cf910be307b63115d0aa403ded038861c3a537..7110cb24e58f766fe69410a51e5556fd9c3178f8 100644 (file)
--- a/core/words/words.factor
+++ b/core/words/words.factor
@@ -24,8 +24,6 @@ SYMBOL: last-word-symbol
 
 M: word execute (execute) ;
 
-M: word ?execute execute( -- value ) ; inline
-
 M: word <=>
     [ [ name>> ] [ vocabulary>> ] bi 2array ] compare ;