Remove shuffle word, rename shuffle* to shuffle

diff --git a/basis/compiler/generator/registers/registers.factor b/basis/compiler/generator/registers/registers.factor
index e460f5558b610380e37272b33176e9127a3fc1c9..e909db3f8341f8b5c2b1a1defda1a0c5e4e261ee 100755 (executable)
--- a/basis/compiler/generator/registers/registers.factor
+++ b/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

diff --git a/basis/stack-checker/known-words/known-words.factor b/basis/stack-checker/known-words/known-words.factor
index 1c25df41120408c364c694cb0e58003eaab5a21d..80e888a3e9994983a4e6800c60d908616ddecfa6 100755 (executable)
--- a/basis/stack-checker/known-words/known-words.factor
+++ b/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, ;
 

diff --git a/core/effects/effects.factor b/core/effects/effects.factor
index 2e0aa4c2796753f9db8513d87e5b75670a8da115..27e63285876777fca18ef655ded972043d5ce5ce 100755 (executable)
--- a/core/effects/effects.factor
+++ b/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 ;