d169ae7 | plum | pyrossh

git clone https://git.pyrossh.dev/plum

A statically typed, imperative programming language inspired by rust, python

d169ae7 — Peter John 2026-11-03T16:45:22+05:30

tail calls: wire trmc::rewrite into typedSource; plum-core test dev-deps

Generated files not shown: Cargo.lock

Files changed (2) hide show

plum-checker/src/lib.rs +21 -3
plum-core/Cargo.toml +4 -0

plum-checker/src/lib.rs CHANGED Viewed

@@ -1179,9 +1179,27 @@ pub fn checkSource(source: &ast::Source) -> CheckResult<()> {
 /// instantiated type of every expression (keyed by expression address) and the
 /// set of generic instantiations (see `TypedInfo`) for codegen.
 pub fn typedSource(source: &ast::Source) -> CheckResult<TypedInfo> {
-    let (result, mut info) = checkSourceFull(source);
+    let (mut result, mut info) = checkSourceFull(source);
-    // TODO(tail-calls): the tail-recursion-modulo-cons AST rewrite pass goes HERE,
+    // Tail recursion modulo cons: rewrite the lowered program, then check the
-    // on the fully lowered program, immediately before `markTailCalls`.
+    // rewrite again (types are recorded per expression address). If the rewrite
+    // does not check, keep the original program.
+    if result.is_ok() {
+        if let Some(lowered) = info.lowered.as_ref() {
+            let mut copy = (**lowered).clone();
+            if !plum_core::trmc::rewrite(&mut copy).is_empty() {
+                let saved = plum_core::unions::takePlan();
+                plum_core::unions::beginPlan();
+                let (r2, mut i2) = checkSourceOnce(&copy);
+                plum_core::unions::takePlan();
+                unions::restorePlan(&saved);
+                if r2.is_ok() {
+                    i2.lowered = Some(std::rc::Rc::new(copy));
+                    result = r2;
+                    info = i2;
+                }
+            }
+        }
+    }
     // Mark tail calls on the final lowered program codegen compiles. Flags are set
     // in place, so the address-keyed type info stays valid.
     if let Some(lowered) = info.lowered.as_mut().and_then(std::rc::Rc::get_mut) {

plum-core/Cargo.toml CHANGED Viewed

@@ -11,3 +11,7 @@ topiary-tree-sitter-facade = "0.7.3"
 [dev-dependencies]
 tempfile = "3"
+plum-checker = { path = "../plum-checker" }
+plum-wasm-codegen = { path = "../plum-wasm-codegen" }
+wasmparser = "0.220"
+wasmtime = "47"