Get everything in contrib/ to load

diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index d02a965f088b60c5bd5048a1e28f7044810818c0..9546763001f69f76429bf0e386a927f37276141e 100644 (file)
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -1,11 +1,6 @@
-+ allot refactoring:
-
-- sometimes fep when closing window
-- mov 0x0(%esi),%ecx  why?
-- %allot-bignum-signed-2 is broken on both platforms
-
 + ui:
 
+- sometimes fep when closing window
 - windows rollover broken again
 - docs: don't pass volatile aliens to callbacks
 - live search: timer delay would be nice
@@ -44,6 +39,7 @@
 
 + compiler/ffi:
 
+- %allot-bignum-signed-2 is broken on both platforms
 - callback scheduling issue
 - amd64 structs-by-value bug
 - intrinsic fixnum>float float>fixnum fixnum>bignum bignum>fixnum

diff --git a/contrib/boids.factor b/contrib/boids.factor
index 24d62256d66c84e9a2f81bcf1f6c4b3e833be61c..45b789f3e94a16e51897cd4b8ae06a8080fa670c 100644 (file)
--- a/contrib/boids.factor
+++ b/contrib/boids.factor
@@ -100,7 +100,7 @@ over boid-vel -rot relative-position angle-between ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: vsum ( vector-of-vectors --- vec ) { 0 0 } [ v+ ] reduce ;
+: vsum ( vector-of-vectors -- vec ) { 0 0 } [ v+ ] reduce ;
 
 : vaverage ( seq-of-vectors -- seq ) dup vsum swap length v/n ;
 

diff --git a/contrib/coroutines.factor b/contrib/coroutines.factor
index dac41065fcecca21afacab9b9ed1ab6919283c72..10aa89fe519f0a9411964ce9001e399fc74a23ea 100644 (file)
--- a/contrib/coroutines.factor
+++ b/contrib/coroutines.factor
@@ -26,7 +26,7 @@ USING: kernel generic ;
 
 TUPLE: coroutine resumecc exitcc ;
 
-: cocreate ( quot - co )
+: cocreate ( quot -- co )
   #! Create a new coroutine, which will execute the quotation
   #! when resumed. The quotation will have the coroutine
   #! on the stack and an initial value (received from coresume)

diff --git a/contrib/json/json-reader.factor b/contrib/json/json-reader.factor
index 376710ddd4b1704ea151466c2b5a354087a6f294..3e893167130decb45b29145b758444a57767e682 100644 (file)
--- a/contrib/json/json-reader.factor
+++ b/contrib/json/json-reader.factor
@@ -27,10 +27,10 @@ IN: json
 ! Grammar for JSON from RFC 4627
 USE: tools
 
-: [<&>] ( quot - quot )
+: [<&>] ( quot -- quot )
   { } make unclip [ <&> ] reduce ;
 
-: [<|>] ( quot - quot )
+: [<|>] ( quot -- quot )
   { } make unclip [ <|> ] reduce ;
 
 LAZY: 'ws' ( -- parser )

diff --git a/contrib/serialize/serialize.factor b/contrib/serialize/serialize.factor
index 04e83e54da50119763e6b5faaca6a33229c9ad9e..d4cb6127d8f8bb3b5c94c1bbe2feb5892d246fe9 100644 (file)
--- a/contrib/serialize/serialize.factor
+++ b/contrib/serialize/serialize.factor
@@ -193,7 +193,7 @@ DEFER: deserialize ( -- obj )
 
 : deserialize-tuple ( -- array )
   deserialize 
-  deserialize array>tuple
+  deserialize >tuple
   [ intern-object ] keep ;
 
 : deserialize-byte-array ( -- byte-array )

diff --git a/library/compiler/alien/primitive-types.factor b/library/compiler/alien/primitive-types.factor
index aa9588ce88030f07cfcc6dc3ce3e8716baf3fb49..b7a07d722d7b21b2716c501204dcd423afb3829e 100644 (file)
--- a/library/compiler/alien/primitive-types.factor
+++ b/library/compiler/alien/primitive-types.factor
@@ -77,6 +77,15 @@ bootstrap-cell
 "unbox_unsigned_1"
 "uchar" define-primitive-type
 
+! This is a hack; we need better ways of handling arrays
+! inline structs
+[ swap <displaced-alien> alien>char-string ]
+[ swap <displaced-alien> swap set-alien-unsigned-1 ]
+1
+f
+f
+"char[]" define-primitive-type
+
 [ alien-unsigned-4 zero? not ]
 [ 1 0 ? set-alien-unsigned-4 ]
 4