steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stack-checker: Rename literal -> literal-tuple.

db4
Doug Coleman 2013-03-23 16:00:08 -07:00
parent 51e695857c
commit 5a1692eead
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/stack-checker/branches/branches.factor
View File

@ -94,7 +94,7 @@ SYMBOLS: combinator quotations ;
GENERIC: infer-branch ( literal -- namespace ) GENERIC: infer-branch ( literal -- namespace )
M: literal infer-branch M: literal-tuple infer-branch
[ [
copy-inference copy-inference
nest-visitor nest-visitor

2
basis/stack-checker/known-words/known-words.factor
View File

@ -103,7 +103,7 @@ GENERIC: infer-call* ( value known -- )
\ (call) [ infer-call ] "special" set-word-prop \ (call) [ infer-call ] "special" set-word-prop
M: literal infer-call* M: literal-tuple infer-call*
[ 1array #drop, ] [ infer-literal-quot ] bi* ; [ 1array #drop, ] [ infer-literal-quot ] bi* ;
M: curried infer-call* M: curried infer-call*

16
basis/stack-checker/values/values.factor
View File

@ -38,25 +38,25 @@ GENERIC: (input-value?) ( value -- ? )
GENERIC: (literal) ( known -- literal ) GENERIC: (literal) ( known -- literal )
! Literal value ! Literal value
TUPLE: literal < identity-tuple value recursion ; TUPLE: literal-tuple < identity-tuple value recursion ;
: literal ( value -- literal ) known (literal) ; : literal ( value -- literal ) known (literal) ;
M: literal hashcode* nip value>> identity-hashcode ; M: literal-tuple hashcode* nip value>> identity-hashcode ;
: <literal> ( obj -- value ) : <literal> ( 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 ) : curried/composed-literal ( input1 input2 quot -- literal )
[ [ literal ] bi@ ] dip [ [ literal ] bi@ ] dip
[ [ [ value>> ] bi@ ] dip call ] [ drop nip recursion>> ] 3bi [ [ [ value>> ] bi@ ] dip call ] [ drop nip recursion>> ] 3bi
\ literal boa ; inline \ literal-tuple boa ; inline
! Result of curry ! Result of curry
TUPLE: curried obj quot ; TUPLE: curried obj quot ;
@ -126,7 +126,7 @@ GENERIC: known>callable ( known -- quot )
dup callable? [ drop [ @ ] ] unless ; dup callable? [ drop [ @ ] ] unless ;
M: object known>callable drop \ _ ; M: object known>callable drop \ _ ;
M: literal known>callable value>> ; M: literal-tuple known>callable value>> ;
M: composed known>callable M: composed known>callable
[ quot1>> known known>callable ?@ ] [ quot2>> known known>callable ?@ ] bi [ quot1>> known known>callable ?@ ] [ quot2>> known known>callable ?@ ] bi
append ; append ;