X-Git-Url: https://git.distorted.org.uk/~mdw/dep-ui/blobdiff_plain/c0644ca04a2ef5920acb9627fe3dc1b627a7cf2b..55be9d83928fa05d864282eb8e5513535906ffe9:/dep.js

diff --git a/dep.js b/dep.js
index d5235be..f9a9a18 100644
--- a/dep.js
+++ b/dep.js
@@ -235,7 +235,7 @@ Dep.prototype = {
     s += ' #' + this._seq;
 
     // The value, or some kind of marker that it doesn't have one.
-    if (!(f & F_VALUE)) s += ' #{out-of-date}';
+    if (!(f & F_VALUE)) s += ' #{stale}';
     else if (v === BAD) s += ' #{bad}';
     else s += ' ' + v.toString();
 
@@ -255,7 +255,7 @@ Dep.prototype = {
      * If the receiver isn't up-to-date then we synthesize the flags.
      */
 
-    if (this.state === 'ready') return F_VALUE | F_DEPS;
+    if (STATE === 'ready') return F_VALUE | F_DEPS;
     else if (this._generation === GENERATION) return this.__flags;
     else if (this._value_function === null) return F_VALUE | F_DEPS;
     else return 0;
@@ -394,12 +394,12 @@ Dep.prototype = {
 
     var val;
 
-    if (state === 'recomputing') {
+    if (STATE === 'recomputing') {
+      this._force();
       if (EVALUATING) {
 	this._dependents[EVALUATING._seq] = EVALUATING;
 	EVALUATING._dependencies[this._seq] = this;
       }
-      this._force();
     }
     val = this._value;
     if (val === BAD) throw BAD;
@@ -444,7 +444,7 @@ Dep.prototype = {
 
 function orelse(thunk, errthunk) {
   /* Call THUNK.  If it succeeds, then return its result.  If THUNK
-   * reads a bad dep then call ERRTHINK and return its result instead.
+   * reads a bad dep then call ERRTHUNK and return its result instead.
    */
 
   var e;
@@ -469,8 +469,8 @@ function recompute_pending() {
    */
 
   var d, f;
-
-  state = 'recomputing';
+  var old_state = STATE;
+  STATE = 'recomputing';
   try_finally(function () {
     while (PENDING.length) {
       d = PENDING.shift();
@@ -488,6 +488,7 @@ function recompute_pending() {
       d = PENDING.shift();
       d._value = BAD;
     }
+    STATE = old_state;
   });
 }
 
@@ -503,7 +504,7 @@ function with_frozen(body, delay) {
    */
 
   var op, val;
-  var old_delayed, old_pending;
+  var old_delayed, old_pending, old_state;
 
   switch (STATE) {
   case 'frozen':
@@ -516,6 +517,8 @@ function with_frozen(body, delay) {
   case 'ready':
     old_delayed = DELAYED;
     old_pending = PENDING;
+    old_state = STATE;
+    STATE = "frozen";
     try_finally(function () {
       DELAYED = [];
       PENDING = [];
@@ -530,6 +533,7 @@ function with_frozen(body, delay) {
     }, function () {
       DELAYED = old_delayed;
       PENDING = old_pending;
+      STATE = old_state;
     });
     break;
   }