Get rid of Primitive_lazy

Author: cknitt

lib/es6/Stdlib_Lazy.js

@@ -1,24 +1,73 @@
 
 
-import * as Primitive_lazy from "./Primitive_lazy.js";
+import * as Primitive_exceptions from "./Primitive_exceptions.js";
 
-let make = Primitive_lazy.from_fun;
+function is_val(l) {
+  return l.LAZY_DONE;
+}
 
-let get = Primitive_lazy.force;
+let Undefined = /* @__PURE__ */Primitive_exceptions.create("Stdlib_Lazy.Undefined");
 
-let isEvaluated = Primitive_lazy.is_val;
+function forward_with_closure(blk, closure) {
+  let result = closure();
+  blk.VAL = result;
+  blk.LAZY_DONE = true;
+  return result;
+}
 
-let Undefined = Primitive_lazy.Undefined;
+function raise_undefined() {
+  throw {
+    RE_EXN_ID: Undefined,
+    Error: new Error()
+  };
+}
 
-let force = Primitive_lazy.force;
+function force(lzv) {
+  if (lzv.LAZY_DONE) {
+    return lzv.VAL;
+  } else {
+    let closure = lzv.VAL;
+    lzv.VAL = raise_undefined;
+    try {
+      return forward_with_closure(lzv, closure);
+    } catch (e) {
+      lzv.VAL = () => {
+        throw e;
+      };
+      throw e;
+    }
+  }
+}
 
-let force_val = Primitive_lazy.force_val;
+function force_val(lzv) {
+  if (lzv.LAZY_DONE) {
+    return lzv.VAL;
+  } else {
+    let closure = lzv.VAL;
+    lzv.VAL = raise_undefined;
+    return forward_with_closure(lzv, closure);
+  }
+}
+
+function from_fun(closure) {
+  return {
+    LAZY_DONE: false,
+    VAL: closure
+  };
+}
+
+function from_val(value) {
+  return {
+    LAZY_DONE: true,
+    VAL: value
+  };
+}
 
-let from_fun = Primitive_lazy.from_fun;
+let make = from_fun;
 
-let from_val = Primitive_lazy.from_val;
+let get = force;
 
-let is_val = Primitive_lazy.is_val;
+let isEvaluated = is_val;
 
 export {
   make,

lib/js/Stdlib_Lazy.js

@@ -1,24 +1,73 @@
 'use strict';
 
-let Primitive_lazy = require("./Primitive_lazy.js");
+let Primitive_exceptions = require("./Primitive_exceptions.js");
 
-let make = Primitive_lazy.from_fun;
+function is_val(l) {
+  return l.LAZY_DONE;
+}
 
-let get = Primitive_lazy.force;
+let Undefined = /* @__PURE__ */Primitive_exceptions.create("Stdlib_Lazy.Undefined");
 
-let isEvaluated = Primitive_lazy.is_val;
+function forward_with_closure(blk, closure) {
+  let result = closure();
+  blk.VAL = result;
+  blk.LAZY_DONE = true;
+  return result;
+}
 
-let Undefined = Primitive_lazy.Undefined;
+function raise_undefined() {
+  throw {
+    RE_EXN_ID: Undefined,
+    Error: new Error()
+  };
+}
 
-let force = Primitive_lazy.force;
+function force(lzv) {
+  if (lzv.LAZY_DONE) {
+    return lzv.VAL;
+  } else {
+    let closure = lzv.VAL;
+    lzv.VAL = raise_undefined;
+    try {
+      return forward_with_closure(lzv, closure);
+    } catch (e) {
+      lzv.VAL = () => {
+        throw e;
+      };
+      throw e;
+    }
+  }
+}
 
-let force_val = Primitive_lazy.force_val;
+function force_val(lzv) {
+  if (lzv.LAZY_DONE) {
+    return lzv.VAL;
+  } else {
+    let closure = lzv.VAL;
+    lzv.VAL = raise_undefined;
+    return forward_with_closure(lzv, closure);
+  }
+}
 
-let from_fun = Primitive_lazy.from_fun;
+function from_fun(closure) {
+  return {
+    LAZY_DONE: false,
+    VAL: closure
+  };
+}
 
-let from_val = Primitive_lazy.from_val;
+function from_val(value) {
+  return {
+    LAZY_DONE: true,
+    VAL: value
+  };
+}
 
-let is_val = Primitive_lazy.is_val;
+let make = from_fun;
+
+let get = force;
+
+let isEvaluated = is_val;
 
 exports.make = make;
 exports.get = get;