From 01f20cf32d664743d4e86a5f45e364b4dedc0cee Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Tue, 6 May 2008 12:36:49 -0500 Subject: [PATCH] update core to use butlast, butlast-slice --- core/classes/tuple/tuple.factor | 2 +- core/inference/transforms/transforms.factor | 2 +- core/prettyprint/prettyprint-tests.factor | 2 +- core/prettyprint/sections/sections.factor | 2 +- core/splitting/splitting.factor | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/classes/tuple/tuple.factor b/core/classes/tuple/tuple.factor index ee7ff8c608..fb6f1ffba0 100755 --- a/core/classes/tuple/tuple.factor +++ b/core/classes/tuple/tuple.factor @@ -102,7 +102,7 @@ ERROR: bad-superclass class ; dup tuple-predicate-quot define-predicate ; : superclass-size ( class -- n ) - superclasses 1 head-slice* + superclasses butlast-slice [ slot-names length ] map sum ; : generate-tuple-slots ( class slots -- slot-specs ) diff --git a/core/inference/transforms/transforms.factor b/core/inference/transforms/transforms.factor index 624dcbbf98..cf3dcadd75 100755 --- a/core/inference/transforms/transforms.factor +++ b/core/inference/transforms/transforms.factor @@ -32,7 +32,7 @@ IN: inference.transforms drop [ no-case ] ] [ dup peek quotation? [ - dup peek swap 1 head* + dup peek swap butlast ] [ [ no-case ] swap ] if case>quot diff --git a/core/prettyprint/prettyprint-tests.factor b/core/prettyprint/prettyprint-tests.factor index e94670992c..834cad5b29 100755 --- a/core/prettyprint/prettyprint-tests.factor +++ b/core/prettyprint/prettyprint-tests.factor @@ -114,7 +114,7 @@ unit-test [ parse-fresh drop ] with-compilation-unit [ "prettyprint.tests" lookup see - ] with-string-writer "\n" split 1 head* + ] with-string-writer "\n" split butlast ] keep = ] with-scope ; diff --git a/core/prettyprint/sections/sections.factor b/core/prettyprint/sections/sections.factor index 5f32539115..0ce8841256 100644 --- a/core/prettyprint/sections/sections.factor +++ b/core/prettyprint/sections/sections.factor @@ -284,7 +284,7 @@ M: colon unindent-first-line? drop t ; ! Long section layout algorithm : chop-break ( seq -- seq ) - dup peek line-break? [ 1 head-slice* chop-break ] when ; + dup peek line-break? [ butlast-slice chop-break ] when ; SYMBOL: prev SYMBOL: next diff --git a/core/splitting/splitting.factor b/core/splitting/splitting.factor index 62c5121e50..be0652fd98 100755 --- a/core/splitting/splitting.factor +++ b/core/splitting/splitting.factor @@ -104,7 +104,7 @@ M: sliced-clumps nth group@ ; 1array ] [ "\n" split [ - 1 head-slice* [ + butlast-slice [ "\r" ?tail drop "\r" split ] map ] keep peek "\r" split suffix concat