From 9361b65c4a95af6520acc48d36c9d658746d2bc3 Mon Sep 17 00:00:00 2001 From: Scott Richmond Date: Sun, 6 Jul 2025 17:18:37 -0400 Subject: [PATCH] get doc! to where it needs to be; make show much longer --- assets/test_prelude.ld | 4 +- pkg/rudus.d.ts | 4 +- pkg/rudus.js | 114 ++++++++++++++++++++++++++--------------- pkg/rudus_bg.wasm | 4 +- pkg/rudus_bg.wasm.d.ts | 4 +- src/base.rs | 15 ++++-- src/compiler.rs | 4 ++ src/value.rs | 22 ++++---- src/vm.rs | 1 + 9 files changed, 109 insertions(+), 63 deletions(-) diff --git a/assets/test_prelude.ld b/assets/test_prelude.ld index e788a59..b69f0e7 100644 --- a/assets/test_prelude.ld +++ b/assets/test_prelude.ld @@ -468,8 +468,8 @@ fn report! { fn doc! { "Prints the documentation of a function to the console." - (f as :fn) -> do f > base :doc! > print! - (_) -> :none + (f as :fn) -> do f > base :doc > print! + (_) -> nil } &&& numbers, basically: arithmetic and not much else, yet diff --git a/pkg/rudus.d.ts b/pkg/rudus.d.ts index eaec74d..5855a59 100644 --- a/pkg/rudus.d.ts +++ b/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 closure355_externref_shim: (a: number, b: number, c: any) => void; - readonly closure368_externref_shim: (a: number, b: number, c: any, d: any) => void; + readonly closure362_externref_shim: (a: number, b: number, c: any) => void; + readonly closure385_externref_shim: (a: number, b: number, c: any, d: any) => void; readonly __wbindgen_start: () => void; } diff --git a/pkg/rudus.js b/pkg/rudus.js index c2b2888..4f63b01 100644 --- a/pkg/rudus.js +++ b/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 ""; + } + }()); + 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.closure355_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.closure368_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)); - }; - imports.wbg.__wbg_new_23a2665fac83c611 = function(arg0, arg1) { + }, arguments) }; + 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; } - }; - imports.wbg.__wbg_new_8a6f238a6ece86ea = function() { + }, arguments) }; + imports.wbg.__wbg_new_8a6f238a6ece86ea = function() { return logError(function () { const ret = new Error(); return ret; - }; - imports.wbg.__wbg_newnoargs_105ed471475aaf50 = function(arg0, arg1) { + }, arguments) }; + imports.wbg.__wbg_newnoargs_105ed471475aaf50 = function() { return logError(function (arg0, arg1) { const ret = new Function(getStringFromWasm0(arg0, arg1)); return ret; - }; - imports.wbg.__wbg_now_8dddb61fa4928554 = function() { + }, arguments) }; + imports.wbg.__wbg_now_8dddb61fa4928554 = function() { return logError(function () { const ret = Date.now(); return ret; - }; - imports.wbg.__wbg_queueMicrotask_97d92b4fcc8a61c5 = function(arg0) { + }, arguments) }; + imports.wbg.__wbg_queueMicrotask_97d92b4fcc8a61c5 = function() { return logError(function (arg0) { queueMicrotask(arg0); - }; - imports.wbg.__wbg_queueMicrotask_d3219def82552485 = function(arg0) { + }, arguments) }; + imports.wbg.__wbg_queueMicrotask_d3219def82552485 = function() { return logError(function (arg0) { const ret = arg0.queueMicrotask; return ret; - }; - imports.wbg.__wbg_random_57c118f142535bb6 = function() { + }, arguments) }; + imports.wbg.__wbg_random_57c118f142535bb6 = function() { return logError(function () { const ret = Math.random(); return ret; - }; - imports.wbg.__wbg_resolve_4851785c9c5f573d = function(arg0) { + }, arguments) }; + imports.wbg.__wbg_resolve_4851785c9c5f573d = function() { return logError(function (arg0) { const ret = Promise.resolve(arg0); return ret; - }; - imports.wbg.__wbg_stack_0ed75d68575b0f3c = function(arg0, arg1) { + }, arguments) }; + 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); - }; - imports.wbg.__wbg_static_accessor_GLOBAL_88a902d13a557d07 = function() { + }, arguments) }; + imports.wbg.__wbg_static_accessor_GLOBAL_88a902d13a557d07 = function() { return logError(function () { const ret = typeof global === 'undefined' ? null : global; return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); - }; - imports.wbg.__wbg_static_accessor_GLOBAL_THIS_56578be7e9f832b0 = function() { + }, arguments) }; + 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); - }; - imports.wbg.__wbg_static_accessor_SELF_37c5d418e4bf5819 = function() { + }, arguments) }; + imports.wbg.__wbg_static_accessor_SELF_37c5d418e4bf5819 = function() { return logError(function () { const ret = typeof self === 'undefined' ? null : self; return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); - }; - imports.wbg.__wbg_static_accessor_WINDOW_5de37043a91a9c40 = function() { + }, arguments) }; + imports.wbg.__wbg_static_accessor_WINDOW_5de37043a91a9c40 = function() { return logError(function () { const ret = typeof window === 'undefined' ? null : window; return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); - }; - imports.wbg.__wbg_then_44b73946d2fb3e7d = function(arg0, arg1) { + }, arguments) }; + imports.wbg.__wbg_then_44b73946d2fb3e7d = function() { return logError(function (arg0, arg1) { const ret = arg0.then(arg1); return ret; - }; - imports.wbg.__wbg_then_48b406749878a531 = function(arg0, arg1, arg2) { + }, arguments) }; + 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_wrapper1077 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 356, __wbg_adapter_20); + imports.wbg.__wbindgen_closure_wrapper8168 = function() { return logError(function (arg0, arg1, arg2) { + 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) { diff --git a/pkg/rudus_bg.wasm b/pkg/rudus_bg.wasm index dc4fada..ad0d4c7 100644 --- a/pkg/rudus_bg.wasm +++ b/pkg/rudus_bg.wasm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70abe5cd79b8431d36a788ccdb5237ec5b09815289e9b347825618e1b0d349fd -size 2697559 +oid sha256:ffca7245fe3947ee67291d6ab6c74972435e031857ca7a4a93d63b562915a4eb +size 16780016 diff --git a/pkg/rudus_bg.wasm.d.ts b/pkg/rudus_bg.wasm.d.ts index ef098a3..9c0f39e 100644 --- a/pkg/rudus_bg.wasm.d.ts +++ b/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 closure355_externref_shim: (a: number, b: number, c: any) => void; -export const closure368_externref_shim: (a: number, b: number, c: any, d: any) => void; +export const closure362_externref_shim: (a: number, b: number, c: any) => void; +export const closure385_externref_shim: (a: number, b: number, c: any, d: any) => void; export const __wbindgen_start: () => void; diff --git a/src/base.rs b/src/base.rs index 55d2f91..f99e139 100644 --- a/src/base.rs +++ b/src/base.rs @@ -52,10 +52,15 @@ pub fn store(b: &Value, val: &Value) -> Value { // TODO: do better than returning just the docstr // name, patterns, AND docstring pub fn doc(f: &Value) -> Value { - match f { - Value::Fn(f) => f.as_ref().doc(), - _ => Value::Interned("no documentation found"), - } + let f = f.as_fn(); + let name = f.name(); + let patterns = f.patterns(); + let docstr = f.doc(); + Value::from_string(format!( + "{name}\n{}\n{}", + patterns.stringify(), + docstr.stringify() + )) } pub fn assoc(dict: &Value, key: &Value, value: &Value) -> Value { @@ -665,7 +670,7 @@ pub fn make_base() -> Value { Value::BaseFn(Box::new(BaseFn::Binary("dissoc", dissoc))), ), ("div", Value::BaseFn(Box::new(BaseFn::Binary("div", div)))), - ("doc!", Value::BaseFn(Box::new(BaseFn::Unary("doc!", doc)))), + ("doc", Value::BaseFn(Box::new(BaseFn::Unary("doc", doc)))), ( "downcase", Value::BaseFn(Box::new(BaseFn::Unary("downcase", downcase))), diff --git a/src/compiler.rs b/src/compiler.rs index e225b0b..bf7e8d1 100644 --- a/src/compiler.rs +++ b/src/compiler.rs @@ -1096,6 +1096,7 @@ impl Compiler { chunks, splat: 0, closed: RefCell::new(vec![]), + patterns: vec!["()".to_string()], }; let the_fn = Value::Fn(Rc::new(lfn)); @@ -1158,6 +1159,7 @@ impl Compiler { Fn(name, body, doc) => { let is_anon = name.is_empty(); let mut name = name; + let mut patterns = vec![]; if !is_anon { let declared = self.chunk.constants.iter().any(|val| match val { @@ -1194,6 +1196,7 @@ impl Compiler { unreachable!() }; let full_pattern = pattern; + patterns.push(full_pattern.as_ref().0.show()); let TuplePattern(pattern) = &pattern.0 else { unreachable!() }; @@ -1310,6 +1313,7 @@ impl Compiler { chunks, splat, closed: RefCell::new(vec![]), + patterns, }; let the_fn = Value::Fn(Rc::new(lfn)); diff --git a/src/value.rs b/src/value.rs index cadb2b3..9a9fdaf 100644 --- a/src/value.rs +++ b/src/value.rs @@ -18,6 +18,7 @@ pub enum LFn { chunks: Vec, splat: u8, closed: RefCell>, + patterns: Vec, }, } @@ -36,19 +37,20 @@ impl LFn { } } + pub fn patterns(&self) -> Value { + match self { + LFn::Declared { .. } => unreachable!(), + LFn::Defined { patterns, .. } => Value::from_string(patterns.join(" | ")), + } + } + pub fn doc(&self) -> Value { match self { LFn::Declared { name } => { Value::String(Rc::new(format!("fn {name}: undefined function"))) } - LFn::Defined { - name, - doc: Some(doc), - .. - } => Value::String(Rc::new(format!("fn {name}\n{doc}"))), - LFn::Defined { name, .. } => { - Value::String(Rc::new(format!("fn {name}: no documentation"))) - } + LFn::Defined { doc: Some(doc), .. } => Value::String(Rc::new(doc.to_string())), + LFn::Defined { .. } => Value::String(Rc::new("no documentation found".to_string())), } } @@ -343,8 +345,8 @@ impl Value { BaseFn(_) => format!("{self}"), Nothing => "_".to_string(), }; - if out.len() > 80 { - out.truncate(77); + if out.len() > 1000 { + out.truncate(997); format!("{out}...") } else { out diff --git a/src/vm.rs b/src/vm.rs index 0f898aa..63fcd40 100644 --- a/src/vm.rs +++ b/src/vm.rs @@ -93,6 +93,7 @@ impl Creature { arities: vec![0], splat: 0, closed: RefCell::new(vec![]), + patterns: vec![], }; let base_fn = Value::Fn(Rc::new(lfn)); Creature::spawn(base_fn, zoo, debug)