From d9b8b1f460621b31b7ed78ea1106fb7821082724 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 19 Feb 2023 20:04:54 -0600 Subject: [PATCH] factor: remove in-out, it's just in>> out>> --- basis/combinators/smart/smart.factor | 4 ++-- basis/compiler/tree/debugger/debugger.factor | 2 +- basis/help/lint/checks/checks.factor | 2 +- basis/http/client/client.factor | 2 +- basis/io/streams/duplex/duplex.factor | 2 +- basis/regexp/disambiguate/disambiguate.factor | 2 +- basis/stack-checker/inlining/inlining.factor | 2 +- extra/help/lint/coverage/coverage.factor | 2 +- extra/math/dual/dual.factor | 2 +- extra/smalltalk/compiler/compiler-tests.factor | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/basis/combinators/smart/smart.factor b/basis/combinators/smart/smart.factor index 6bbdbc36cb..8b597a58b4 100644 --- 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 a494859991..ed9c406b89 100644 --- 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 2b1a19f882..a6084b2da6 100644 --- 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 ce237dc4b6..dfcf65bb63 100644 --- a/basis/http/client/client.factor +++ b/basis/http/client/client.factor @@ -223,7 +223,7 @@ SYMBOL: redirects request [ [ [ - 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 7dc493b2f6..a9d7a0c04d 100644 --- 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 20b52ea611..37e725869e 100644 --- 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 84936e72b7..f77dcbb160 100644 --- 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 '[ _ prepend ] bi@ ; diff --git a/extra/help/lint/coverage/coverage.factor b/extra/help/lint/coverage/coverage.factor index 4c121ea543..a87777f5f3 100644 --- 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 7ade1e3f5b..46a71701e4 100644 --- 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 4f37fa6012..40adbc8dc9 100644 --- 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 -- 2.34.1