1.1--- a/lisp/std/pkg.lisp	Wed Jun 05 19:24:47 2024 -0400
     1.2+++ b/lisp/std/pkg.lisp	Wed Jun 05 23:19:29 2024 +0000
     1.3@@ -3,12 +3,12 @@
     1.4 ;;
     1.5 
     1.6 ;;; Code:
     1.7-(defpackage :std-user
     1.8+(defpackage :std-int
     1.9   (:use :cl :std/named-readtables)
    1.10   (:shadowing-import-from :std/defpkg :defpkg :define-lisp-package :with-package)
    1.11   (:export :defpkg :define-lisp-package :with-package))
    1.12 
    1.13-(in-package :std-user)
    1.14+(in-package :std-int)
    1.15 
    1.16 (pushnew :std *features*)
    1.17 
    1.18@@ -405,3 +405,8 @@
    1.19    :std/macs :std/bit :std/fmt :std/path :std/os :std/file :std/string :std/seq :std/sys :std/readtable))
    1.20 
    1.21 (define-lisp-package :std)
    1.22+
    1.23+(defpkg :std-user
    1.24+  (:use :std-lisp :cl-user :sb-ext
    1.25+   :sb-alien :sb-thread :sb-bsd-sockets :sb-gray
    1.26+   :sb-concurrency :sb-mop :sb-debug))

     2.1--- a/lisp/std/tests.lisp	Wed Jun 05 19:24:47 2024 -0400
     2.2+++ b/lisp/std/tests.lisp	Wed Jun 05 23:19:29 2024 +0000
     2.3@@ -5,7 +5,7 @@
     2.4 ;; TODO: fix false positives when using (eval-test)
     2.5 
     2.6 ;;; Code:
     2.7-(in-package :std-user)
     2.8+(in-package :std-int)
     2.9 (defpkg :std/tests
    2.10   (:use :cl :std :rt :sb-thread :std/fu))
    2.11 (in-package :std/tests)

     3.1--- a/x.lisp	Wed Jun 05 19:24:47 2024 -0400
     3.2+++ b/x.lisp	Wed Jun 05 23:19:29 2024 +0000
     3.3@@ -10,7 +10,7 @@
     3.4 (require 'sb-concurrency)
     3.5 
     3.6 #-(or sbcl cl) (error "unsupported Lisp compiler")
     3.7-
     3.8+(in-package :cl-user)
     3.9 #-quicklisp
    3.10 (let ((quicklisp-init "/usr/local/share/lisp/quicklisp/setup.lisp"))
    3.11   (when (probe-file quicklisp-init)
    3.12@@ -81,21 +81,28 @@
    3.13   (uiop:dump-image (merge-pathnames (car (last (std::ssplit #\/ (asdf:component-name c)))) *stash-path*) :executable t :compression *compression-level*))
    3.14 
    3.15 (defun compile-std (&optional force save)
    3.16-  (asdf:compile-system :std :force force)
    3.17-  (asdf:load-system :std :force force)
    3.18-  (when save (sb-ext:save-lisp-and-die (merge-pathnames "std.core" *stash-path*) :compression *compression-level*)))
    3.19+  (ql:quickload :std)
    3.20+  (when save
    3.21+    (in-package :std-user)
    3.22+    (sb-ext:save-lisp-and-die (merge-pathnames "std.core" *stash-path*) :compression *compression-level*)))
    3.23 
    3.24 (defun compile-prelude (&optional force save)
    3.25   ;; (compile-std)
    3.26   (asdf:compile-system :prelude :force force)
    3.27   (asdf:load-system :prelude :force force)
    3.28   ;; (rocksdb:load-rocksdb save)
    3.29-  (when save (sb-ext:save-lisp-and-die (merge-pathnames "prelude.core" *stash-path*) :compression *compression-level*)))
    3.30+  (when save
    3.31+    (in-package :std-user)
    3.32+    (use-package :cl-user)
    3.33+    (sb-ext:save-lisp-and-die (merge-pathnames "prelude.core" *stash-path*) :compression *compression-level*)))
    3.34 
    3.35 (defun compile-user (&optional force save)
    3.36   (asdf:compile-system :user :force force)
    3.37   (asdf:load-system :user :force force)
    3.38-  (when save (sb-ext:save-lisp-and-die (merge-pathnames "user.core" *stash-path*) :compression *compression-level*)))
    3.39+  (when save
    3.40+    (in-package :user)
    3.41+    (use-package :cl-user)
    3.42+    (sb-ext:save-lisp-and-die (merge-pathnames "user.core" *stash-path*) :compression *compression-level*)))
    3.43 
    3.44 (defun save-foreign (name exports &rest args)
    3.45   (apply #'sb-ext:save-lisp-and-die name (append `(:executable nil :callable-exports ,exports) args)))