Fix minor load problems from words being moved around

diff --git a/basis/libc/libc.factor b/basis/libc/libc.factor
index ca651e399012385862476115e1670b6789f59d28..627caa7b777982494bf466f2f23b0d5e98ecad27 100755 (executable)
--- a/basis/libc/libc.factor
+++ b/basis/libc/libc.factor
@@ -23,11 +23,12 @@ IN: libc
 SYMBOL: malloc-expiry
 
 : mallocs ( -- assoc )
-    malloc-expiry get-global dup expired? [
-        drop
+    malloc-expiry get-global expired? [
         -1 <alien> malloc-expiry set-global
         H{ } clone dup \ mallocs set-global
-    ] when ;
+    ] [
+        \ mallocs get-global
+    ] if ;
 
 PRIVATE>
 

diff --git a/extra/builder/util/util.factor b/extra/builder/util/util.factor
index 47db4c52c910071da4d29625c64cc7a3b5ad5d3e..32d1e45066a2cbc4d048192127f2e2aecce44042 100644 (file)
--- a/extra/builder/util/util.factor
+++ b/extra/builder/util/util.factor
@@ -6,7 +6,7 @@ USING: kernel words namespaces classes parser continuations
        combinators sequences splitting quotations arrays strings tools.time
        sequences.deep accessors assocs.lib
        io.encodings.utf8
-       combinators.cleave calendar calendar.format ;
+       combinators.cleave calendar calendar.format eval ;
 
 IN: builder.util
 

diff --git a/extra/shell/shell.factor b/extra/shell/shell.factor
index e694b3600751af8b635b25fa719edb2d284b7152..0ed594602a75ad372315d41a28f693e30b46a667 100644 (file)
--- a/extra/shell/shell.factor
+++ b/extra/shell/shell.factor
@@ -3,7 +3,7 @@ USING: kernel parser words continuations namespaces debugger
        sequences combinators splitting prettyprint
        system io io.files io.launcher io.encodings.utf8 io.pipes sequences.deep
        accessors multi-methods newfx shell.parser
-       combinators.short-circuit ;
+       combinators.short-circuit eval ;
 
 IN: shell