fix p5 state calculations

pkg/ludus.js

@@ -236,71 +236,68 @@ function unit_of (heading) {
   return [Math.cos(radians), Math.sin(radians)]
 }
 
-function command_to_state (state, command) {
+function command_to_state (prev_state, curr_command) {
-  const [target, _id, curr_command] = command
-  const state_stack = state[target] ?? [turtle_init]
-  const prev_state = state_stack[state_stack.length - 1]
   const [verb] = curr_command
   switch (verb) {
     case "goto": {
       const [_, x, y] = curr_command
-      return [target, {...prev_state, position: [x, y]}]
+      return {...prev_state, position: [x, y]}
     }
     case "home": {
-      return [target, {...prev_state, position: [0, 0], heading: 0}]
+      return {...prev_state, position: [0, 0], heading: 0}
     }
     case "right": {
       const [_, angle] = curr_command
       const {heading} = prev_state
-      return [target, {...prev_state, heading: heading + angle}]
+      return {...prev_state, heading: heading + angle}
     }
     case "left": {
       const [_, angle] = curr_command
       const {heading} = prev_state
-      return [target, {...prev_state, heading: heading - angle}]
+      return {...prev_state, heading: heading - angle}
     }
     case "forward": {
       const [_, steps] = curr_command
       const {heading, position} = prev_state
       const unit = unit_of(heading)
       const move = mult(unit, steps)
-      return [target, {...prev_state, position: add(position, move)}]
+      return {...prev_state, position: add(position, move)}
     }
     case "back": {
       const [_, steps] = curr_command
       const {heading, position} = prev_state
       const unit = unit_of(heading)
       const move = mult(unit, -steps)
-      return [target, {...prev_state, position: add(position, move)}]
+      return {...prev_state, position: add(position, move)}
     }
     case "penup": {
-      return [target, {...prev_state, pendown: false}]
+      return {...prev_state, pendown: false}
     }
     case "pendown": {
-      return [target, {...prev_state, pendown: true}]
+      return {...prev_state, pendown: true}
     }
     case "penwidth": {
       const [_, width] = curr_command
-      return [target, {...prev_state, penwidth: width}]
+      return {...prev_state, penwidth: width}
     }
     case "pencolor": {
       const [_, color] = curr_command
-      return [target, {...prev_state, pencolor: color}]
+      return {...prev_state, pencolor: color}
     }
     case "setheading": {
       const [_, heading] = curr_command
-      return [target, {...prev_state, heading: heading}]
+      return {...prev_state, heading: heading}
     }
     case "loadstate": {
       // console.log("LOADSTATE: ", curr_command)
       const [_, [x, y], heading, visible, pendown, penwidth, pencolor] = curr_command
-      return [target, {position: [x, y], heading, visible, pendown, penwidth, pencolor}]
+      return {position: [x, y], heading, visible, pendown, penwidth, pencolor}
     }
     case "show": {
-      return [target, {...prev_state, visible: true}]
+      return {...prev_state, visible: true}
     }
     case "hide": {
-      return [target, {...prev_state, visible: false}]
+      return {...prev_state, visible: false}
     }
     case "background": {
       background_color = curr_command[1]
@@ -535,18 +532,29 @@ function p5_render_turtle (state, calls) {
 //   return p5_calls
 // }
 
+function last (arr) {
+  return arr[arr.length - 1]
+}
+
 export function p5 (commands) {
   const all_states = {}
-  commands.reduce((prev_state, command) => {
+  for (const command of commands) {
-    const [turtle_id, new_state] = command_to_state(prev_state, command)
+    const [turtle_id, _, this_command] = command
-    if (!all_states[turtle_id]) all_states[turtle_id] = [turtle_init]
+    let stack = all_states[turtle_id]
+    if (!stack) {
+      const new_stack = [turtle_init]
+      all_states[turtle_id] = new_stack
+      stack = new_stack
+    }
+    let prev_state = last(all_states[turtle_id])
+    const new_state = command_to_state(prev_state, this_command)
     all_states[turtle_id].push(new_state)
-    return new_state
+  }
-  }, all_states)
   const [r, g, b, _] = resolve_color(background_color)  
   if ((r + g + b)/3 > 128) turtle_color = [0, 0, 0, 150]
   const p5_calls = [...p5_call_root()]
   for (const states of Object.values(all_states)) {
+    console.log(states)
     for (let i = 1; i < states.length; ++i) {
       const prev = states[i - 1]
       const curr = states[i]
@@ -554,11 +562,11 @@ export function p5 (commands) {
       for (const call of calls) {
         p5_calls.push(call)
       }
-      p5_calls[0] = ["background", ...resolve_color(background_color)]
-      p5_render_turtle(states[states.length - 1], p5_calls)
     }
+    p5_calls[0] = ["background", ...resolve_color(background_color)]
+    p5_render_turtle(states[states.length - 1], p5_calls)
+    p5_calls.push(["pop"])
   }
-  p5_calls.push(["pop"])
   return p5_calls
 }
 

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 closure338_externref_shim: (a: number, b: number, c: any) => void;
+  readonly closure353_externref_shim: (a: number, b: number, c: any) => void;
-  readonly closure351_externref_shim: (a: number, b: number, c: any, d: any) => void;
+  readonly closure376_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.closure338_externref_shim(arg0, arg1, arg2);
+    _assertNum(arg0);
+    _assertNum(arg1);
+    wasm.closure353_externref_shim(arg0, arg1, arg2);
 }
 
 function __wbg_adapter_46(arg0, arg1, arg2, arg3) {
-    wasm.closure351_externref_shim(arg0, arg1, arg2, arg3);
+    _assertNum(arg0);
+    _assertNum(arg1);
+    wasm.closure376_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_wrapper1041 = function(arg0, arg1, arg2) {
+    imports.wbg.__wbindgen_closure_wrapper8090 = function() { return logError(function (arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 339, __wbg_adapter_20);
+        const ret = makeMutClosure(arg0, arg1, 354, __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 closure338_externref_shim: (a: number, b: number, c: any) => void;
+export const closure353_externref_shim: (a: number, b: number, c: any) => void;
-export const closure351_externref_shim: (a: number, b: number, c: any, d: any) => void;
+export const closure376_externref_shim: (a: number, b: number, c: any, d: any) => void;
 export const __wbindgen_start: () => void;