Switch to non-send Gc implementation to improve performance and simpl…

…ify code (#46)

* Add benchmarks

* Switch to non-send rwlock for gc to simplify code

* Add bench

* deep clone fix

* Move cont clones back in line to improve clarity

.github/workflows/rust.yml

@@ -29,3 +29,5 @@ jobs:
       run: cargo clippy --all-targets -- -Dclippy::all -D warnings
     - name: Test
       run: cargo test
+    - name: Bench
+      run: cargo bench

Cargo.toml

@@ -25,3 +25,10 @@ derivative = "2"
 
 [profile.release]
 lto = true
+
+[dev-dependencies]
+criterion = { version = "0.5", features = ["html_reports", "async_tokio"] }
+
+[[bench]]
+name = "fib"
+harness = false

benches/fib.rs

@@ -0,0 +1,29 @@
+use scheme_rs::{env::Env, lex::Token, syntax::ParsedSyntax};
+
+use criterion::*;
+
+async fn fib() {
+    let top = Env::top().await;
+
+    let r6rs_tok = Token::tokenize_file(include_str!("fib.scm"), "fib.scm").unwrap();
+    let r6rs_sexprs = ParsedSyntax::parse(&r6rs_tok).unwrap();
+    for sexpr in r6rs_sexprs {
+        sexpr
+            .compile(&top, &None)
+            .await
+            .unwrap()
+            .eval(&top, &None)
+            .await
+            .unwrap();
+    }
+}
+
+fn fib_benchmark(c: &mut Criterion) {
+    c.bench_function("fib 100", |b| {
+        b.to_async(tokio::runtime::Runtime::new().unwrap())
+            .iter(fib)
+    });
+}
+
+criterion_group!(benches, fib_benchmark);
+criterion_main!(benches);

benches/fib.scm

@@ -0,0 +1,8 @@
+(define (fib n)
+   (define (iter a b count)
+     (if (<= count 0)
+         a
+         (iter b (+ a b) (- count 1))))
+   (iter 0 1 n))
+
+(fib 100)

src/ast.rs

@@ -47,9 +47,10 @@ pub struct DefineFunc {
     pub body: Body,
 }
 
-#[derive(Clone, Trace)]
+#[derive(Clone, Trace, derive_more::Debug)]
 pub struct DefineVar {
     pub name: Identifier,
+    #[debug(skip)]
     pub val: Arc<dyn Eval>,
 }
 

src/compile.rs

@@ -483,8 +483,7 @@ impl Compile for ast::DefineSyntax {
                         .eval(env, cont)
                         .await?
                         .require_one()?,
-                )
-                .await;
+                );
                 Ok(ast::DefineSyntax)
             }
             _ => Err(CompileDefineSyntaxError::BadForm(span.clone())),