# HG changeset patch # User Adam Chlipala # Date 1343048621 14400 # Node ID 3d823d8424cc0373c8931edbc8d4f9c0e38dd784 # Parent 2f8b8952fe27bb19b35ab8592cc531abdcec1ddd Disallow suspending operations in diff -r 2f8b8952fe27 -r 3d823d8424cc lib/js/urweb.js --- a/lib/js/urweb.js Mon Jul 23 08:38:39 2012 -0400 +++ b/lib/js/urweb.js Mon Jul 23 09:03:41 2012 -0400 @@ -913,10 +913,21 @@ runScripts(node); } +var maySuspend = true; + function active(s) { var span = document.createElement("span"); addNode(span); - setInnerHTML(span, execF(s)); + var ms = maySuspend; + maySuspend = false; + try { + var html = execF(s); + } catch (e) { + maySuspend = ms; + throw e; + } + maySuspend = ms; + setInnerHTML(span, html); } function input(x, s, recreate, type, name) { @@ -1002,10 +1013,10 @@ var dummy = document.createElement("body"); dummy.innerHTML = html; - runScripts(dummy); var html = dummy.firstChild; dummy.removeChild(html); addNode(html); + runScripts(html); if (s_class) { var x = document.createElement("script"); @@ -1285,6 +1296,9 @@ } function rc(prefix, uri, parse, k, needsSig) { + if (!maySuspend) + er("May not 'rpc' in 'code' for "); + uri = cat(prefix, uri); uri = flattenLocal(uri); var xhr = getXHR(); @@ -1463,6 +1477,9 @@ } function rv(chn, parse, k) { + if (!maySuspend) + er("May not 'recv' in 'code' for "); + if (chn == null) return; @@ -1490,6 +1507,9 @@ } function sl(ms, k) { + if (!maySuspend) + er("May not 'sleep' in 'code' for "); + window.setTimeout(function() { k(null); }, ms); } diff -r 2f8b8952fe27 -r 3d823d8424cc tests/setActive.ur --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/setActive.ur Mon Jul 23 09:03:41 2012 -0400 @@ -0,0 +1,9 @@ +fun main () : transaction page = + i <- fresh; + x <- source ; + return + + + }/>; return }/> + +