core: I messed up the refactoring. with-scope should go away, but so should with...

diff --git a/core/continuations/continuations-tests.factor b/core/continuations/continuations-tests.factor
index 1d16b6a14155ba8d8a6d47fc97f63a9cf4b8f2d9..cc836b45d168257d27dafc12bd5de0b264ae20d2 100644 (file)
--- 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 c7bf21c34bb1eadcb95fff6ef04ab83e4608ad8c..cfb5a9e5e538740af1f920a2a9c5ecfe4130e84d 100644 (file)
--- 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