Dynamic crate (#2057)

raviqqe · Jan 30, 2025 · e87a99a · e87a99a
1 parent 0c3ed15
commit e87a99a
Show file tree

Hide file tree

Showing 15 changed files with 59 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,6 +12,7 @@ members = [
   "compiler",
   "configuration",
   "device",
+  "dynamic",
   "engine",
   "examples/embedded-script",
   "examples/hot-reload",

diff --git a/dynamic/Cargo.toml b/dynamic/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "stak-dynamic"
+description = "Dynamic primitives for Stak Scheme"
+version = "0.1.0"
+edition.workspace = true
+keywords.workspace = true
+license-file.workspace = true
+readme.workspace = true
+repository.workspace = true
+
+[dependencies]
+any-fn = { version = "0.6.1" }
+bitvec = "1.0.1"
+heapless = { version = "0.8.0", default-features = false }
+stak-vm = { version = "0.7.22", path = "../vm" }
+
+[lints]
+workspace = true
diff --git a/native/src/dynamic/error.rs → dynamic/src/error.rs b/native/src/dynamic/error.rs → dynamic/src/error.rs
diff --git a/dynamic/src/lib.rs b/dynamic/src/lib.rs
@@ -0,0 +1,13 @@
+//! Stak Scheme primitive sets for dynamically-defined primitives.
+
+#![no_std]
+
+extern crate alloc;
+
+mod error;
+mod primitive_set;
+mod scheme_value;
+
+pub use error::*;
+pub use primitive_set::*;
+pub use scheme_value::*;
diff --git a/native/src/dynamic.rs → dynamic/src/primitive_set.rs b/native/src/dynamic.rs → dynamic/src/primitive_set.rs
@@ -1,14 +1,8 @@
-//! Native functions dynamically defined.
-
-mod error;
-mod scheme_value;
-
-pub use self::error::DynamicError;
+use crate::{error::DynamicError, scheme_value::SchemeValue};
 use alloc::{boxed::Box, string::String, vec, vec::Vec};
 use any_fn::AnyFn;
 use bitvec::bitvec;
 use core::any::TypeId;
-pub use scheme_value::SchemeValue;
 use stak_vm::{Cons, Error, Memory, Number, PrimitiveSet, Type, Value};
 
 const MAXIMUM_ARGUMENT_COUNT: usize = 16;

diff --git a/native/src/dynamic/scheme_value.rs → dynamic/src/scheme_value.rs b/native/src/dynamic/scheme_value.rs → dynamic/src/scheme_value.rs
diff --git a/engine/Cargo.toml b/engine/Cargo.toml
@@ -16,9 +16,9 @@ std = ["stak-device/std"]
 any-fn = "0.6.1"
 cfg-elif = "0.6.1"
 stak-device = { version = "0.2.93", path = "../device" }
+stak-dynamic = { version = "0.1.0", path = "../dynamic" }
 stak-file = { version = "0.5.7", path = "../file" }
 stak-module = { version = "0.1.13", path = "../module" }
-stak-native = { version = "0.2.0", path = "../native", features = ["alloc"] }
 stak-process-context = { version = "0.2.51", path = "../process_context" }
 stak-r7rs = { version = "0.9.7", path = "../r7rs" }
 stak-time = { version = "0.1.34", path = "../time" }

diff --git a/engine/src/engine.rs b/engine/src/engine.rs
@@ -1,9 +1,9 @@
 use crate::{primitive_set::EnginePrimitiveSet, EngineError};
 use any_fn::AnyFn;
-use stak_module::Module;
 #[cfg(doc)]
-use stak_native::dynamic::DynamicPrimitiveSet;
-use stak_native::dynamic::SchemeValue;
+use stak_dynamic::DynamicPrimitiveSet;
+use stak_dynamic::SchemeValue;
+use stak_module::Module;
 use stak_vm::{Error, Value, Vm};
 
 const DEFAULT_VALUE_COUNT: usize = 1 << 10;

diff --git a/engine/src/error.rs b/engine/src/error.rs
@@ -2,7 +2,7 @@ use core::{
     error::Error,
     fmt::{self, Display, Formatter},
 };
-use stak_native::dynamic::DynamicError;
+use stak_dynamic::DynamicError;
 use stak_r7rs::SmallError;
 
 /// An engine error

diff --git a/engine/src/primitive_set.rs b/engine/src/primitive_set.rs
@@ -1,8 +1,8 @@
 use crate::EngineError;
 use any_fn::AnyFn;
 use cfg_elif::item;
+use stak_dynamic::DynamicPrimitiveSet;
 use stak_file::VoidFileSystem;
-use stak_native::dynamic::DynamicPrimitiveSet;
 use stak_process_context::VoidProcessContext;
 use stak_r7rs::SmallPrimitiveSet;
 use stak_time::VoidClock;

diff --git a/native/Cargo.toml b/native/Cargo.toml
@@ -8,13 +8,7 @@ license-file.workspace = true
 readme.workspace = true
 repository.workspace = true
 
-[features]
-alloc = ["dep:any-fn"]
-
 [dependencies]
-any-fn = { version = "0.6.1", optional = true }
-bitvec = "1.0.1"
-heapless = { version = "0.8.0", default-features = false }
 stak-vm = { version = "0.7.22", path = "../vm" }
 
 [lints]

diff --git a/native/src/lib.rs b/native/src/lib.rs
@@ -2,11 +2,6 @@
 
 #![no_std]
 
-#[cfg(feature = "alloc")]
-extern crate alloc;
-
-#[cfg(feature = "alloc")]
-pub mod dynamic;
 mod list;
 mod type_check;
 

diff --git a/root/Cargo.toml b/root/Cargo.toml
@@ -10,7 +10,7 @@ repository.workspace = true
 
 [features]
 default = ["float", "std"]
-alloc = ["dep:stak-engine", "stak-native/alloc"]
+alloc = ["dep:stak-dynamic", "dep:stak-engine"]
 float = ["stak-sac/float", "stak-vm/float"]
 hot-reload = ["stak-macro/hot-reload"]
 libc = [
@@ -33,11 +33,11 @@ std = [
 
 [dependencies]
 stak-device = { version = "0.2.93", path = "../device" }
+stak-dynamic = { version = "0.1.0", path = "../dynamic", optional = true }
 stak-engine = { version = "0.1.0", path = "../engine", optional = true }
 stak-file = { version = "0.5.7", path = "../file" }
 stak-macro = { version = "0.2.12", path = "../macro" }
 stak-module = { version = "0.1.13", path = "../module" }
-stak-native = { version = "0.2.0", path = "../native" }
 stak-process-context = { version = "0.2.51", path = "../process_context" }
 stak-r7rs = { version = "0.9.7", path = "../r7rs" }
 stak-sac = { version = "0.1.95", path = "../sac" }

diff --git a/root/src/lib.rs b/root/src/lib.rs
@@ -7,6 +7,12 @@ pub mod device {
     pub use stak_device::*;
 }
 
+pub mod dynamic {
+    //! Dynamically-defined primitives.
+
+    pub use stak_dynamic::*;
+}
+
 pub mod engine {
     //! A scripting engine.
 
@@ -25,12 +31,6 @@ pub mod module {
     pub use stak_module::*;
 }
 
-pub mod native {
-    //! Native functions and objects in Rust.
-
-    pub use stak_native::*;
-}
-
 pub mod process_context {
     //! Process context.