literals: change ${ } to be the executable code arrays.

diff --git a/basis/literals/literals-tests.factor b/basis/literals/literals-tests.factor
index 4357198db6e45a68c2372d0a9e7e6612bca764b3..b6c76e86ba99cd94db024cfe012065eb5d363460 100644 (file)
--- a/basis/literals/literals-tests.factor
+++ b/basis/literals/literals-tests.factor
@@ -23,6 +23,11 @@ IN: literals.tests
 CONSTANT: constant-a 3
 
 [ { 3 10 "ftw" } ] [ ${ constant-a 10 "ftw" } ] unit-test
+{ { 4 } } [ ${ 1 constant-a + } ] unit-test
+{ { 3 } } [ ${ 1 2 + } ] unit-test
+{ { 1 2 \ + } } [ ${ 1 2 \ + } ] unit-test
+{ { 4 } } [ ${ 1 2 + 1 + } ] unit-test
+{ { 1 3 } } [ ${ 1 2 1 + } ] unit-test
 
 : sixty-nine ( -- a b ) 6 9 ;
 

diff --git a/basis/literals/literals.factor b/basis/literals/literals.factor
index 42a7ab9668a68dc2fb5912d28a6c3b4f56f0a83b..59fca6d90379ef229c5424e980ea6029f772bac8 100644 (file)
--- a/basis/literals/literals.factor
+++ b/basis/literals/literals.factor
@@ -17,7 +17,7 @@ IN: literals
     ] with-datastack ;
 
 : expand-literals ( seq -- seq' )
-    [ [ { } ] dip expand-literal ] map concat ;
+    { } [ expand-literal ] reduce ;
 
 PRIVATE>