From 3c95a5a3ea068a6ae348aec7566e6a52b76acf24 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 3 Dec 2007 19:29:16 -0500 Subject: [PATCH] Fix map>assoc where the input is a specialized array --- core/assocs/assocs-tests.factor | 6 ++++++ core/assocs/assocs.factor | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/assocs/assocs-tests.factor b/core/assocs/assocs-tests.factor index b38ce82052..8fabee06ef 100644 --- a/core/assocs/assocs-tests.factor +++ b/core/assocs/assocs-tests.factor @@ -87,3 +87,9 @@ unit-test [ H{ { 1 2 } { 3 4 } } ] [ "hi" 5 H{ { 1 2 } { 3 4 } } clone [ rename-at ] keep ] unit-test + +[ + H{ { 1.0 1.0 } { 2.0 2.0 } } +] [ + F{ 1.0 2.0 } [ dup ] H{ } map>assoc +] unit-test diff --git a/core/assocs/assocs.factor b/core/assocs/assocs.factor index 272a763b7b..40b35a931b 100644 --- a/core/assocs/assocs.factor +++ b/core/assocs/assocs.factor @@ -135,7 +135,7 @@ M: assoc assoc-clone-like ( assoc exemplar -- newassoc ) [ 0 or + ] change-at ; : map>assoc ( seq quot exemplar -- assoc ) - >r [ 2array ] compose map r> assoc-like ; inline + >r [ 2array ] compose { } map-as r> assoc-like ; inline M: assoc >alist [ 2array ] { } assoc>map ;