From f3e1dc5b98e70a6ab2dad38184fa36245ad6b96e Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Wed, 25 Apr 2012 13:18:21 -0700 Subject: [PATCH] Use "map-sum" instead of "map sum". --- basis/wrap/words/words.factor | 2 +- extra/project-euler/151/151.factor | 2 +- unmaintained/4DNav/turtle/turtle.factor | 2 +- unmaintained/peg-lexer/peg-lexer.factor | 2 +- unmaintained/pos/pos.factor | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/basis/wrap/words/words.factor b/basis/wrap/words/words.factor index 8a2df38e36..303876d916 100644 --- a/basis/wrap/words/words.factor +++ b/basis/wrap/words/words.factor @@ -9,7 +9,7 @@ C: word > ] map sum ; + [ width>> ] map-sum ; : make-element ( whites blacks -- element ) [ append ] [ [ words-length ] bi@ ] 2bi ; diff --git a/extra/project-euler/151/151.factor b/extra/project-euler/151/151.factor index b8db55e886..1c5ee22b75 100644 --- a/extra/project-euler/151/151.factor +++ b/extra/project-euler/151/151.factor @@ -62,7 +62,7 @@ DEFER: (euler151) { { 0 0 1 0 } [ { 0 0 0 1 } (euler151) 1 + ] } { { 0 1 0 0 } [ { 0 0 1 1 } (euler151) 1 + ] } { { 1 0 0 0 } [ { 0 1 1 1 } (euler151) 1 + ] } - [ [ dup length iota [ pick-sheet ] with map sum ] [ sum ] bi / ] + [ [ dup length iota [ pick-sheet ] with map-sum ] [ sum ] bi / ] } case ] cache ; : euler151 ( -- answer ) diff --git a/unmaintained/4DNav/turtle/turtle.factor b/unmaintained/4DNav/turtle/turtle.factor index 71f7f26185..c964c81609 100644 --- a/unmaintained/4DNav/turtle/turtle.factor +++ b/unmaintained/4DNav/turtle/turtle.factor @@ -119,7 +119,7 @@ TUPLE: observer < turtle projection-mode collision-mode ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! : distance ( turtle turtle -- n ) - pos>> swap pos>> v- [ sq ] map sum sqrt ; + pos>> swap pos>> v- [ sq ] map-sum sqrt ; : move-by ( point -- ) turtle-pos> v+ >turtle-pos ; diff --git a/unmaintained/peg-lexer/peg-lexer.factor b/unmaintained/peg-lexer/peg-lexer.factor index 56dda70bdd..9400a455b4 100644 --- a/unmaintained/peg-lexer/peg-lexer.factor +++ b/unmaintained/peg-lexer/peg-lexer.factor @@ -25,7 +25,7 @@ M: lex-hash set-at [ swap hash>> set-at ] } case ; -:: at-pos ( t l c -- p ) t l head-slice [ length ] map sum l 1 - + c + ; +:: at-pos ( t l c -- p ) t l head-slice [ length ] map-sum l 1 - + c + ; M: lex-hash at* swap { diff --git a/unmaintained/pos/pos.factor b/unmaintained/pos/pos.factor index 38eb8dec96..94c4eada01 100644 --- a/unmaintained/pos/pos.factor +++ b/unmaintained/pos/pos.factor @@ -16,7 +16,7 @@ C: pos ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -: distance ( pos pos -- n ) val>> swap val>> v- [ sq ] map sum sqrt ; +: distance ( pos pos -- n ) val>> swap val>> v- [ sq ] map-sum sqrt ; : move-by ( point -- ) pos> v+ >pos ;