diff --git a/Libraries/iTasks/UI/JavaScript.dcl b/Libraries/iTasks/UI/JavaScript.dcl index a0822d6d35739a882588160f2cd96966ddd1ddda..1c28a2cb7df551dea3867982edf2f921de60f7fb 100644 --- a/Libraries/iTasks/UI/JavaScript.dcl +++ b/Libraries/iTasks/UI/JavaScript.dcl @@ -191,11 +191,6 @@ jsDocument :== jsGlobal "document" */ jsWrapFun :: !({!JSVal} *JSWorld -> *JSWorld) !JSVal !*JSWorld -> *(!JSFun, !*JSWorld) -/** - * Like {{`jsWrapFun`}}, but the Clean function can return a result. - */ -jsWrapFunWithResult :: !({!JSVal} *JSWorld -> *(JSVal, *JSWorld)) !JSVal !*JSWorld -> *(!JSFun, !*JSWorld) - /** * Wrap a function receiving a reference to a JavaScript iTasks component to * one matching the calling convention for the JavaScript interface (i.e., diff --git a/Libraries/iTasks/UI/JavaScript.icl b/Libraries/iTasks/UI/JavaScript.icl index 778c87d8973be3f7775edfde4c2a06b57e4cd794..b6c223cb4e2f0fe2f0d318e568e6d1c0c201672a 100644 --- a/Libraries/iTasks/UI/JavaScript.icl +++ b/Libraries/iTasks/UI/JavaScript.icl @@ -532,13 +532,6 @@ jsGlobal s = JSVar s jsWrapFun :: !({!JSVal} *JSWorld -> *JSWorld) !JSVal !*JSWorld -> *(!JSFun, !*JSWorld) jsWrapFun f attach_to world = (share attach_to \(JSArray args) w -> f args w, world) -jsWrapFunWithResult :: !({!JSVal} *JSWorld -> *(JSVal, *JSWorld)) !JSVal !*JSWorld -> *(!JSFun, !*JSWorld) -jsWrapFunWithResult f attach_to world = (share attach_to fun, world) -where - fun (JSArray args) w - # (r,w) = f args w - = hyperstrict (js_val_to_string r,w) - wrapInitUIFunction :: !(JSVal *JSWorld -> *JSWorld) -> {!JSVal} -> *JSWorld -> *JSWorld wrapInitUIFunction f = init where diff --git a/Libraries/iTasks/UI/WebPublic/js/itasks-abc-interpreter.js b/Libraries/iTasks/UI/WebPublic/js/itasks-abc-interpreter.js index 88903f12a7523bdd695dd21471dfb1c1edaf0cb7..7131d03a48c50d2f464e7a11ae96a3f51e7c8b0f 100644 --- a/Libraries/iTasks/UI/WebPublic/js/itasks-abc-interpreter.js +++ b/Libraries/iTasks/UI/WebPublic/js/itasks-abc-interpreter.js @@ -125,31 +125,4 @@ const ABC_loading_promise=ABCInterpreter.instantiate({ }).then(function(instance){ ABC=instance; ABC.initialized=false; - - // Overwrite ap to return a result (in the case of jsWrapFunWithResult) - ABC.ap=function(index){ - var f=function () { - var args=[]; - for (var i=0; i