steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Today's special: broiled tuples and hashtables

db4
Eduardo Cavazos 2008-09-07 02:06:55 -05:00
parent fcd70b1560
commit b755bcbdd7
1 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
basis/locals/locals.factor
View File

@ -1,7 +1,7 @@
! Copyright (C) 2007, 2008 Slava Pestov, Eduardo Cavazos. ! Copyright (C) 2007, 2008 Slava Pestov, Eduardo Cavazos.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: kernel namespaces sequences sequences.private assocs math USING: kernel namespaces sequences sequences.private assocs math
vectors strings generalizations vectors strings classes.tuple generalizations
parser words quotations debugger macros arrays macros splitting parser words quotations debugger macros arrays macros splitting
combinators prettyprint.backend definitions prettyprint combinators prettyprint.backend definitions prettyprint
hashtables prettyprint.sections sets sequences.private effects hashtables prettyprint.sections sets sequences.private effects
@ -205,15 +205,19 @@ M: object local-rewrite* , ;
! Broil is used to support locals in literals ! Broil is used to support locals in literals
DEFER: [broil] DEFER: [broil]
DEFER: [broil-hashtable]
DEFER: [broil-tuple]
: broil-element ( obj -- quot ) : broil-element ( obj -- quot )
{ {
{ [ dup number? ] [ 1quotation ] } { [ dup number? ] [ 1quotation ] }
{ [ dup string? ] [ 1quotation ] } { [ dup string? ] [ 1quotation ] }
{ [ dup sequence? ] [ [broil] ] } { [ dup sequence? ] [ [broil] ] }
{ [ dup local? ] [ 1quotation ] } { [ dup hashtable? ] [ [broil-hashtable] ] }
{ [ dup word? ] [ literalize 1quotation ] } { [ dup tuple? ] [ [broil-tuple] ] }
{ [ t ] [ 1quotation ] } { [ dup local? ] [ 1quotation ] }
{ [ dup word? ] [ literalize 1quotation ] }
{ [ t ] [ 1quotation ] }
} }
cond ; cond ;
@ -226,11 +230,33 @@ DEFER: [broil]
MACRO: broil ( seq -- quot ) [broil] ; MACRO: broil ( seq -- quot ) [broil] ;
: [broil-hashtable] ( hashtable -- quot )
>alist
[ [ broil-element ] map concat >quotation ]
[ length ]
[ ]
tri
[ nsequence >hashtable ] curry curry compose ;
MACRO: broil-hashtable ( hashtable -- quot ) [broil-hashtable] ;
: [broil-tuple] ( tuple -- quot )
tuple>array
[ [ broil-element ] map concat >quotation ]
[ length ]
[ ]
tri
[ nsequence >tuple ] curry curry compose ;
MACRO: broil-tuple ( tuple -- quot ) [broil-tuple] ;
! Engage broil on arrays and vectors. Can't do it on 'sequence' ! Engage broil on arrays and vectors. Can't do it on 'sequence'
! because that will pick up strings and integers. What do do... ! because that will pick up strings and integers. What do do...
M: array local-rewrite* ( array -- ) [broil] % ; M: array local-rewrite* ( array -- ) [broil] % ;
M: vector local-rewrite* ( vector -- ) [broil] % ; M: vector local-rewrite* ( vector -- ) [broil] % ;
M: tuple local-rewrite* ( tuple -- ) [broil-tuple] % ;
M: hashtable local-rewrite* ( hashtable -- ) [broil-hashtable] % ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!