Flesh out new structure for interpreter (and eventual comp)

maplant · Dec 25, 2024 · f85ed81 · f85ed81
1 parent dd88133
commit f85ed81
Show file tree

Hide file tree

Showing 19 changed files with 1,600 additions and 1,083 deletions.
diff --git a/benches/fib.rs b/benches/fib.rs
@@ -19,7 +19,7 @@ async fn fib() {
 }
 
 fn fib_benchmark(c: &mut Criterion) {
-    c.bench_function("fib 100", |b| {
+    c.bench_function("fib 10000", |b| {
         b.to_async(tokio::runtime::Runtime::new().unwrap())
             .iter(fib)
     });

diff --git a/benches/fib.scm b/benches/fib.scm
@@ -5,4 +5,4 @@
          (iter b (+ a b) (- count 1))))
    (iter 0 1 n))
 
-(fib 100)
+(fib 10000)
diff --git a/proc-macros/src/lib.rs b/proc-macros/src/lib.rs
@@ -33,13 +33,13 @@ pub fn builtin(name: TokenStream, item: TokenStream) -> TokenStream {
             fn #wrapper_name(
                 cont: Option<std::sync::Arc<::scheme_rs::continuation::Continuation>>,
                 args: Vec<::scheme_rs::gc::Gc<::scheme_rs::value::Value>>
-            ) -> futures::future::BoxFuture<'static, Result<::scheme_rs::eval::ValuesOrPreparedCall, ::scheme_rs::error::RuntimeError>> {
+            ) -> futures::future::BoxFuture<'static, Result<::scheme_rs::proc::ValuesOrPreparedCall, ::scheme_rs::error::RuntimeError>> {
                 Box::pin(
                     async move {
                         #impl_name(
                             &cont,
                             #( &args[#arg_indices], )*
-                        ).await.map(::scheme_rs::eval::ValuesOrPreparedCall::from)
+                        ).await.map(::scheme_rs::proc::ValuesOrPreparedCall::from)
                     }
                 )
             }
@@ -50,15 +50,15 @@ pub fn builtin(name: TokenStream, item: TokenStream) -> TokenStream {
             fn #wrapper_name(
                 cont: Option<std::sync::Arc<::scheme_rs::continuation::Continuation>>,
                 mut required_args: Vec<::scheme_rs::gc::Gc<::scheme_rs::value::Value>>
-            ) -> futures::future::BoxFuture<'static, Result<::scheme_rs::eval::ValuesOrPreparedCall, ::scheme_rs::error::RuntimeError>> {
+            ) -> futures::future::BoxFuture<'static, Result<::scheme_rs::proc::ValuesOrPreparedCall, ::scheme_rs::error::RuntimeError>> {
                 let var_args = required_args.split_off(#num_args);
                 Box::pin(
                     async move {
                         #impl_name(
                             &cont,
                             #( &required_args[#arg_indices], )*
                             var_args
-                        ).await.map(::scheme_rs::eval::ValuesOrPreparedCall::from)
+                        ).await.map(::scheme_rs::proc::ValuesOrPreparedCall::from)
                     }
                 )
             }

diff --git a/src/ast.rs b/src/ast.rs
diff --git a/src/ast/eval.rs b/src/ast/eval.rs
@@ -0,0 +1,25 @@
+//! todo
+
+use crate::continuation::*;
+use super::*;
+
+impl Body {
+    pub async fn tail_eval(
+        &self,
+        env: &Env,
+        cont: &Option<Arc<Continuation>>,
+    ) -> Result<ValuesOrPreparedCall, RuntimeError> {
+        let Some(last) = self.forms.last() else {
+            return Ok(ValuesOrPreparedCall::Values(vec![Gc::new(Value::Null)]));
+        };
+        for (form, tail) in self.forms.skip_last() {
+            let cont = Some(Arc::new(Continuation::new(
+                Arc::new(ResumableBody::new(env, &tail)),
+                cont,
+            )));
+            // Discard values that aren't returned
+            form.eval(env, &cont).await?;
+        }
+        last.tail_eval(env, cont).await
+    }
+}