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

namespaces.extras: Try to use generate-vocab.

modern-harvey2
Doug Coleman 2017-11-22 22:32:16 -06:00
parent c73541919c
commit 9eecd977c9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extra/namespaces/extras/extras.factor
View File

@ -4,7 +4,8 @@ USING: accessors assocs assocs.extras combinators
combinators.extras continuations effects.parser formatting fry combinators.extras continuations effects.parser formatting fry
generalizations interpolate io.streams.string kernel make generalizations interpolate io.streams.string kernel make
math.parser namespaces parser quotations sequences math.parser namespaces parser quotations sequences
sequences.generalizations unicode vocabs.parser words ; sequences.generalizations unicode vocabs.generated vocabs.parser
words ;
QUALIFIED: sets QUALIFIED: sets
IN: namespaces.extras IN: namespaces.extras
@ -49,7 +50,7 @@ ERROR: not-all-unique seq ;
! make FROM: vocab => word ; for each input argument ! make FROM: vocab => word ; for each input argument
nip in>> length nip in>> length
[ [
dup '[ [ _ _ narray functor-instantiated-vocab-name "IN: " prepend ] _ nkeep ] dup '[ [ _ _ narray functor-instantiated-vocab-name ] _ nkeep ]
] [ ] [
[ [
[ [
@ -59,13 +60,13 @@ ERROR: not-all-unique seq ;
] replicate ] replicate
] [ ] tri dup ] [ ] tri dup
! Make the FROM: list and keep the input arguments ! Make the FROM: list and keep the input arguments
'[ [ @ _ spread _ narray "\n" join "\n" glue ] _ nkeep ] '[ [ @ _ spread _ narray "\n" join dupd [ "IN: " prepend ] dip "\n" glue ] _ nkeep ]
] [ ] [
[ drop ] 2dip [ drop ] 2dip
! append the IN: and the FROM: quot generator and the functor code ! append the IN: and the FROM: quot generator and the functor code
[ [
append append
'[ @ <string-reader> "functor" parse-stream drop ] '[ @ '[ _ <string-reader> "functor" parse-stream drop ] generate-vocab drop ]
] dip ] dip
] 3tri ; ] 3tri ;
@ -83,6 +84,7 @@ ERROR: not-all-unique seq ;
swap swap
make-in-drop-variables make-in-drop-variables
prepend-input-vocabs prepend-input-vocabs
! word quot effect
[ [
[ functor-definer-word-name create-new-word-in ] 2dip [ functor-definer-word-name create-new-word-in ] 2dip
define-declared define-declared