Ur/Web: lib/js/urweb.js comparison

comparison lib/js/urweb.js @ 982:6934343267c0

Grid1 seems to work in latest Firefox

author	Adam Chlipala <adamc@hcoop.net>
date	Thu, 24 Sep 2009 15:36:44 -0400
parents	3612ff0c6a10
children	2cd8c1aa0d3a

comparison

equal deleted inserted replaced

-:27a3412d23e4
+:6934343267c0
 }
 // Dynamic tree management
-var trace = "";
 function populate(node) {
 var s = node.signal;
 var oldSources = node.sources;
 try {
 {n:"sources", v:{c:"f", f:union, a:cons({c:".", r:{c:"v", n:1}, f:"sources"},
 cons({c:".", r:{c:"v", n:0}, f:"sources"}, null))}},
 cons({n:"data", v:{c:".", r:{c:"v", n:0}, f:"data"}}, null))}}}};
 }
 function scur(s) {
-return exec(s).data;
+return execF(s, null)._data;
 }
 function lastParent() {
 var pos = document;
 } else if (tok == "Cons") {
 var d = getData();
 var l = uul(getToken, getData);
 return {_1:d, _2:l};
 } else
-throw ("Can't unmarshal list (" + tok + ")");
+whine("Can't unmarshal list (" + tok + ")");
 }
 function strcmp(str1, str2) {
 return ((str1 == str2) ? 0 : ((str1 > str2) ? 1 : -1));
 }
 return new ActiveXObject("Msxml2.XMLHTTP");
 } catch (e) {
 try {
 return new ActiveXObject("Microsoft.XMLHTTP");
 } catch (e) {
-throw "Your browser doesn't seem to support AJAX.";
+whine("Your browser doesn't seem to support AJAX.");
 }
 }
 }
 }
 --n;
 env = env.next;
 }
 }
-throw "Out-of-bounds Ur variable reference";
+whine("Out-of-bounds Ur variable reference");
 }
 function execP(env, p, v) {
 switch (p.c) {
 case "w":
 if (env == false)
 return false;
 }
 return env;
 default:
-throw ("Unknown Ur pattern kind" + p.c);
+whine("Unknown Ur pattern kind" + p.c);
 }
 }
 function exec0(env, e) {
 var stack = null;
 fr.args[fr.pos++] = v;
 if (fr.a == null) {
 e = {c: "c", v: fr.f.apply(null, fr.args)};
 stack = stack.next;
 } else {
-trace += "" + fr.pos;
 e = fr.a.data;
 fr.a = fr.a.next;
 }
 break;
 case "a1":
 e = fr.x;
 stack = cons({c: "a2", f: v}, stack.next);
 break;
 case "a2":
 if (fr.f == null)
-throw "Ur: applying null function";
+whine("Ur: applying null function");
 else if (fr.f.body) {
 stack = cons({c: "<", env: env}, stack.next);
 env = cons(v, fr.f.env);
 e = fr.f.body;
 } else {
 e = ps.data.b;
 break;
 }
 }
 if (ps == null)
-throw "Match failure in Ur interpretation";
+whine("Match failure in Ur interpretation");
 break;
 default:
-throw ("Unknown Ur continuation kind " + fr.c);
+whine("Unknown Ur continuation kind " + fr.c);
 }
 break;
 case "v":
 e = {c: "c", v: lookup(env, e.n)};
 if (e.a == null)
 e = {c: "c", v: e.f()};
 else {
 var args = [];
 stack = cons({c: "f", f: e.f, args: args, pos: 0, a: e.a.next}, stack);
+if (!e.a.data.c) alert("[2] fr.f = " + e.f + "; 0 = " + e.a.data);
 e = e.a.data;
 }
 break;
 case "l":
 e = {c: "c", v: {env: env, body: e.b}};
 stack = cons({c: "a1", x: e.x}, stack);
 e = e.f;
 break;
 case "r":
 if (e.l == null)
-throw "Empty Ur record in interpretation";
+whine("Empty Ur record in interpretation");
 var fs = {};
 stack = cons({c: "r", n: e.l.data.n, fs: fs, l: e.l.next}, stack);
 e = e.l.data.v;
 break;
 case ".":
 case "wc":
 env = e.env;
 e = e.body;
 break;
 default:
-throw ("Unknown Ur expression kind " + e.c);
+whine("Unknown Ur expression kind " + e.c);
 }
 }
 }
 function execD(e) {