factor: remove in-out, it's just in>> out>>

diff --git a/basis/combinators/smart/smart.factor b/basis/combinators/smart/smart.factor
index 6bbdbc36cb5fb1af6f287f4c5e5374f3fe1fbdfa..8b597a58b4b76c23e5247862084153fd3b016c4d 100644 (file)
--- a/basis/combinators/smart/smart.factor
+++ b/basis/combinators/smart/smart.factor
@@ -14,7 +14,7 @@ GENERIC: infer-known* ( known -- effect )
     ] [ infer-known* ] if ;
 
 IDENTITY-MEMO: inputs/outputs ( quot -- in out )
-    infer in-out 2length ;
+    infer [ in>> ] [ out>> ] bi 2length ;
 
 : inputs ( quot -- n ) inputs/outputs drop ; inline
 
@@ -24,7 +24,7 @@ IDENTITY-MEMO: inputs/outputs ( quot -- in out )
     peek-d
     infer-known [
         [ pop-d 1array #drop, ]
-        [ in-out [ length apply-object ] bi@ ] bi*
+        [ [ in>> ] [ out>> ] bi [ length apply-object ] bi@ ] bi*
     ] [
         \ inputs/outputs dup required-stack-effect apply-word/effect
         pop-d pop-d swap

diff --git a/basis/compiler/tree/debugger/debugger.factor b/basis/compiler/tree/debugger/debugger.factor
index a49485999127170bca012aaba643fa0017e1b262..ed9c406b89de474fcd8fdb11dda8b41a5c95042a 100644 (file)
--- a/basis/compiler/tree/debugger/debugger.factor
+++ b/basis/compiler/tree/debugger/debugger.factor
@@ -26,7 +26,7 @@ MACRO: match-choose ( alist -- quot )
 MATCH-VARS: ?a ?b ?c ;
 
 : pretty-shuffle ( effect -- word/f )
-    in-out 2array {
+    [ in>> ] [ out>> ] bi 2array {
         { { { } { } } [ ] }
         { { { ?a } { ?a } } [ ] }
         { { { ?a ?b } { ?a ?b } } [ ] }

diff --git a/basis/help/lint/checks/checks.factor b/basis/help/lint/checks/checks.factor
index 2b1a19f882ddae2a83f513ad27c479eacba85c85..a6084b2da6302f52ed35a36d9a28aca67e81da7c 100644 (file)
--- a/basis/help/lint/checks/checks.factor
+++ b/basis/help/lint/checks/checks.factor
@@ -71,7 +71,7 @@ SYMBOL: vocab-articles
 
 : effect-values ( word -- seq )
     stack-effect
-    in-out append
+    [ in>> ] [ out>> ] bi append
     [ dup pair? [ first ] when effect>string ] map members ;
 
 : effect-effects ( word -- seq )

diff --git a/basis/http/client/client.factor b/basis/http/client/client.factor
index ce237dc4b62509164305dda249d147c29a62d293..dfcf65bb636d6603778e869bf07e91c0944b37cd 100644 (file)
--- a/basis/http/client/client.factor
+++ b/basis/http/client/client.factor
@@ -223,7 +223,7 @@ SYMBOL: redirects
     request [
         <request-socket> [
             [
-                in-out [ ?https-tunnel ] with-streams*
+                [ in>> ] [ out>> ] bi [ ?https-tunnel ] with-streams*
             ]
             [
                 out>>

diff --git a/basis/io/streams/duplex/duplex.factor b/basis/io/streams/duplex/duplex.factor
index 7dc493b2f67ad345d2afd0479529a4edf12ac46c..a9d7a0c04deddaab2f42a7dc2368dd4f0884853f 100644 (file)
--- a/basis/io/streams/duplex/duplex.factor
+++ b/basis/io/streams/duplex/duplex.factor
@@ -15,7 +15,7 @@ CONSULT: formatted-output-stream-protocol duplex-stream out>> ;
 INSTANCE: duplex-stream input-stream
 INSTANCE: duplex-stream output-stream
 
-: >duplex-stream< ( stream -- in out ) in-out ; inline
+: >duplex-stream< ( stream -- in out ) [ in>> ] [ out>> ] bi ; inline
 
 M: duplex-stream stream-element-type
     >duplex-stream<

diff --git a/basis/regexp/disambiguate/disambiguate.factor b/basis/regexp/disambiguate/disambiguate.factor
index 20b52ea6116ac47e6558889ebd043a0960e07b2f..37e725869ed4fda024eea5a194aa96550ef269e7 100644 (file)
--- a/basis/regexp/disambiguate/disambiguate.factor
+++ b/basis/regexp/disambiguate/disambiguate.factor
@@ -27,7 +27,7 @@ TUPLE: parts in out ;
     [ nip in>> ] [ out>> append ] 2bi parts boa ;
 
 : meaningful-integers ( partition table -- integers )
-    [ in-out ] dip
+    [ [ in>> ] [ out>> ] bi ] dip
     '[ [ _ at ] map intersect-all ] bi@ diff ;
 
 : class-integers ( classes integers -- table )

diff --git a/basis/stack-checker/inlining/inlining.factor b/basis/stack-checker/inlining/inlining.factor
index 84936e72b78d9814b3af09f97c9933b44a29d224..f77dcbb16030cbf027944635b715fb1756734f97 100644 (file)
--- a/basis/stack-checker/inlining/inlining.factor
+++ b/basis/stack-checker/inlining/inlining.factor
@@ -126,7 +126,7 @@ M: declared-effect (undeclared-known) known>> (undeclared-known) ;
     [ check-call-height ] [ check-call-site-stack ] bi ;
 
 : adjust-stack-effect ( effect -- effect' )
-    in-out meta-d length pick length [-]
+    [ in>> ] [ out>> ] bi meta-d length pick length [-]
     object <repetition> '[ _ prepend ] bi@
     <effect> ;
 

diff --git a/extra/help/lint/coverage/coverage.factor b/extra/help/lint/coverage/coverage.factor
index 4c121ea5435ec32afdaf3c9d22584eb4131b1658..a87777f5f37913497084cfed5393f72f8d52a798 100644 (file)
--- a/extra/help/lint/coverage/coverage.factor
+++ b/extra/help/lint/coverage/coverage.factor
@@ -98,7 +98,7 @@ M: word-help-coverage summary
 : ?remove-$values ( word spec -- spec )
     \ $values over member? [
         swap "declared-effect" word-prop [
-            in-out append [
+            [ in>> ] [ out>> ] bi append [
                 \ $values swap remove
             ] [ drop ] if-empty
     ] when* ] [ nip ] if ;

diff --git a/extra/math/dual/dual.factor b/extra/math/dual/dual.factor
index 7ade1e3f5ba911b766958390fa4d24e12280a080..46a71701e49e2dee6123236f88dc9ee3d4d4b36f 100644 (file)
--- a/extra/math/dual/dual.factor
+++ b/extra/math/dual/dual.factor
@@ -49,7 +49,7 @@ MACRO: chain-rule ( word -- e )
 : set-dual-help ( dword word -- )
     [
         [
-            stack-effect in-out append
+            stack-effect [ in>> ] [ out>> ] bi append
             [ dual ] { } map>assoc { $values } prepend
         ] [
             [

diff --git a/extra/smalltalk/compiler/compiler-tests.factor b/extra/smalltalk/compiler/compiler-tests.factor
index 4f37fa601237289db275690d609f1aa157d418f3..40adbc8dc9b534dea0dd4e6c889d3e2d8ff9e36b 100644 (file)
--- a/extra/smalltalk/compiler/compiler-tests.factor
+++ b/extra/smalltalk/compiler/compiler-tests.factor
@@ -10,7 +10,7 @@ IN: smalltalk.compiler.tests
     ] with-compilation-unit ;
 
 : test-inference ( ast -- in# out# )
-    test-compilation infer in-out 2length ;
+    test-compilation infer [ in>> ] [ out>> ] bi 2length ;
 
 { 2 1 } [
     T{ ast-block f