new accessors

diff --git a/basis/models/delay/delay.factor b/basis/models/delay/delay.factor
index 22512942e3d1fb4c9216db1ba712646ec13ffbd2..a1d4ee9907fa435929ac287bb45b5037d590aa1f 100755 (executable)
--- a/basis/models/delay/delay.factor
+++ b/basis/models/delay/delay.factor
@@ -6,7 +6,7 @@ IN: models.delay
 TUPLE: delay < model model timeout alarm ;\r
 \r
 : update-delay-model ( delay -- )\r
-    [ delay-model model-value ] keep set-model ;\r
+    [ model>> value>> ] keep set-model ;\r
 \r
 : <delay> ( model timeout -- delay )\r
     f delay new-model\r
@@ -15,7 +15,7 @@ TUPLE: delay < model model timeout alarm ;
         [ add-dependency ] keep ;\r
 \r
 : cancel-delay ( delay -- )\r
-    delay-alarm [ cancel-alarm ] when* ;\r
+    alarm>> [ cancel-alarm ] when* ;\r
 \r
 : start-delay ( delay -- )\r
     dup\r

diff --git a/basis/models/history/history.factor b/basis/models/history/history.factor
index ab79d66eb6dd9505b08ae0bb9265a5c01cad8cae..fc90ada35a670e7e352b0b1047b9f8290dea91e6 100755 (executable)
--- a/basis/models/history/history.factor
+++ b/basis/models/history/history.factor
@@ -14,7 +14,7 @@ TUPLE: history < model back forward ;
         reset-history ;\r
 \r
 : (add-history) ( history to -- )\r
-    swap model-value dup [ swap push ] [ 2drop ] if ;\r
+    swap value>> dup [ swap push ] [ 2drop ] if ;\r
 \r
 : go-back/forward ( history to from -- )\r
     dup empty?\r
@@ -22,11 +22,11 @@ TUPLE: history < model back forward ;
     [ >r dupd (add-history) r> pop swap set-model ] if ;\r
 \r
 : go-back ( history -- )\r
-    dup history-forward over history-back go-back/forward ;\r
+    dup [ forward>> ] [ back>> ] bi go-back/forward ;\r
 \r
 : go-forward ( history -- )\r
-    dup history-back over history-forward go-back/forward ;\r
+    dup [ back>> ] [ forward>> ] bi go-back/forward ;\r
 \r
 : add-history ( history -- )\r
-    dup history-forward delete-all\r
-    dup history-back (add-history) ;\r
+    dup forward>> delete-all\r
+    dup back>> (add-history) ;\r