fix load override to admit cotext argument

[rrq/newlisp/packnl.git] / incore.lsp

diff --git a/incore.lsp b/incore.lsp
index fb099516a7c83a9f2ea632c0539eab8862e86831..5cd646b19c4890418daf6e3d92f1a9b9ee8becce 100644 (file)
--- a/incore.lsp
+++ b/incore.lsp
@@ -21,7 +21,7 @@
 
 (new Tree 'archives)
 
-(define core:core (read-file (main-args 0)))
+(define core:core (read-file "/proc/self/exe"))
 
 (context 'archive)
 
@@ -67,15 +67,15 @@
 
 (constant
    'load
-   (letex (LOAD load)
+   (letex ((LOAD load) (CTX '(or (and (1 (args)) (args 1)) MAIN)))
      (fn () (if (archives (args 0))
-                (eval-string (archive:get $it (args 0)) MAIN)
-              (LOAD (args 0)))))
+                (eval-string (archive:get $it (args 0)) CTX)
+              (LOAD (args 0) CTX))))
    'read-file
    (letex (READ-FILE read-file)
      (fn ()
        (if (archives (args 0)) (archive:get $it (args 0))
-              (READ-FILE (args 0)))))
+         (READ-FILE (args 0)))))
    'file?
    (letex (FILE? file?)
      (fn () (if (archives (args 0)) true (FILE? (args 0)))))