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

Move unicode.data:replace to sequences.lib and refactor it

db4
Slava Pestov 2008-02-14 20:38:46 -06:00
parent 1c63a443a3
commit d77c84be19
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extra/sequences/lib/lib.factor
View File

@ -205,3 +205,6 @@ PRIVATE>
: attempt-each ( seq quot -- result ) : attempt-each ( seq quot -- result )
(each) iterate-prep (attempt-each-integer) ; inline (each) iterate-prep (attempt-each-integer) ; inline
: replace ( seq old new -- newseq )
[ pick pick = [ 2nip ] [ 2drop ] if ] 2curry map ;

4
extra/tools/disassembler/disassembler.factor
View File

@ -2,7 +2,7 @@
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: io.files io words alien kernel math.parser alien.syntax USING: io.files io words alien kernel math.parser alien.syntax
io.launcher system assocs arrays sequences namespaces qualified io.launcher system assocs arrays sequences namespaces qualified
regexp system math ; regexp system math sequences.lib ;
QUALIFIED: unix QUALIFIED: unix
IN: tools.disassembler IN: tools.disassembler
@ -36,7 +36,7 @@ M: pair make-disassemble-cmd
R/ 0x.*:.*/ matches? ; R/ 0x.*:.*/ matches? ;
: tabs>spaces ( str -- str' ) : tabs>spaces ( str -- str' )
[ dup CHAR: \t = [ drop CHAR: \s ] when ] map ; CHAR: \t CHAR: \s replace ;
: disassemble ( word -- ) : disassemble ( word -- )
make-disassemble-cmd run-gdb make-disassemble-cmd run-gdb

10
extra/unicode/data/data.factor
View File

@ -1,6 +1,7 @@
USING: assocs math kernel sequences io.files hashtables USING: assocs math kernel sequences sequences.lib io.files
quotations splitting arrays math.parser combinators.lib hash2 hashtables quotations splitting arrays math.parser
byte-arrays words namespaces words compiler.units parser ; combinators.lib hash2 byte-arrays words namespaces words
compiler.units parser ;
IN: unicode.data IN: unicode.data
<< <<
@ -93,9 +94,6 @@ IN: unicode.data
: ascii-lower ( string -- lower ) : ascii-lower ( string -- lower )
[ dup CHAR: A CHAR: Z between? [ HEX: 20 + ] when ] map ; [ dup CHAR: A CHAR: Z between? [ HEX: 20 + ] when ] map ;
: replace ( seq old new -- newseq )
swap rot [ 2dup = [ drop over ] when ] map 2nip ;
: process-names ( data -- names-hash ) : process-names ( data -- names-hash )
1 swap (process-data) 1 swap (process-data)
[ ascii-lower CHAR: \s CHAR: - replace swap ] assoc-map [ ascii-lower CHAR: \s CHAR: - replace swap ] assoc-map