diff --git a/basis/stack-checker/branches/branches.factor b/basis/stack-checker/branches/branches.factor index d569a34a6b..2c4e4d02ad 100644 --- a/basis/stack-checker/branches/branches.factor +++ b/basis/stack-checker/branches/branches.factor @@ -94,7 +94,7 @@ SYMBOLS: combinator quotations ; GENERIC: infer-branch ( literal -- namespace ) -M: literal infer-branch +M: literal-tuple infer-branch [ copy-inference nest-visitor diff --git a/basis/stack-checker/known-words/known-words.factor b/basis/stack-checker/known-words/known-words.factor index 8d20062957..d6a92cbf08 100644 --- a/basis/stack-checker/known-words/known-words.factor +++ b/basis/stack-checker/known-words/known-words.factor @@ -103,7 +103,7 @@ GENERIC: infer-call* ( value known -- ) \ (call) [ infer-call ] "special" set-word-prop -M: literal infer-call* +M: literal-tuple infer-call* [ 1array #drop, ] [ infer-literal-quot ] bi* ; M: curried infer-call* diff --git a/basis/stack-checker/values/values.factor b/basis/stack-checker/values/values.factor index e701f297d7..942fcc54e6 100644 --- a/basis/stack-checker/values/values.factor +++ b/basis/stack-checker/values/values.factor @@ -38,25 +38,25 @@ GENERIC: (input-value?) ( value -- ? ) GENERIC: (literal) ( known -- literal ) ! Literal value -TUPLE: literal < identity-tuple value recursion ; +TUPLE: literal-tuple < identity-tuple value recursion ; : literal ( value -- literal ) known (literal) ; -M: literal hashcode* nip value>> identity-hashcode ; +M: literal-tuple hashcode* nip value>> identity-hashcode ; : ( obj -- value ) - recursive-state get \ literal boa ; + recursive-state get \ literal-tuple boa ; -M: literal (input-value?) drop f ; +M: literal-tuple (input-value?) drop f ; -M: literal (literal-value?) drop t ; +M: literal-tuple (literal-value?) drop t ; -M: literal (literal) ; +M: literal-tuple (literal) ; : curried/composed-literal ( input1 input2 quot -- literal ) [ [ literal ] bi@ ] dip [ [ [ value>> ] bi@ ] dip call ] [ drop nip recursion>> ] 3bi - \ literal boa ; inline + \ literal-tuple boa ; inline ! Result of curry TUPLE: curried obj quot ; @@ -126,7 +126,7 @@ GENERIC: known>callable ( known -- quot ) dup callable? [ drop [ @ ] ] unless ; M: object known>callable drop \ _ ; -M: literal known>callable value>> ; +M: literal-tuple known>callable value>> ; M: composed known>callable [ quot1>> known known>callable ?@ ] [ quot2>> known known>callable ?@ ] bi append ;