From b0fe6631c7c61779396eb0b6e5dba9c6d914bab1 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Thu, 3 Mar 2016 11:54:33 -0800 Subject: [PATCH] core: I messed up the refactoring. with-scope should go away, but so should with-variables with an empty hashtable too. --- core/continuations/continuations-tests.factor | 5 +++-- core/source-files/source-files.factor | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/continuations/continuations-tests.factor b/core/continuations/continuations-tests.factor index 1d16b6a141..cc836b45d1 100644 --- a/core/continuations/continuations-tests.factor +++ b/core/continuations/continuations-tests.factor @@ -16,9 +16,10 @@ IN: continuations.tests : callcc-namespace-test ( -- ? ) [ "test-cc" set - 5 "x" [ + 5 "x" set + H{ } clone [ 6 "x" set "test-cc" get continue - ] with-variable + ] with-variables ] callcc0 "x" get 5 = ; { t } [ 10 callcc1-test 10 iota reverse >vector = ] unit-test diff --git a/core/source-files/source-files.factor b/core/source-files/source-files.factor index c7bf21c34b..cfb5a9e5e5 100644 --- a/core/source-files/source-files.factor +++ b/core/source-files/source-files.factor @@ -68,11 +68,11 @@ SYMBOL: current-source-file : with-source-file ( name quot -- ) ! Should be called from inside with-compilation-unit. - H{ } clone source-files [ + H{ } clone [ [ path>source-file [ current-source-file set ] [ definitions>> old-definitions set ] bi ] dip [ wrap-source-file-error ] recover - ] with-variable ; inline + ] with-variables ; inline -- 2.34.1