Residual fixes for curry/compose change
							parent
							
								
									89440b2a23
								
							
						
					
					
						commit
						3e29a31493
					
				| 
						 | 
				
			
			@ -216,27 +216,8 @@ M: object pprint* pprint-object ;
 | 
			
		|||
M: vector pprint* pprint-object ;
 | 
			
		||||
M: byte-vector pprint* pprint-object ;
 | 
			
		||||
M: hashtable pprint* pprint-object ;
 | 
			
		||||
 | 
			
		||||
GENERIC: valid-callable? ( obj -- ? )
 | 
			
		||||
 | 
			
		||||
M: object valid-callable? drop f ;
 | 
			
		||||
 | 
			
		||||
M: quotation valid-callable? drop t ;
 | 
			
		||||
 | 
			
		||||
M: curry valid-callable? quot>> valid-callable? ;
 | 
			
		||||
 | 
			
		||||
M: compose valid-callable?
 | 
			
		||||
    [ first>> ] [ second>> ] bi [ valid-callable? ] both? ;
 | 
			
		||||
 | 
			
		||||
M: curry pprint*
 | 
			
		||||
    dup valid-callable? [ pprint-object ] [
 | 
			
		||||
        "( invalid curry )" swap present-text
 | 
			
		||||
    ] if ;
 | 
			
		||||
 | 
			
		||||
M: compose pprint*
 | 
			
		||||
    dup valid-callable? [ pprint-object ] [
 | 
			
		||||
        "( invalid compose )" swap present-text
 | 
			
		||||
    ] if ;
 | 
			
		||||
M: curry pprint* pprint-object ;
 | 
			
		||||
M: compose pprint* pprint-object ;
 | 
			
		||||
 | 
			
		||||
M: wrapper pprint*
 | 
			
		||||
    dup wrapped>> word? [
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -323,10 +323,6 @@ M: class-see-layout class-see-layout ;
 | 
			
		|||
    [ 2 break 2 \ + (step-into-execute) . ] (remove-breakpoints)
 | 
			
		||||
] unit-test
 | 
			
		||||
 | 
			
		||||
[ ] [ 1 \ + curry unparse drop ] unit-test
 | 
			
		||||
 | 
			
		||||
[ ] [ 1 \ + compose unparse drop ] unit-test
 | 
			
		||||
 | 
			
		||||
GENERIC: generic-see-test-with-f ( obj -- obj )
 | 
			
		||||
 | 
			
		||||
M: f generic-see-test-with-f ;
 | 
			
		||||
| 
						 | 
				
			
			@ -365,8 +361,3 @@ M: started-out-hustlin' ended-up-ballin' ; inline
 | 
			
		|||
[ "USING: prettyprint.tests ;\nM: started-out-hustlin' ended-up-ballin' ; inline\n" ] [
 | 
			
		||||
    [ { started-out-hustlin' ended-up-ballin' } see ] with-string-writer
 | 
			
		||||
] unit-test
 | 
			
		||||
 | 
			
		||||
[ "( invalid curry )" ] [ 1 2 curry unparse ] unit-test
 | 
			
		||||
[ "( invalid curry )" ] [ 1 2 3 curry curry unparse ] unit-test
 | 
			
		||||
[ "( invalid compose )" ] [ 1 2 compose unparse ] unit-test
 | 
			
		||||
[ "( invalid compose )" ] [ [ 1 ] 2 3 curry compose unparse ] unit-test
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -121,7 +121,7 @@ ERROR: bad-superclass class ;
 | 
			
		|||
    [
 | 
			
		||||
        \ dup ,
 | 
			
		||||
        [ "predicate" word-prop % ]
 | 
			
		||||
        [ [ bad-slot-value ] curry , ] bi
 | 
			
		||||
        [ [ literalize , \ bad-slot-value , ] [ ] make , ] bi
 | 
			
		||||
        \ unless ,
 | 
			
		||||
    ] [ ] make ;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue