From b6c2a8593153d9131457d91f4363a821987ffc8a Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Fri, 5 Sep 2008 19:54:05 -0500
Subject: [PATCH 1/3] Remove shuffle word, rename shuffle* to shuffle
---
basis/compiler/generator/registers/registers.factor | 2 +-
basis/stack-checker/known-words/known-words.factor | 2 +-
core/effects/effects.factor | 3 ---
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/basis/compiler/generator/registers/registers.factor b/basis/compiler/generator/registers/registers.factor
index e460f5558b..e909db3f83 100755
--- 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 1c25df4112..80e888a3e9 100755
--- 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 2e0aa4c279..27e6328587 100755
--- 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 ;
From 161c27a30208427c3e22b820b51eb90836fc3bb7 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Fri, 5 Sep 2008 19:55:28 -0500
Subject: [PATCH 2/3] Tweak interactive-vocabs
---
core/parser/parser.factor | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/core/parser/parser.factor b/core/parser/parser.factor
index 487d75cc6c..454c8be6e9 100755
--- a/core/parser/parser.factor
+++ b/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"
From eff021be6581483f5588e7bf750cfedec964a6e9 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Fri, 5 Sep 2008 20:10:47 -0500
Subject: [PATCH 3/3] Add inline declaration
---
core/sequences/sequences.factor | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor
index 32671fc7f0..b7f36eb071 100755
--- a/core/sequences/sequences.factor
+++ b/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