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

basis/compiler/generator/registers/registers.factor

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

basis/stack-checker/known-words/known-words.factor

@@ -47,7 +47,7 @@ IN: stack-checker.known-words
 
 : infer-shuffle ( 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
     #shuffle, ;
 

core/effects/effects.factor

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

core/parser/parser.factor

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

core/sequences/sequences.factor

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