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

Merge branch 'master' of git://factorcode.org/git/factor

db4
Doug Coleman 2008-09-05 20:14:49 -05:00
parent 7bcdf16a71 d7709d33c4
commit eb5710e009
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/compiler/generator/registers/registers.factor
View File

@ -647,7 +647,7 @@ UNION: immediate fixnum POSTPONE: f ;
: phantom-shuffle ( shuffle -- ) : phantom-shuffle ( shuffle -- )
[ in>> length phantom-datastack get phantom-input ] keep [ in>> length phantom-datastack get phantom-input ] keep
shuffle* phantom-datastack get phantom-append ; shuffle phantom-datastack get phantom-append ;
: phantom->r ( n -- ) : phantom->r ( n -- )
phantom-datastack get phantom-input phantom-datastack get phantom-input

2
basis/stack-checker/known-words/known-words.factor
View File

@ -47,7 +47,7 @@ IN: stack-checker.known-words
: infer-shuffle ( shuffle -- ) : infer-shuffle ( shuffle -- )
[ in>> length consume-d ] keep ! inputs shuffle [ in>> length consume-d ] keep ! inputs shuffle
[ drop ] [ shuffle* dup copy-values dup output-d ] 2bi ! inputs outputs copies [ drop ] [ shuffle dup copy-values dup output-d ] 2bi ! inputs outputs copies
[ nip ] [ swap zip ] 2bi ! inputs copies mapping [ nip ] [ swap zip ] 2bi ! inputs copies mapping
#shuffle, ; #shuffle, ;

3
core/effects/effects.factor
View File

@ -67,6 +67,3 @@ M: effect clone
: shuffle* ( stack shuffle -- newstack ) : shuffle* ( stack shuffle -- newstack )
[ [ load-shuffle ] keep shuffled-values ] with-scope ; [ [ load-shuffle ] keep shuffled-values ] with-scope ;
: shuffle ( stack shuffle -- newstack )
[ split-shuffle ] keep shuffle* append ;

4
core/parser/parser.factor
View File

@ -161,12 +161,13 @@ SYMBOL: interactive-vocabs
"arrays" "arrays"
"assocs" "assocs"
"combinators" "combinators"
"compiler"
"compiler.errors" "compiler.errors"
"compiler.units"
"continuations" "continuations"
"debugger" "debugger"
"definitions" "definitions"
"editors" "editors"
"generic"
"help" "help"
"inspector" "inspector"
"io" "io"
@ -174,6 +175,7 @@ SYMBOL: interactive-vocabs
"kernel" "kernel"
"listener" "listener"
"math" "math"
"math.order"
"memory" "memory"
"namespaces" "namespaces"
"prettyprint" "prettyprint"

2
core/sequences/sequences.factor
View File

@ -763,7 +763,7 @@ PRIVATE>
over [ trim-right-slice ] dip like ; inline over [ trim-right-slice ] dip like ; inline
: trim-slice ( seq quot -- slice ) : trim-slice ( seq quot -- slice )
[ trim-left-slice ] [ trim-right-slice ] bi ; [ trim-left-slice ] [ trim-right-slice ] bi ; inline
: trim ( seq quot -- newseq ) : trim ( seq quot -- newseq )
over [ trim-slice ] dip like ; inline over [ trim-slice ] dip like ; inline