memoize: change zero-input memoize to store { called output }

diff --git a/core/memoize/memoize.factor b/core/memoize/memoize.factor
index e209de08e2bcb402924703762e408a38c0f44c16..a0a3d3a5bd887bd7870a64fd7787c4fca4f605dc 100644 (file)
--- a/core/memoize/memoize.factor
+++ b/core/memoize/memoize.factor
@@ -44,9 +44,11 @@ IN: memoize
 : make/0 ( table quot effect -- quot )
     out>> [
         packer '[
-            _ dup first-unsafe dup null eq? [
-                drop @ @ [ 0 rot set-nth-unsafe ] keep
-            ] [ nip ] if
+            _ dup first-unsafe [ second-unsafe ] [
+                @ @ [
+                    1 pick set-nth-unsafe t 0 rot set-nth-unsafe
+                ] keep
+            ] if
         ]
     ] keep unpacker compose ;
 
@@ -62,11 +64,11 @@ PRIVATE>
     3tri ;
 
 : define-memoized ( word quot effect -- )
-    dup in>> length zero? [ null 1array ] [ H{ } clone ] if
+    dup in>> length zero? [ f f 2array ] [ H{ } clone ] if
     (define-memoized) ;
 
 : define-identity-memoized ( word quot effect -- )
-    dup in>> length zero? [ null 1array ] [ IH{ } clone ] if
+    dup in>> length zero? [ f f 2array ] [ IH{ } clone ] if
     (define-memoized) ;
 
 PREDICATE: memoized < word "memoize" word-prop >boolean ;
@@ -83,18 +85,18 @@ M: memoized reset-word
     bi ;
 
 : memoize-quot ( quot effect -- memo-quot )
-    dup in>> length zero? [ null 1array ] [ H{ } clone ] if
+    dup in>> length zero? [ f f 2array ] [ H{ } clone ] if
     -rot make-memoizer ;
 
 : reset-memoized ( word -- )
     "memoize" word-prop dup sequence?
-    [ null swap set-first ] [ clear-assoc ] if ;
+    [ f swap set-first ] [ clear-assoc ] if ;
 
 : invalidate-memoized ( inputs... word -- )
     [ stack-effect in>> packer call ]
     [
         "memoize" word-prop dup sequence?
-        [ null swap set-first ] [ delete-at ] if
+        [ f swap set-first ] [ delete-at ] if
     ]
     bi ;