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

comparison lib/js/urweb.js @ 976:68eda5b0636d

demo/react works with interpretation

author	Adam Chlipala <adamc@hcoop.net>
date	Tue, 22 Sep 2009 17:12:20 -0400
parents	8fe576c0bee9
children	2ecf308772ba

comparison

equal deleted inserted replaced

-:8fe576c0bee9
+:68eda5b0636d
 function runHandlers(kind, ls, arg) {
 if (ls == null)
 alert(kind + ": " + arg);
 for (; ls; ls = ls.next)
 try {
-ls.data(arg)(null);
+exec({c:"a", f:{c:"a", f:ls.data, x:{c:"c", v:arg}}, x:{c:"c", v:null}});
 } catch (v) { }
 }
 var errorHandlers = null;
 }
 }
 var disconnectHandlers = null;
+function flift(f) {
+return {c:"l", b:f};
+}
 function onDisconnect(f) {
-disconnectHandlers = cons(function (_){return f}, disconnectHandlers);
+disconnectHandlers = cons(flift(f), disconnectHandlers);
 }
 function discon() {
 runHandlers("Disconnect", disconnectHandlers, null);
 }
 var connectHandlers = null;
 function onConnectFail(f) {
-connectHandlers = cons(function (_){return f}, connectHandlers);
+connectHandlers = cons(flift(f), connectHandlers);
 }
 function conn() {
 runHandlers("Connect", connectHandlers, null);
 }
 // Dynamic tree management
+var trace = "";
 function populate(node) {
 var s = node.signal;
 var oldSources = node.sources;
 try {
-var sr = s();
+var sr = exec0(s.env, s.body);
-var newSources = sr.sources;
+var newSources = sr._sources;
 for (var sp = oldSources; sp; sp = sp.next)
 if (!member(sp.data, newSources))
 sp.data.dyns = remove(node, sp.data.dyns);
 for (var sp = newSources; sp; sp = sp.next)
 if (!member(sp.data, oldSources))
 sp.data.dyns = cons(node, sp.data.dyns);
 node.sources = newSources;
-node.recreate(sr.data);
+node.recreate(sr._data);
 } catch (v) {
 doExn(v);
 }
 }
 function sg(s) {
 return s.data;
 }
 function ss(s) {
-return function() { return {sources : cons(s, null), data : s.data } };
+return {env:cons(s, null), body:{c:"r", l:
+cons({n:"sources", v:{c:"c", v:cons(s, null)}},
+cons({n:"data", v:{c:"f", f:sg, a:cons({c:"v", n:1}, null)}}, null))}};
 }
 function sr(v) {
-return function() { return {sources : null, data : v } };
+return {env:null, body:{c:"c", v:{_sources : null, _data : v}}};
 }
 function sb(x,y) {
-return function() {
+return {env:cons(y,cons(x,null)),
-var xr = x();
+body:{c:"=",
-var yr = y(xr.data)();
+e1:{c:"a", f:{c:"v", n:1}, x:{c:"c", v:null}},
-return {sources : union(xr.sources, yr.sources), data : yr.data};
+e2:{c:"=",
-};
+e1:{c:"a",
+f:{c:"a", f:{c:"v", n:1}, x:{c:".", r:{c:"v", n:0}, f:"data"}},
+x:{c:"c", v:null}},
+e2:{c:"r", l:cons(
+{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 s().data;
+return exec(s).data;
 }
 function lastParent() {
 var pos = document;
 function exec0(env, e) {
 var stack = null;
 while (true) {
+if (!e.c)
+throw ("Trace: " + trace);
+trace += "|" + e.c;
 switch (e.c) {
 case "c":
 var v = e.v;
 if (stack == null)
 return v;
 if (fr.a == null) {
 e = {c: "c", v: fr.f.apply(null, fr.args)};
 stack = stack.next;
 } else {
 e = fr.a.data;
-if (e == null) alert("Oh no!");
 fr.a = fr.a.next;
 }
 break;
 case "a1":
 e = fr.x;
 case ";":
 e = fr.e2;
 stack = stack.next;
 break;
 case "=":
+stack = cons({c: "a3", env: env}, stack.next);
 env = cons(v, env);
 e = fr.e2;
-stack = cons({c: "a3", env: env}, stack.next);
 break;
 case "m":
 var ps;
 for (ps = fr.p; ps != null; ps = ps.next) {
 var r = execP(env, ps.data.p, v);
 throw ("Unknown Ur expression kind " + e.c);
 }
 }
 }
+function execD(e) {
+return exec0(null, e);
+}
 function exec(e) {
 var r = exec0(null, e);
 if (r != null && r.body != null)
 return function(v) { return exec0(cons(v, r.env), r.body); };