From 8bb9429589055b51434a8147a5b1ddb93313253e Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Mon, 26 Jan 2009 15:47:52 -0800 Subject: [PATCH] ensure accumulator comes back as a vector from literals --- extra/literals/literals-tests.factor | 6 ++++++ extra/literals/literals.factor | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/extra/literals/literals-tests.factor b/extra/literals/literals-tests.factor index 185d672dd3..34ea4d6415 100644 --- a/extra/literals/literals-tests.factor +++ b/extra/literals/literals-tests.factor @@ -11,4 +11,10 @@ IN: literals.tests [ { 7 11 } ] [ { $ seven-eleven } ] unit-test [ { 6 6 6 } ] [ { $ six-six-six } ] unit-test +[ { 6 6 6 7 } ] [ { $ six-six-six 7 } ] unit-test + [ { 8 8 8 } ] [ { $[ six-six-six [ 2 + ] tri@ ] } ] unit-test + +[ { 0.5 2.0 } ] [ { $[ 1.0 2.0 / ] 2.0 } ] unit-test + +[ { 1.0 { 0.5 1.5 } 4.0 } ] [ { 1.0 { $[ 1.0 2.0 / ] 1.5 } $[ 2.0 2.0 * ] } ] unit-test diff --git a/extra/literals/literals.factor b/extra/literals/literals.factor index a450c2118e..6df51a35ef 100644 --- a/extra/literals/literals.factor +++ b/extra/literals/literals.factor @@ -1,6 +1,6 @@ ! (c) Joe Groff, see license for details -USING: continuations kernel parser words quotations ; +USING: continuations kernel parser words quotations vectors ; IN: literals -: $ scan-word [ execute ] curry with-datastack ; parsing -: $[ \ ] parse-until >quotation with-datastack ; parsing +: $ scan-word [ execute ] curry with-datastack >vector ; parsing +: $[ \ ] parse-until >quotation with-datastack >vector ; parsing