Fix track resizing, minor code simplifications

diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index 30814646ff444e9071c26db34640a52eadcc23a9..f669f883c11bb9f28c598a668de92070cbbe6dc0 100644 (file)
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -2,7 +2,10 @@
 
 - inline float allocation needs a gc check
 - docs: don't pass volatile aliens to callbacks
-- some instability remains
+- windows rollover broken again
+- intrinsic fixnum>float float>fixnum
+- amd64 structs-by-value bug
+- callback scheduling issue
 
 + ui:
 

diff --git a/library/collections/namespaces.factor b/library/collections/namespaces.factor
index 6bbd88f69cd199eb0e4ef0d274c631f2dbe65eb8..4534ee0d58f51e66dac590412f1e1def8cad01c2 100644 (file)
--- a/library/collections/namespaces.factor
+++ b/library/collections/namespaces.factor
@@ -58,7 +58,7 @@ SYMBOL: building
 
 : # ( n -- ) number>string % ;
 
-: init-namespaces ( -- ) global 1array >vector set-namestack ;
+: init-namespaces ( -- ) global 1array set-namestack ;
 
 IN: sequences
 

diff --git a/library/compiler/test/callbacks.factor b/library/compiler/test/callbacks.factor
index 738dff05c26c9a4c4afb4c3957c5df83ee016d19..cda0f4fc6bb673f3a468d6c1b66957a5371a3dd3 100644 (file)
--- a/library/compiler/test/callbacks.factor
+++ b/library/compiler/test/callbacks.factor
@@ -53,6 +53,8 @@ kernel-internals math memory namespaces test threads ;
 
 [ 1 2 3 ] [ callback-7 callback_test_1 1 2 3 ] unit-test
 
+[ f ] [ namespace global eq? ] unit-test
+
 : callback-8
     "void" { "int" "int" } [ / "x" set ] alien-callback ;
 

diff --git a/library/ui/layouts.factor b/library/ui/layouts.factor
index 52ea441e97cc8deecae3d9ab5d3571a7de3fd569..ff738ad09c04e901c0835fa2609cb83d3df26650 100644 (file)
--- a/library/ui/layouts.factor
+++ b/library/ui/layouts.factor
@@ -114,7 +114,8 @@ TUPLE: pack align fill gap ;
 
 : round-dims ( seq -- newseq )
     { 0 0 } swap
-    [ swap v- dup [ ceiling ] map [ swap v- ] keep ] map nip ;
+    [ swap v- dup [ ceiling >fixnum ] map [ swap v- ] keep ] map
+    nip ;
 
 : pack-layout ( gadget sizes -- )
     round-dims over gadget-children

diff --git a/library/ui/paint.factor b/library/ui/paint.factor
index b2c786d8b0ae6f55e8c322921b237d81cd820f2d..db3b1f5e6666ec318890a732480ee08ed5771484 100644 (file)
--- a/library/ui/paint.factor
+++ b/library/ui/paint.factor
@@ -48,8 +48,8 @@ DEFER: draw-gadget
     >absolute clip [ rect-intersect ] change ;
 
 : clip-x/y ( loc dim -- x y )
-    >r [ first ] keep r>
-    [ second ] 2apply + world get rect-dim second swap - ;
+    >r [ first ] keep r> [ second ] 2apply +
+    world get rect-dim second swap - ;
 
 : gl-set-clip ( loc dim -- )
     [ clip-x/y ] keep first2 glScissor ;