diff --git a/pkg/argus_wasm.js b/pkg/argus_wasm.js index baae7ab..1a45345 100644 --- a/pkg/argus_wasm.js +++ b/pkg/argus_wasm.js @@ -296,6 +296,12 @@ function __wbg_get_imports() { const ret = arg0.call(arg1); return ret; }, arguments) }; + imports.wbg.__wbg_debug_f1d2561716225913 = function(arg0, arg1) { + console.debug(arg0, arg1); + }; + imports.wbg.__wbg_debug_f4b0c59db649db48 = function(arg0) { + console.debug(arg0); + }; imports.wbg.__wbg_done_2042aa2670fb1db1 = function(arg0) { const ret = arg0.done; return ret; @@ -352,12 +358,6 @@ function __wbg_get_imports() { const ret = arg0.length; return ret; }; - imports.wbg.__wbg_log_8cec76766b8c0e33 = function(arg0) { - console.log(arg0); - }; - imports.wbg.__wbg_log_eeaf399d6effdabf = function(arg0, arg1) { - console.log(arg0, arg1); - }; imports.wbg.__wbg_new_1acc0b6eea89d040 = function() { const ret = new Object(); return ret; diff --git a/pkg/argus_wasm_bg.wasm b/pkg/argus_wasm_bg.wasm index a268a4a..12fc8ec 100644 Binary files a/pkg/argus_wasm_bg.wasm and b/pkg/argus_wasm_bg.wasm differ diff --git a/src/lib.rs b/src/lib.rs index b962c30..eb1f618 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -6,7 +6,6 @@ extern crate serde; extern crate serde_wasm_bindgen; extern crate web_sys; -use js_sys::Math::sign; use wasm_bindgen::prelude::*; use argus::expr::{Expr}; @@ -75,11 +74,11 @@ pub fn eval_boolean(s: &str, js_trace: JsValue) -> JsValue { } let m = TraceMap{traces: traceMap}; for name in m.signal_names() { - console::log_2(&JsValue::from_str("signal name:"), &JsValue::from_str(name)); + console::debug_2(&JsValue::from_str("signal name:"), &JsValue::from_str(name)); let signal: &Signal = m.get(name).expect("bla"); if let Signal::::Sampled { values, time_points } = signal { for i in 0..(values.len()) { - console::log_2( + console::debug_2( &JsValue::from_f64(time_points[i].as_millis() as f64), &JsValue::from_f64(values[i])); } @@ -95,13 +94,13 @@ pub fn eval_boolean(s: &str, js_trace: JsValue) -> JsValue { return JsValue::from_str(format!("failed to parse expression: {}", joined).as_str()); }, }; - console::log_1(&JsValue::from_str("evaluating property...")); + console::debug_1(&JsValue::from_str("evaluating property...")); // evaluate property on trace let eval_result = match expr { Expr::Bool(bool_expr) => BooleanSemantics::eval::(&bool_expr, &m), _ => return JsValue::from_str("expected boolean expression (this should never happen)"), }; - console::log_1(&JsValue::from_str("evaluated property")); + console::debug_1(&JsValue::from_str("evaluated property")); let mut result = Vec::::new(); match eval_result { Ok(r) => { @@ -116,7 +115,7 @@ pub fn eval_boolean(s: &str, js_trace: JsValue) -> JsValue { return JsValue::from_str(format!("failed to evaluate expression: {}", e).as_str()); } } - console::log_1(&JsValue::from_str("now converting to JS value again")); + console::debug_1(&JsValue::from_str("now converting to JS value again")); to_value(&StateBuddyEvalResult { entries: result }).expect("fuuuck") }