feat: Use Lurk and builtin packages in defpackage

argumentcomputer · Sep 11, 2024 · 2be509c · 2be509c
1 parent 7bec63b
commit 2be509c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/src/lurk/cli/meta.rs b/src/lurk/cli/meta.rs
@@ -16,7 +16,8 @@ use crate::{
             repl::Repl,
         },
         package::{Package, SymbolRef},
-        state::builtin_sym,
+        state::{builtin_sym, BUILTIN_PACKAGE_NAME, LURK_PACKAGE_NAME},
+        symbol::Symbol,
         tag::Tag,
         zstore::{ZPtr, DIGEST_SIZE},
     },
@@ -549,7 +550,22 @@ impl<F: PrimeField32, H: Chipset<F>> MetaCmd<F, H> {
                 _ => bail!("Package name must be a string or a symbol"),
             };
             println!("{}", repl.state.borrow().fmt_to_string(&name));
-            let package = Package::new(name);
+            let mut package = Package::new(name);
+            {
+                let state = repl.state.borrow();
+                let lurk_package = state
+                    .get_package(&Symbol::sym(&[LURK_PACKAGE_NAME]))
+                    .expect("lurk package is missing");
+                let builtin_package = state
+                    .get_package(&Symbol::sym(&[LURK_PACKAGE_NAME, BUILTIN_PACKAGE_NAME]))
+                    .expect("builtin package is missing");
+                package
+                    .use_package(lurk_package)
+                    .expect("all symbols in the lurk package are importable");
+                package
+                    .use_package(builtin_package)
+                    .expect("all symbols in the builtin package are importable");
+            }
             repl.state.borrow_mut().add_package(package);
             Ok(())
         },

diff --git a/src/lurk/state.rs b/src/lurk/state.rs
@@ -256,10 +256,10 @@ pub fn initial_lurk_state() -> &'static State {
     INITIAL_LURK_STATE_CELL.get_or_init(State::init_lurk_state)
 }
 
-const LURK_PACKAGE_NAME: &str = "lurk";
-const BUILTIN_PACKAGE_NAME: &str = "builtin";
-const META_PACKAGE_NAME: &str = "meta";
-const USER_PACKAGE_NAME: &str = "lurk-user";
+pub(crate) const LURK_PACKAGE_NAME: &str = "lurk";
+pub(crate) const BUILTIN_PACKAGE_NAME: &str = "builtin";
+pub(crate) const META_PACKAGE_NAME: &str = "meta";
+pub(crate) const USER_PACKAGE_NAME: &str = "lurk-user";
 
 pub(crate) const LURK_SYMBOLS: [&str; 2] = ["nil", "t"];