factor: trim using lists

[factor.git] / extra / alien / data / map / map.factor

diff --git a/extra/alien/data/map/map.factor b/extra/alien/data/map/map.factor
index 21a026644ed7ec03e0cb741d657d0381c008e9a5..a7a50f57622b08ed957b69bf25d2a4106449f3e0 100644 (file)
--- a/extra/alien/data/map/map.factor
+++ b/extra/alien/data/map/map.factor
@@ -1,7 +1,9 @@
-! (c)Joe Groff bsd license
-USING: accessors alien alien.c-types alien.data alien.parser arrays
-byte-arrays combinators effects.parser fry generalizations kernel
-lexer locals macros make math math.ranges parser sequences sequences.private ;
+! Copyright (C) 2009, 2010 Joe Groff.
+! See http://factorcode.org/license.txt for BSD license.
+USING: accessors alien alien.arrays alien.c-types alien.data
+alien.parser arrays byte-arrays combinators effects.parser fry
+generalizations grouping kernel make math sequences
+sequences.generalizations sequences.private ;
 FROM: alien.arrays => array-length ;
 IN: alien.data.map
 
@@ -19,8 +21,6 @@ TUPLE: data-map-param
     { iter-length fixnum read-only }
     { iter-count fixnum read-only } ;
 
-ERROR: bad-data-map-param param remainder ;
-
 M: data-map-param length
     iter-count>> ; inline
 
@@ -29,17 +29,19 @@ M: data-map-param nth-unsafe
         [ iter-length>> * >fixnum ]
         [ bytes>> ]
         [ count>> ]
-        [ c-type>> ] 
+        [ c-type>> ]
     } cleave <displaced-direct-array> ; inline
 
 INSTANCE: data-map-param immutable-sequence
 
-: c-type-count ( in/out -- c-type count iter-length )
-    dup array? [ unclip swap array-length >fixnum ] [ 1 ] if
-    2dup swap heap-size * >fixnum ; inline
+: c-type-count ( in/out -- c-type count )
+    dup array? [ unclip swap array-length >fixnum ] [ 1 ] if ; inline
 
-MACRO: >param ( in -- quot: ( array -- param ) )
-    c-type-count '[
+: c-type-iter-length ( c-type count -- iter-length )
+    swap heap-size * >fixnum ; inline
+
+: [>c-type-param] ( c-type count -- quot )
+    2dup c-type-iter-length '[
         [ _ _ ] dip
         [ ]
         [ >c-ptr ]
@@ -49,8 +51,18 @@ MACRO: >param ( in -- quot: ( array -- param ) )
         data-map-param boa
     ] ;
 
-MACRO: alloc-param ( out -- quot: ( len -- param ) )
-    c-type-count dup '[
+: [>object-param] ( class count -- quot )
+    nip '[ _ <groups> ] ;
+
+: [>param] ( type -- quot )
+    c-type-count over c-type-name?
+    [ [>c-type-param] ] [ [>object-param] ] if ;
+
+MACRO: >param ( in -- quot: ( array -- param ) )
+    [>param] ;
+
+: [alloc-c-type-param] ( c-type count -- quot )
+    2dup c-type-iter-length dup '[
         [ _ _ ] dip
         [
             _ * >fixnum [ (byte-array) dup ] keep
@@ -59,11 +71,22 @@ MACRO: alloc-param ( out -- quot: ( len -- param ) )
         data-map-param boa
     ] ;
 
-MACRO: unpack-params ( ins -- )
-    [ c-type-count drop nip '[ _ firstn-unsafe ] ] map '[ _ spread ] ;
+: [alloc-object-param] ( type count -- quot )
+    "Factor sequences as data-map outputs not supported" throw ;
+
+: [alloc-param] ( type -- quot )
+    c-type-count over c-type-name?
+    [ [alloc-c-type-param] ] [ [alloc-object-param] ] if ;
+
+MACRO: alloc-param ( out -- quot: ( len -- param ) )
+    [alloc-param] ;
+
+MACRO: unpack-params ( ins -- quot )
+    [ c-type-count nip '[ _ firstn-unsafe ] ] map '[ _ spread ] ;
 
-MACRO: pack-params ( outs -- )
-    [ ] [ c-type-count drop nip dup [ [ ndip _ ] dip set-firstn ] 3curry ] reduce
+MACRO: pack-params ( outs -- quot )
+    [ ] [ c-type-count nip dup
+    [ [ ndip POSTPONE: _ ] dip set-firstn ] 3curry ] reduce
     fry [ call ] compose ;
 
 :: [data-map] ( ins outs param-quot -- quot )
@@ -83,7 +106,7 @@ MACRO: pack-params ( outs -- )
         [ orig>> ] , #outs , \ napply ,
     ] [ ] make fry \ call suffix ;
 
-MACRO: data-map ( ins outs -- )
+MACRO: data-map ( ins outs -- quot )
     2dup
     [
         [ [ '[ _ >param ] ] map '[ _ spread ] ]
@@ -92,19 +115,18 @@ MACRO: data-map ( ins outs -- )
     [ [ '[ _ alloc-param ] ] map '[ _ cleave ] ] bi* compose
     [data-map] ;
 
-MACRO: data-map! ( ins outs -- )
+MACRO: data-map! ( ins outs -- quot )
     2dup append [ '[ _ >param ] ] map '[ _ spread ] [data-map] ;
 
 : parse-data-map-effect ( accum -- accum )
     ")" parse-effect
-    [ in>>  [ parse-c-type ] map parsed ]
-    [ out>> [ parse-c-type ] map parsed ] bi ;
+    [ in>>  [ (parse-c-type) ] map suffix! ]
+    [ out>> [ (parse-c-type) ] map suffix! ] bi ;
 
 PRIVATE>
 
 SYNTAX: data-map(
-    parse-data-map-effect \ data-map parsed ;
+    parse-data-map-effect \ data-map suffix! ;
 
 SYNTAX: data-map!(
-    parse-data-map-effect \ data-map! parsed ;
-
+    parse-data-map-effect \ data-map! suffix! ;