fix guard clause bug in function calls

Former-commit-id: 14d07e40de

assets/test_prelude.ld

@@ -143,7 +143,8 @@ fn rest {
 fn last {
 	"Returns the last element of a list or tuple."
 	(xs) if indexed? (xs) -> base :last (xs)
-	(_) -> nil
+	& (xs as :list) -> base :last (xs)
+	& (xs as :tuple) -> base :last (xs)
 }
 
 fn inc {

pkg/rudus.d.ts

@@ -14,8 +14,8 @@ export interface InitOutput {
   readonly __wbindgen_malloc: (a: number, b: number) => number;
   readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
   readonly __wbindgen_export_6: WebAssembly.Table;
-  readonly closure354_externref_shim: (a: number, b: number, c: any) => void;
+  readonly closure362_externref_shim: (a: number, b: number, c: any) => void;
-  readonly closure367_externref_shim: (a: number, b: number, c: any, d: any) => void;
+  readonly closure385_externref_shim: (a: number, b: number, c: any, d: any) => void;
   readonly __wbindgen_start: () => void;
 }
 

pkg/rudus.js

@@ -17,6 +17,22 @@ function handleError(f, args) {
     }
 }
 
+function logError(f, args) {
+    try {
+        return f.apply(this, args);
+    } catch (e) {
+        let error = (function () {
+            try {
+                return e instanceof Error ? `${e.message}\n\nStack:\n${e.stack}` : e.toString();
+            } catch(_) {
+                return "<failed to stringify thrown value>";
+            }
+        }());
+        console.error("wasm-bindgen: imported JS function that was not marked as `catch` threw an error:", error);
+        throw e;
+    }
+}
+
 const cachedTextDecoder = (typeof TextDecoder !== 'undefined' ? new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }) : { decode: () => { throw Error('TextDecoder not available') } } );
 
 if (typeof TextDecoder !== 'undefined') { cachedTextDecoder.decode(); };
@@ -54,6 +70,8 @@ const encodeString = (typeof cachedTextEncoder.encodeInto === 'function'
 
 function passStringToWasm0(arg, malloc, realloc) {
 
+    if (typeof(arg) !== 'string') throw new Error(`expected a string argument, found ${typeof(arg)}`);
+
     if (realloc === undefined) {
         const buf = cachedTextEncoder.encode(arg);
         const ptr = malloc(buf.length, 1) >>> 0;
@@ -82,7 +100,7 @@ function passStringToWasm0(arg, malloc, realloc) {
         ptr = realloc(ptr, len, len = offset + arg.length * 3, 1) >>> 0;
         const view = getUint8ArrayMemory0().subarray(ptr + offset, ptr + len);
         const ret = encodeString(arg, view);
-
+        if (ret.read !== arg.length) throw new Error('failed to pass whole string');
         offset += ret.written;
         ptr = realloc(ptr, len, offset, 1) >>> 0;
     }
@@ -104,6 +122,12 @@ function isLikeNone(x) {
     return x === undefined || x === null;
 }
 
+function _assertBoolean(n) {
+    if (typeof(n) !== 'boolean') {
+        throw new Error(`expected a boolean argument, found ${typeof(n)}`);
+    }
+}
+
 const CLOSURE_DTORS = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
     : new FinalizationRegistry(state => {
@@ -210,12 +234,19 @@ export function ludus(src) {
     return ret;
 }
 
+function _assertNum(n) {
+    if (typeof(n) !== 'number') throw new Error(`expected a number argument, found ${typeof(n)}`);
+}
 function __wbg_adapter_20(arg0, arg1, arg2) {
-    wasm.closure354_externref_shim(arg0, arg1, arg2);
+    _assertNum(arg0);
+    _assertNum(arg1);
+    wasm.closure362_externref_shim(arg0, arg1, arg2);
 }
 
 function __wbg_adapter_46(arg0, arg1, arg2, arg3) {
-    wasm.closure367_externref_shim(arg0, arg1, arg2, arg3);
+    _assertNum(arg0);
+    _assertNum(arg1);
+    wasm.closure385_externref_shim(arg0, arg1, arg2, arg3);
 }
 
 async function __wbg_load(module, imports) {
@@ -260,7 +291,7 @@ function __wbg_get_imports() {
         const ret = arg0.call(arg1, arg2);
         return ret;
     }, arguments) };
-    imports.wbg.__wbg_error_7534b8e9a36f1ab4 = function(arg0, arg1) {
+    imports.wbg.__wbg_error_7534b8e9a36f1ab4 = function() { return logError(function (arg0, arg1) {
         let deferred0_0;
         let deferred0_1;
         try {
@@ -270,7 +301,7 @@ function __wbg_get_imports() {
         } finally {
             wasm.__wbindgen_free(deferred0_0, deferred0_1, 1);
         }
-    };
+    }, arguments) };
     imports.wbg.__wbg_io_5a3c8ea72d8c6ea3 = function() { return handleError(function (arg0, arg1) {
         let deferred0_0;
         let deferred0_1;
@@ -283,10 +314,10 @@ function __wbg_get_imports() {
             wasm.__wbindgen_free(deferred0_0, deferred0_1, 1);
         }
     }, arguments) };
-    imports.wbg.__wbg_log_11652c6a56eeddfb = function(arg0, arg1) {
+    imports.wbg.__wbg_log_11652c6a56eeddfb = function() { return logError(function (arg0, arg1) {
         console.log(getStringFromWasm0(arg0, arg1));
-    };
+    }, arguments) };
-    imports.wbg.__wbg_new_23a2665fac83c611 = function(arg0, arg1) {
+    imports.wbg.__wbg_new_23a2665fac83c611 = function() { return logError(function (arg0, arg1) {
         try {
             var state0 = {a: arg0, b: arg1};
             var cb0 = (arg0, arg1) => {
@@ -303,65 +334,65 @@ function __wbg_get_imports() {
         } finally {
             state0.a = state0.b = 0;
         }
-    };
+    }, arguments) };
-    imports.wbg.__wbg_new_8a6f238a6ece86ea = function() {
+    imports.wbg.__wbg_new_8a6f238a6ece86ea = function() { return logError(function () {
         const ret = new Error();
         return ret;
-    };
+    }, arguments) };
-    imports.wbg.__wbg_newnoargs_105ed471475aaf50 = function(arg0, arg1) {
+    imports.wbg.__wbg_newnoargs_105ed471475aaf50 = function() { return logError(function (arg0, arg1) {
         const ret = new Function(getStringFromWasm0(arg0, arg1));
         return ret;
-    };
+    }, arguments) };
-    imports.wbg.__wbg_now_8dddb61fa4928554 = function() {
+    imports.wbg.__wbg_now_8dddb61fa4928554 = function() { return logError(function () {
         const ret = Date.now();
         return ret;
-    };
+    }, arguments) };
-    imports.wbg.__wbg_queueMicrotask_97d92b4fcc8a61c5 = function(arg0) {
+    imports.wbg.__wbg_queueMicrotask_97d92b4fcc8a61c5 = function() { return logError(function (arg0) {
         queueMicrotask(arg0);
-    };
+    }, arguments) };
-    imports.wbg.__wbg_queueMicrotask_d3219def82552485 = function(arg0) {
+    imports.wbg.__wbg_queueMicrotask_d3219def82552485 = function() { return logError(function (arg0) {
         const ret = arg0.queueMicrotask;
         return ret;
-    };
+    }, arguments) };
-    imports.wbg.__wbg_random_57c118f142535bb6 = function() {
+    imports.wbg.__wbg_random_57c118f142535bb6 = function() { return logError(function () {
         const ret = Math.random();
         return ret;
-    };
+    }, arguments) };
-    imports.wbg.__wbg_resolve_4851785c9c5f573d = function(arg0) {
+    imports.wbg.__wbg_resolve_4851785c9c5f573d = function() { return logError(function (arg0) {
         const ret = Promise.resolve(arg0);
         return ret;
-    };
+    }, arguments) };
-    imports.wbg.__wbg_stack_0ed75d68575b0f3c = function(arg0, arg1) {
+    imports.wbg.__wbg_stack_0ed75d68575b0f3c = function() { return logError(function (arg0, arg1) {
         const ret = arg1.stack;
         const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len1 = WASM_VECTOR_LEN;
         getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
         getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
-    };
+    }, arguments) };
-    imports.wbg.__wbg_static_accessor_GLOBAL_88a902d13a557d07 = function() {
+    imports.wbg.__wbg_static_accessor_GLOBAL_88a902d13a557d07 = function() { return logError(function () {
         const ret = typeof global === 'undefined' ? null : global;
         return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
-    };
+    }, arguments) };
-    imports.wbg.__wbg_static_accessor_GLOBAL_THIS_56578be7e9f832b0 = function() {
+    imports.wbg.__wbg_static_accessor_GLOBAL_THIS_56578be7e9f832b0 = function() { return logError(function () {
         const ret = typeof globalThis === 'undefined' ? null : globalThis;
         return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
-    };
+    }, arguments) };
-    imports.wbg.__wbg_static_accessor_SELF_37c5d418e4bf5819 = function() {
+    imports.wbg.__wbg_static_accessor_SELF_37c5d418e4bf5819 = function() { return logError(function () {
         const ret = typeof self === 'undefined' ? null : self;
         return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
-    };
+    }, arguments) };
-    imports.wbg.__wbg_static_accessor_WINDOW_5de37043a91a9c40 = function() {
+    imports.wbg.__wbg_static_accessor_WINDOW_5de37043a91a9c40 = function() { return logError(function () {
         const ret = typeof window === 'undefined' ? null : window;
         return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
-    };
+    }, arguments) };
-    imports.wbg.__wbg_then_44b73946d2fb3e7d = function(arg0, arg1) {
+    imports.wbg.__wbg_then_44b73946d2fb3e7d = function() { return logError(function (arg0, arg1) {
         const ret = arg0.then(arg1);
         return ret;
-    };
+    }, arguments) };
-    imports.wbg.__wbg_then_48b406749878a531 = function(arg0, arg1, arg2) {
+    imports.wbg.__wbg_then_48b406749878a531 = function() { return logError(function (arg0, arg1, arg2) {
         const ret = arg0.then(arg1, arg2);
         return ret;
-    };
+    }, arguments) };
     imports.wbg.__wbindgen_cb_drop = function(arg0) {
         const obj = arg0.original;
         if (obj.cnt-- == 1) {
@@ -369,12 +400,13 @@ function __wbg_get_imports() {
             return true;
         }
         const ret = false;
+        _assertBoolean(ret);
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper1083 = function(arg0, arg1, arg2) {
+    imports.wbg.__wbindgen_closure_wrapper8169 = function() { return logError(function (arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 355, __wbg_adapter_20);
+        const ret = makeMutClosure(arg0, arg1, 363, __wbg_adapter_20);
         return ret;
-    };
+    }, arguments) };
     imports.wbg.__wbindgen_debug_string = function(arg0, arg1) {
         const ret = debugString(arg1);
         const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -394,10 +426,12 @@ function __wbg_get_imports() {
     };
     imports.wbg.__wbindgen_is_function = function(arg0) {
         const ret = typeof(arg0) === 'function';
+        _assertBoolean(ret);
         return ret;
     };
     imports.wbg.__wbindgen_is_undefined = function(arg0) {
         const ret = arg0 === undefined;
+        _assertBoolean(ret);
         return ret;
     };
     imports.wbg.__wbindgen_string_get = function(arg0, arg1) {

pkg/rudus_bg.wasm.d.ts

@@ -9,6 +9,6 @@ export const __wbindgen_free: (a: number, b: number, c: number) => void;
 export const __wbindgen_malloc: (a: number, b: number) => number;
 export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
 export const __wbindgen_export_6: WebAssembly.Table;
-export const closure354_externref_shim: (a: number, b: number, c: any) => void;
+export const closure362_externref_shim: (a: number, b: number, c: any) => void;
-export const closure367_externref_shim: (a: number, b: number, c: any, d: any) => void;
+export const closure385_externref_shim: (a: number, b: number, c: any, d: any) => void;
 export const __wbindgen_start: () => void;

src/compiler.rs

@@ -1258,7 +1258,6 @@ impl Compiler {
                             Box::leak(Box::new(guard.clone().unwrap()));
                         compiler.visit(guard_expr);
                         no_match_jumps.push(compiler.stub_jump(Op::JumpIfFalse));
-                        compiler.stack_depth -= 1;
                     }
                     compiler.tail_pos = true;
                     compiler.visit(clause_body);

src/errors.rs

@@ -97,22 +97,48 @@ pub fn panic(panic: Panic) -> String {
     // console_log!("Ludus panicked!: {panic}");
     // panic.call_stack.last().unwrap().chunk().dissasemble();
     // console_log!("{:?}", panic.call_stack.last().unwrap().chunk().spans);
-    let mut msgs = vec![];
+    let Panic {
-    let Panic { msg, scrutinee, .. } = &panic;
+        msg,
-    let msg = match msg {
+        scrutinee,
-        PanicMsg::Generic(ref s) => s,
+        call_stack,
-        PanicMsg::NoFnMatch => &format!(
+    } = &panic;
-            "no match against {}",
+    match msg {
-            scrutinee
+        PanicMsg::Generic(msg) => {
-                .as_ref()
+            let traceback = traceback(&panic);
-                .expect("expect a match panic to have a scrutinee")
+            format!("{msg}\n{traceback}")
-        ),
+        }
-        _ => &String::from("no match"),
+        PanicMsg::NoFnMatch => {
-    };
+            let name = call_stack.last().unwrap().function.as_fn().name();
-    msgs.push(msg.clone());
+            let scrutinee = scrutinee.as_ref().unwrap();
-    msgs.push(traceback(&panic));
+            let traceback = but_first_traceback(&panic);
+            let patterns = call_stack
+                .last()
+                .unwrap()
+                .function
+                .as_fn()
+                .patterns()
+                .stringify();
+            format!(
+                "no match calling fn `{name}` with `{scrutinee}`\n  expected match with one of:\n    {patterns}\n{traceback}",
+            )
+        }
+        PanicMsg::NoLetMatch => {
+            let scrutinee = scrutinee.as_ref().unwrap();
+            let traceback = traceback(&panic);
+            format!("no match in `let` form against `{scrutinee}`\n{traceback}")
+        }
+        _ => String::from("no match"),
+    }
+}
 
-    msgs.join("\n")
+fn but_first_traceback(panic: &Panic) -> String {
+    let mut traceback = vec![];
+    let mut stack = panic.call_stack.iter().rev();
+    stack.next();
+    for frame in stack {
+        traceback.push(frame_info(frame));
+    }
+    traceback.join("\n")
 }
 
 fn traceback(panic: &Panic) -> String {