Represent FFI function names as strings, to deal with cross-file recursion

1 files changed, 3 insertions, 2 deletions

diff --git a/lib/js/urweb.js b/lib/js/urweb.js
index 98b615c0..863271d9 100644
--- a/lib/js/urweb.js
+++ b/lib/js/urweb.js
@@ -505,6 +505,7 @@ function eh(x) {
 function ts(x) { return x.toString() }
 function bs(b) { return (b ? "True" : "False") }
 
+function id(x) { return x; }
 function sub(s, i) { return s.charAt(i); }
 function suf(s, i) { return s.substring(i); }
 function slen(s) { return s.length; }
@@ -1049,10 +1050,10 @@ function exec1(env, stack, e) {
       break;
     case "f":
       if (e.a == null)
-        e = {c: "c", v: e.f()};
+        e = {c: "c", v: (eval(e.f))()};
       else {
         var args = [];
-        stack = cons({c: "f", f: e.f, args: args, pos: 0, a: e.a.next}, stack);
+        stack = cons({c: "f", f: eval(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;
       }