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

continuations: change continuation word to current-continuation. continuation is now just the tuple name. issue #358

db4
Doug Coleman 2012-07-20 12:03:21 -07:00
parent 350035fe27
commit a7a34a3b9a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
basis/tools/continuations/continuations.factor
View File

@ -21,7 +21,7 @@ PRIVATE>
SYMBOL: break-hook
: break ( -- )
continuation callstack >>call
current-continuation callstack >>call
break-hook get call( continuation -- continuation' )
after-break ;
@ -63,7 +63,7 @@ M: object add-breakpoint ;
\ (step-into-execute) t "step-into?" set-word-prop
: (step-into-continuation) ( -- )
continuation callstack >>call break ;
current-continuation callstack >>call break ;
: (step-into-call-next-method) ( method -- )
next-method-quot (step-into-quot) ;

6
core/continuations/continuations.factor
View File

@ -39,7 +39,7 @@ TUPLE: continuation data call retain name catch ;
C: <continuation> continuation
: continuation ( -- continuation )
: current-continuation ( -- continuation )
datastack callstack retainstack namestack catchstack
<continuation> ;
@ -51,7 +51,7 @@ C: <continuation> continuation
PRIVATE>
: ifcc ( capture restore -- )
[ dummy-1 continuation ] 2dip [ dummy-2 ] prepose ?if ; inline
[ dummy-1 current-continuation ] 2dip [ dummy-2 ] prepose ?if ; inline
: callcc0 ( quot -- ) [ drop ] ifcc ; inline
@ -196,7 +196,7 @@ M: condition compute-restarts
[
! 65 = self
OBJ-CURRENT-THREAD special-object error-thread set-global
continuation error-continuation set-global
current-continuation error-continuation set-global
[ original-error set-global ] [ rethrow ] bi
] ERROR-HANDLER-QUOT set-special-object
! VM adds this to kernel errors, so that user-space

2
core/destructors/destructors.factor
View File

@ -16,7 +16,7 @@ SYMBOL: debug-leaks?
SLOT: continuation
: register-disposable ( obj -- )
debug-leaks? get-global [ continuation >>continuation ] when
debug-leaks? get-global [ current-continuation >>continuation ] when
disposables get conjoin ;
: unregister-disposable ( obj -- )