fix bug in ^

diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index 0e8b8a6c1bd9e56bf9fbca594e8ba93a86e39ead..6f081e82ef54bbe65bba13c30c8692e76fef060a 100644 (file)
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -25,4 +25,3 @@
 - if two tasks write to a unix stream, the buffer can overflow
 - font problem: http://iarc1.ece.utexas.edu/~erg/font-bug.JPG
 - make 3.4 bits>double an error
-- float>bits bits>double etc fail in gcc 4.0.3 with -fschedule-insns

diff --git a/library/math/pow.factor b/library/math/pow.factor
index f709ea29f46c087b2c317ab1ec329505a5860720..c09b7193fec6c8bd550b5900b50495a7df38a6ea 100644 (file)
--- a/library/math/pow.factor
+++ b/library/math/pow.factor
@@ -19,8 +19,18 @@ GENERIC: ^ ( z w -- z^w ) foldable
 : ^theta ( w abs arg -- theta )
     >r >r >rect r> flog * swap r> * + ; inline
 
+: 0^0 "0^0 is not defined" throw ;
+
+: 0^ ( z w -- )
+    dup 0 number= [
+        2drop 0.0/0.0
+    ] [
+        0 < [ drop 1.0/0.0 ] when
+    ] if ;
+
 M: number ^ ( z w -- z^w )
-    swap >polar 3dup ^theta >r ^mag r> polar> ;
+    over 0 number=
+    [ 0^ ] [ swap >polar 3dup ^theta >r ^mag r> polar> ] if ;
 
 : each-bit ( n quot -- | quot: 0/1 -- )
     over 0 number= pick -1 number= or [
@@ -34,11 +44,8 @@ M: number ^ ( z w -- z^w )
     inline
 
 M: integer ^ ( z w -- z^w )
-    over 0 number= over 0 number= and [
-        "0^0 is not defined" throw
-    ] [
-        dup 0 < [ neg ^ recip ] [ (integer^) ] if
-    ] if ;
+    over 0 number=
+    [ 0^ ] [ dup 0 < [ neg ^ recip ] [ (integer^) ] if ] if ;
 
 : power-of-2? ( n -- ? )
     dup 0 > [

diff --git a/library/test/math/irrational.factor b/library/test/math/irrational.factor
index dadd2b2e171809c90a23634863c37e1528d4f548..c614bb02154a74cb0f855822314b52a6384589ba 100644 (file)
--- a/library/test/math/irrational.factor
+++ b/library/test/math/irrational.factor
@@ -17,6 +17,13 @@ USE: test
 [ t ] [ e pi i * ^ real -1.0 = ] unit-test
 [ t ] [ e pi i * ^ imaginary -0.00001 0.00001 between? ] unit-test
 
+[ 0.0/0.0 ] [ 0 0 ^ ] unit-test
+[ 1.0/0.0 ] [ 0 -2 ^ ] unit-test
+[ 0.0/0.0 ] [ 0 0.0 ^ ] unit-test
+[ 1.0/0.0 ] [ 0 -2.0 ^ ] unit-test
+[ 0 ] [ 0 3.0 ^ ] unit-test
+[ 0 ] [ 0 3 ^ ] unit-test
+
 [ 1.0 ] [ 0 cosh ] unit-test
 [ 0.0 ] [ 1 acosh ] unit-test
             

diff --git a/library/ui/commands.factor b/library/ui/commands.factor
index 3f80677cc9f2fc460fa164fc291139ab3f465d99..edb824e495eb180c397a78bc350c745b87008596 100644 (file)
--- a/library/ui/commands.factor
+++ b/library/ui/commands.factor
@@ -2,7 +2,7 @@ IN: gadgets-presentations
 USING: compiler gadgets gadgets-buttons gadgets-listener
 gadgets-menus gadgets-panes generic hashtables inference
 inspector io jedit kernel lists namespaces parser prettyprint
-sequences words styles ;
+sequences strings styles words ;
 
 SYMBOL: commands
 
@@ -78,6 +78,8 @@ M: command-button gadget-help ( button -- string )
 "Reload original source" [ word? ] [ reload ] \ in-listener define-command
 "Infer stack effect" [ word? ] [ unit infer . ] \ in-listener define-command
 
+"Use word vocabulary" [ word? ] [ word-vocabulary use+ ] \ in-listener define-command
+
 "Display gadget" [ [ gadget? ] is? ] [ gadget. ] \ in-listener define-command
 
 "Use as input" [ input? ] [ input-string pane get replace-input ] \ call define-default-command