Proof of concept of package manager

.github/workflows/rust.yml

@@ -109,10 +109,11 @@ jobs:
       - name: Build
         run: cargo build --verbose
 
-      - name: install steel dylib installer
+      - name: Install steel dylib installer and package manager
         env:
           STEEL_HOME: ${{ env.STEEL_HOME }}
-        run: mkdir -p $STEEL_HOME/native && cd crates/cargo-steel-lib && cargo install --path .
+        # run: mkdir -p $STEEL_HOME/native && cd crates/cargo-steel-lib && cargo install --path .
+        run: cargo install --path crates/cargo-steel-lib && cargo install --path crates/forge
 
       - name: Install cogs
         env:

Cargo.toml

@@ -6,13 +6,13 @@ edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/mattwparas/steel"
 description = "Steel repl and command line interface"
+default-run = "steel"
 
 include = ["/src/**/*", "/Cargo.toml", "/README.md", "LICENSE*"]
 
 [workspace.package]
 version = "0.6.0"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bin]]
 name = "steel"
 path = "src/main.rs"
@@ -22,7 +22,9 @@ path = "src/main.rs"
 steel-core = { path = "./crates/steel-core", version = "0.6.0", features = ["dylibs", "markdown", "stacker", "sync"] }
 
 [features]
+default = ["mimalloc"]
 build-info = ["vergen"]
+mimalloc = ["dep:mimalloc"]
 # Note: It does not appear that this will get propagated to any crate that depends on
 # the workspace feature. This is unfortunate, since we'd like everything to actually
 # use the workspace dependency. For now, if you want to test with sync, you should
@@ -39,6 +41,7 @@ env_logger = "0.10.0"
 log = "0.4.17"
 clap = { version = "=4.1.4", features = ["derive"] }
 steel-doc = { path = "./crates/steel-doc", version = "0.6.0" }
+mimalloc = { version = "0.1.43", optional = true }
 
 [target.'cfg(not(target_os = "redox"))'.dependencies]
 cargo-steel-lib = { path = "./crates/cargo-steel-lib", version = "0.1.0" }
@@ -55,7 +58,7 @@ members = [
 ]
 
 [profile.release]
-debug = false
+debug = true
 lto = true
 
 [profile.test]

benchmarks/bench.scm

@@ -6,7 +6,14 @@
 (define (run-bench args)
   (~> (command "hyperfine" args) (spawn-process) (Ok->value) (wait)))
 
-(define *interpreter-map* (hash "py" "python3.10" "scm" "../target/release/steel" "lua" "lua"))
+(define *interpreter-map*
+  (hash "py"
+        "python3.13"
+        ;; "scm" "../target/release/steel"
+        "scm"
+        "../target/aarch64-apple-darwin/release/steel"
+        "lua"
+        "lua"))
 
 (define (extension->interpreter ext)
   (hash-get *interpreter-map* ext))

benchmarks/bin-trees/bin-trees.scm

@@ -16,13 +16,13 @@
   (node #f val #f))
 (define (leaf? l)
   (not (node-left l)))
-(define (leaf-val l)
-  node-val)
 
 (define (make item d)
   (if (= d 0)
       (leaf item)
-      (let ([item2 (* item 2)] [d2 (- d 1)]) (node (make (- item2 1) d2) item (make item2 d2)))))
+      (let ([item2 (* item 2)]
+            [d2 (- d 1)])
+        (node (make (- item2 1) d2) item (make item2 d2)))))
 
 (define (check t)
   (if (leaf? t) 1 (+ 1 (+ (check (node-left t)) (check (node-right t))))))
@@ -42,7 +42,8 @@
         (loop (+ 2 d) end max-depth min-depth))))
 
 (define (main n)
-  (let* ([min-depth 4] [max-depth (max (+ min-depth 2) n)])
+  (let* ([min-depth 4]
+         [max-depth (max (+ min-depth 2) n)])
     (let ([stretch-depth (+ max-depth 1)])
       (displayln "stretch tree of depth " stretch-depth " check: " (check (make 0 stretch-depth))))
     (let ([long-lived-tree (make 0 max-depth)])

benchmarks/fib/fib.scm

@@ -1,4 +1,4 @@
 (define (fib n)
   (if (<= n 2) 1 (+ (fib (- n 1)) (fib (- n 2)))))
 
-(fib 40)
+(fib 28)

build.rs

@@ -0,0 +1,16 @@
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    #[cfg(feature = "build-info")]
+    {
+        use vergen::{BuildBuilder, CargoBuilder, Emitter, RustcBuilder};
+        let build = BuildBuilder::all_build()?;
+        let cargo = CargoBuilder::all_cargo()?;
+        let rustc = RustcBuilder::all_rustc()?;
+
+        Emitter::default()
+            .add_instructions(&build)?
+            .add_instructions(&cargo)?
+            .add_instructions(&rustc)?
+            .emit()?;
+    }
+    Ok(())
+}

cogs/command-line/args.scm

@@ -16,7 +16,7 @@
     [(empty? arg-list)
      ;; Check that the positionl args have been fulfilled
      (when (not (= (length (ArgumentParserSpec-positional-args spec)) (length positional-args)))
-       (displayln "getting here")
+       ; (displayln "getting here")
        (error "Missing positional arguments: "
               (drop (ArgumentParserSpec-positional-args spec) (length positional-args))))
 

cogs/fs/cog.scm

@@ -2,4 +2,4 @@
 (define version "0.1.0")
 
 ;; Core library, requires no dependencies
-(define dependencies '())
+(define dependencies '())