basis: remove calls on combinators.extras for now.

diff --git a/basis/cpu/arm/assembler/assembler.factor b/basis/cpu/arm/assembler/assembler.factor
index df65689a7f67a132a4aeef38c7861eaeb940a2f3..61095e254662e24c7b111b387153e67e5eee0ed2 100644 (file)
--- a/basis/cpu/arm/assembler/assembler.factor
+++ b/basis/cpu/arm/assembler/assembler.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2020 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors combinators cpu.arm.assembler.opcodes kernel
-math math.bitwise namespaces sequences combinators.extras ;
+math math.bitwise namespaces sequences ;
 IN: cpu.arm.assembler
 
 ! pre-index mode: computed addres is the base-register + offset
@@ -107,10 +107,12 @@ ERROR: imm-out-of-range imm n ;
 : LSRi64 ( imm6 Rn Rd -- ) LSRi64-encode >out ;
 
 : with-new-arm64-offset ( offset quot -- arm64-assembler )
-    [ <arm64-assembler> \ arm64-assembler ] dip with-output-variable ; inline
+    [ <arm64-assembler> \ arm64-assembler ] dip
+    '[ _ \ arm64-assembler get ] with-variable ; inline
 
 : with-new-arm64 ( quot -- arm64-assembler )
-    [ 0 <arm64-assembler> \ arm64-assembler ] dip with-output-variable ; inline
+    [ 0 <arm64-assembler> \ arm64-assembler ] dip
+    '[ _ \ arm64-assembler get ] with-variable ; inline
 
 : offset-test-arm64 ( offset quot -- instuctions )
     with-new-arm64-offset out>> ; inline

diff --git a/basis/retries/retries.factor b/basis/retries/retries.factor
index e3ecccc53c23523a9aa993e547f3f090fcfabe97..c541f4b18e617efcb09edcf9aaaee94cec57834b 100644 (file)
--- a/basis/retries/retries.factor
+++ b/basis/retries/retries.factor
@@ -60,7 +60,8 @@ ERROR: retries-failed retries quot ;
 
 : with-retries ( retries quot -- result )
     [ current-retries ] dip dup '[
-        [
+        f [
+            drop
             current-retries get next-retry [
                 [ sleep ] unless-zero
                 _ [ f ] compose [
@@ -70,7 +71,7 @@ ERROR: retries-failed retries quot ;
             ] [
                 current-retries get _ retries-failed
             ] if
-        ] smart-loop
+        ] loop
     ] with-variable ; inline
 
 : retries ( quot time-strategy n/seq -- result )