From: John Benediktsson <mrjbq7@gmail.com>
Date: Fri, 14 Aug 2015 00:52:40 +0000 (-0700)
Subject: continuations: rename catchstack* to (get-catchstack) for consistency.
X-Git-Tag: unmaintained~2083
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=bee46baecb21bb15d4e729bbf6d48d4dcd38b6cf

continuations: rename catchstack* to (get-catchstack) for consistency.
---

diff --git a/core/continuations/continuations-docs.factor b/core/continuations/continuations-docs.factor
index 4132bacc1f..b188a3fb9f 100644
--- a/core/continuations/continuations-docs.factor
+++ b/core/continuations/continuations-docs.factor
@@ -108,7 +108,7 @@ $nl
 
 ABOUT: "continuations"
 
-HELP: catchstack*
+HELP: (get-catchstack)
 { $values { "catchstack" "a vector of continuations" } }
 { $description "Outputs the current catchstack." } ;
 
diff --git a/core/continuations/continuations.factor b/core/continuations/continuations.factor
index 552143b7ff..c7507a147a 100644
--- a/core/continuations/continuations.factor
+++ b/core/continuations/continuations.factor
@@ -19,14 +19,14 @@ SYMBOL: restarts
 
 <PRIVATE
 
-: catchstack* ( -- catchstack )
+: (get-catchstack) ( -- catchstack )
     CONTEXT-OBJ-CATCHSTACK context-object { vector } declare ; inline
 
 ! We have to defeat some optimizations to make continuations work
 : dummy-1 ( -- obj ) f ;
 : dummy-2 ( obj -- obj ) ;
 
-: get-catchstack ( -- catchstack ) catchstack* clone ; inline
+: get-catchstack ( -- catchstack ) (get-catchstack) clone ; inline
 
 : (set-catchstack) ( catchstack -- )
     CONTEXT-OBJ-CATCHSTACK set-context-object ; inline
@@ -132,7 +132,7 @@ callback-error-hook [ [ die ] ] initialize
 
 : rethrow ( error -- * )
     dup save-error
-    catchstack* [
+    (get-catchstack) [
         in-callback?
         [ callback-error-hook get-global call( error -- * ) ]
         [ OBJ-CURRENT-THREAD special-object error-in-thread ]
@@ -142,9 +142,9 @@ callback-error-hook [ [ die ] ] initialize
 : recover ( ..a try: ( ..a -- ..b ) recovery: ( ..a error -- ..b ) -- ..b )
     [
         [
-            [ catchstack* push ] dip
+            [ (get-catchstack) push ] dip
             call
-            catchstack* pop*
+            (get-catchstack) pop*
         ] curry
     ] dip ifcc ; inline