From 4badfe4a096f4b6f88b1c3afd69587efce97a1c0 Mon Sep 17 00:00:00 2001
From: Kyle Simpson <getify@gmail.com>
Date: Wed, 15 Nov 2023 11:15:09 -0600
Subject: [PATCH] fixing bugs with foi-toy (web and cli), including updating to
 include changes to the external ebnf validator

---
 foi-toy/src/external/ebnftest.js | 24 ++++++++++++------------
 foi-toy/src/grammar-checker.js   | 11 ++++++++++-
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/foi-toy/src/external/ebnftest.js b/foi-toy/src/external/ebnftest.js
index 8564b5e..aa127e6 100644
--- a/foi-toy/src/external/ebnftest.js
+++ b/foi-toy/src/external/ebnftest.js
@@ -5,15 +5,15 @@
 // Secondary License: MIT https://getify.mit-license.org/
 
 if(typeof Math.imul == "undefined" || (Math.imul(0xffffffff,5) == 0)) {
-	Math.imul = function (a, b) {
-		var ah  = (a >>> 16) & 0xffff;
-		var al = a & 0xffff;
-		var bh  = (b >>> 16) & 0xffff;
-		var bl = b & 0xffff;
-		// the shift by 0 fixes the sign on the high part
-		// the final |0 converts the unsigned value into a signed value
-		return ((al * bl) + (((ah * bl + al * bh) << 16) >>> 0)|0);
-	}
+    Math.imul = function (a, b) {
+        var ah  = (a >>> 16) & 0xffff;
+        var al = a & 0xffff;
+        var bh  = (b >>> 16) & 0xffff;
+        var bl = b & 0xffff;
+        // the shift by 0 fixes the sign on the high part
+        // the final |0 converts the unsigned value into a signed value
+        return ((al * bl) + (((ah * bl + al * bh) << 16) >>> 0)|0);
+    }
 }
 
 
@@ -438,9 +438,9 @@ function Gn(a){var b=function(){var b=En(a);if(q(b))return b;b=Fn(a);if(q(b))ret
 function Jn(a,b){var c;c=In(a);c=q(c)?c:Kn?Kn(ik,a,null,null):Ln.call(null,ik,a,null,null);return An(c,b)}function Mn(a,b,c){if(!q(function(){var b=Cn(a);return q(b)?Pe(a):b}()))throw Error([v("Assert failed: "),v("k must be namespaced keyword or resolveable symbol"),v("\n"),v("(c/and (named? k) (namespace k))")].join(""));b=q(function(){var a=En(c);if(q(a))return a;a=Fn(c);return q(a)?a:x.b(H.a?H.a(Bn):H.call(null,Bn),c)}())?c:Kn?Kn(b,c,null,null):Ln.call(null,b,c,null,null);Gf.H(Bn,P,a,b)}
 Cf||Bf.call(null,sf);function Ln(a){for(var b=[],c=arguments.length,d=0;;)if(d<c)b.push(arguments[d]),d+=1;else break;switch(b.length){case 4:return Kn(arguments[0],arguments[1],arguments[2],arguments[3]);case 5:return Nn(arguments[0],arguments[1],arguments[2],arguments[3],arguments[4]);default:throw Error([v("Invalid arity: "),v(b.length)].join(""));}}function Kn(a,b,c,d){return Nn(a,b,c,d,null)}
 function Nn(a,b,c,d,e){if(q(En(b)))return q(c)?Jn(b,c):b;if(q(Fn(b)))return Hn.b?Hn.b(b,c):Hn.call(null,b,c);if(q(Cn(b)))return a=In(b),q(c)?Jn(a,c):a;"undefined"===typeof tn&&(tn=function(a,b,c,d,e,u){this.form=a;this.ie=b;this.nd=c;this.Sd=d;this.Df=e;this.ff=u;this.m=393216;this.G=0},tn.prototype.V=function(a,b){return new tn(this.form,this.ie,this.nd,this.Sd,this.Df,b)},tn.prototype.R=function(){return this.ff},tn.prototype.Qd=!0,tn.prototype.jd=function(a,b){return Kn(this.form,this.ie,b,this.Sd)},
-tn.Xd=function(){return new U(null,6,5,V,[oi,vj,fj,lj,vi,wb.lg],null)},tn.Kc=!0,tn.$b="cljs.spec/t_cljs$spec13607",tn.hd=function(a,b){return Oc(b,"cljs.spec/t_cljs$spec13607")});return new tn(a,b,c,d,e,sf)}
+tn.Xd=function(){return new U(null,6,5,V,[oi,vj,fj,lj,vi,wb.lg],null)},tn.Kc=!0,tn.$b="cljs.spec/t_cljs$spec13841",tn.hd=function(a,b){return Oc(b,"cljs.spec/t_cljs$spec13841")});return new tn(a,b,c,d,e,sf)}
 var Hn=function Hn(b,c){"undefined"===typeof un&&(un=function(b,c,f,h){this.Uc=b;this.td=c;this.nd=f;this.gf=h;this.m=393216;this.G=0},un.prototype.V=function(b,c){return new un(this.Uc,this.td,this.nd,c)},un.prototype.R=function(){return this.gf},un.prototype.Qd=!0,un.prototype.jd=function(b,c){return this.Uc.b?this.Uc.b(this.td,c):this.Uc.call(null,this.td,c)},un.Xd=function(){return new U(null,4,5,V,[Rd(Ei,new p(null,3,[yj,!0,qf,Me(rf,Me(new U(null,2,5,V,[Uj,fj],null))),Xk,"Do not call this directly, use 'spec' with a regex op argument"],
-null)),Uj,fj,wb.mg],null)},un.Kc=!0,un.$b="cljs.spec/t_cljs$spec14052",un.hd=function(b,c){return Oc(c,"cljs.spec/t_cljs$spec14052")});return new un(Hn,b,c,sf)};Mn(Jk,Me(wi,Me(dk,!0),Qi,nl),Kn(Me(dk,!0),function(a){return function(){function b(b){if(0<arguments.length)for(var d=0,e=Array(arguments.length-0);d<e.length;)e[d]=arguments[d+0],++d;return a}b.D=0;b.C=function(b){y(b);return a};b.h=function(){return a};return b}()}(!0),wn,null));
+null)),Uj,fj,wb.mg],null)},un.Kc=!0,un.$b="cljs.spec/t_cljs$spec14286",un.hd=function(b,c){return Oc(c,"cljs.spec/t_cljs$spec14286")});return new un(Hn,b,c,sf)};Mn(Jk,Me(wi,Me(dk,!0),Qi,nl),Kn(Me(dk,!0),function(a){return function(){function b(b){if(0<arguments.length)for(var d=0,e=Array(arguments.length-0);d<e.length;)e[d]=arguments[d+0],++d;return a}b.D=0;b.C=function(b){y(b);return a};b.h=function(){return a};return b}()}(!0),wn,null));
 Mn(kl,Me(Hj,Me(rk,new U(null,1,5,V,[wb.nc],null),Me(Bj,Me(Fj,Ri,wb.nc),Me(Fj,$k,wb.nc))),Me(rk,new U(null,1,5,V,[wb.Se],null),Me(Fj,Me(Ik,new U(null,1,5,V,[new U(null,2,5,V,[Gk,ij],null)],null),new p(null,2,[Ri,Gk,$k,ij],null)),wb.Se))),Nn(Me(rk,new U(null,1,5,V,[wb.nc],null),Me(bj,Me(Ci,Ri,wb.nc),Me(Ci,$k,wb.nc))),function(a){a:{var b=W.b(Ri,a),c=W.b($k,a);a=Rc(sf);b=y(b);for(c=y(c);;)if(b&&c){var d=D(b),e=D(c);a=Uc(a,d,e);b=E(b);c=E(c)}else{a=Tc(a);break a}}return a},null,!0,function(a){return W.b(function(a){var c=
 O(a,0,null);a=O(a,1,null);return new p(null,2,[Ri,c,$k,a],null)},a)}));var On=Cf?Cf(null):Bf.call(null,null),Pn=[];function Qn(a){Pn.push(ci(N([a],0),Eb()));a=H.a?H.a(On):H.call(null,On);if(q(a)){for(var b=y(Pn),c=null,d=0,e=0;;)if(e<d){var f=c.P(null,e);sn.c(a,Ej,f);e+=1}else if(b=y(b))c=b,me(c)?(b=Zc(c),e=$c(c),c=b,d=K(b),b=e):(b=D(c),sn.c(a,Ej,b),b=E(c),c=null,d=0),e=0;else break;if("array"!=m(Pn))for(a=Pn.length-1;0<=a;a--)delete Pn[a];Pn.length=0;a=void 0}else a=null;return a}Ab=zb=Qn;Bb=!0;Cf||Bf.call(null,0);function Rn(a,b){var c=K(b);a:if(0===c)c=1;else for(var d=c|0,c=1,e=31;;){var f;f=d;if(se(f))f=0===(f&1);else throw Error([v("Argument must be an integer: "),v(f)].join(""));d=De(d);if(!f){if(0===d){c=hd(e,c);break a}c=hd(e,c)}e=hd(e,e)}c|=0;return(hd(c,a.Sc)|0)+(b.Sc-c)}function Sn(a,b){for(var c=Vb(x,a,b),d=b;;)if(q(Tn.a?Tn.a(c):Tn.call(null,c)))c=x.b(c,0),d=Wd.b(d,0);else return d}
 function Un(a,b){return new Te(null,function(){var c=M,d=Vb(x,a,b),e;a:{e=a;for(var f=b;;){if(G.b(K(f),1)){e=ee(f)<(Vn.a?Vn.a(e):Vn.call(null,e))-1?Sn(e,new U(null,1,5,V,[ee(f)+1],null)):null;break a}var h=ee(f),k;k=fe(f);k=Vb(x,e,k);k=Vn.a?Vn.a(k):Vn.call(null,k);if(h<k-1){e=Sn(e,Wd.b(fe(f),ee(f)+1));break a}f=fe(f)}}return c(d,q(e)?Un(a,e):null)},null,null)}
@@ -603,4 +603,4 @@ function nr(a,b){var c=null!=b&&(b.m&64||b.ra)?gf(Df,b):b;if(!te(new Fh(null,new
 var d=x.c(c,Vi,Xj),e=function(){var a=d instanceof Q?d.ia:null;switch(a){case "abnf":return Vq;case "ebnf":return q(x.b(c,dl))?function(){return function(a,b){var c=Bq;Bq=!0;try{return Lq(a,b)}finally{Bq=c}}}(a,d,b,c,c):Lq;default:throw Error([v("No matching clause: "),v(d)].join(""));}}(),f=x.c(c,rj,Cj),h=x.c(c,kj,null),k="string"===typeof a?function(){var b=e.b?e.b(a,f):e.call(null,a,f);return q(h)?lr(P.c(b,aj,h)):lr(b)}():ke(a)?function(){var b=Mq(a,f,h);return lr(b)}():le(a)?function(){var b=
 q(h)?h:a.a?a.a(0):a.call(null,0),b=Mq(gf(Df,a),f,b);return lr(b)}():null,l=x.b(c,el),l=l instanceof Q?x.b(or,l):l;if(q(l)){var n=null!=l&&(l.m&64||l.ra)?gf(Df,l):l,l=x.b(n,oj),n=x.b(n,aj);return P.c(k,oj,Go(oj.a(k),aj.a(k),l,n))}return k}function jr(a){return a instanceof Dp||de(a)instanceof Dp}var or=new p(null,2,[Uk,mr("whitespace \x3d #'\\s+'"),ej,mr("whitespace \x3d #'[,\\s]+'")],null);Bb=!1;zb=function(){function a(a){var d=null;if(0<arguments.length){for(var d=0,e=Array(arguments.length-0);d<e.length;)e[d]=arguments[d+0],++d;d=new C(e,0)}return b.call(this,d)}function b(a){return console.log.apply(console,Ub?Tb(a):Sb.call(null,a))}a.D=0;a.C=function(a){a=y(a);return b(a)};a.h=b;return a}();
 Ab=function(){function a(a){var d=null;if(0<arguments.length){for(var d=0,e=Array(arguments.length-0);d<e.length;)e[d]=arguments[d+0],++d;d=new C(e,0)}return b.call(this,d)}function b(a){return console.error.apply(console,Ub?Tb(a):Sb.call(null,a))}a.D=0;a.C=function(a){a=y(a);return b(a)};a.h=b;return a}();function pr(a){var b=new ub,c=Bb,d=zb;Bb=!0;zb=function(a,b,c){return function(a){return c.append(a)}}(c,d,b);try{Wo(a)}finally{zb=d,Bb=c}return""+v(b)}
-function qr(a){var b=ab("output");b.className="invalid";return b.innerHTML=a}function rr(){try{var a=mr(ab("grammar").value),b=ab("input").value,c=a.a?a.a(b):a.call(null,b),d;if(q(jr(c)))d=qr(pr(c));else{var e=ab("output");e.className="valid";d=e.innerHTML="The test input is valid."}return d}catch(f){return qr(f)}}Hm(ab("grammar"),"input",rr);Hm(ab("input"),"input",rr);rr();
+function qr(a){var b=ab("output");b.className="invalid";return b.innerText=a}function rr(){try{var a=mr(ab("grammar").value),b=ab("input").value,c=a.a?a.a(b):a.call(null,b),d;if(q(jr(c)))d=qr(pr(c));else{var e=ab("output");e.className="valid";d=e.innerText="The test input is valid."}return d}catch(f){return qr(f)}}Hm(ab("grammar"),"input",rr);Hm(ab("input"),"input",rr);rr();
diff --git a/foi-toy/src/grammar-checker.js b/foi-toy/src/grammar-checker.js
index 7816bde..1381160 100644
--- a/foi-toy/src/grammar-checker.js
+++ b/foi-toy/src/grammar-checker.js
@@ -20,7 +20,7 @@ elems.grammar.value = "S := '';";
 function initChecker(context) {
 	elems.output.addEventListener("_className",evt => {
 		if (elems.grammar.value != "" && elems.input.value != "") {
-			context.postMessage({ [evt.target.className]: evt.target.innerHTML, });
+			context.postMessage({ [evt.target.className]: evt.target.innerText, });
 		}
 	});
 
@@ -47,6 +47,7 @@ function onMessage(message) {
 function elem(_id) {
 	var _value = "";
 	var _html = "";
+	var _text = "";
 	var _className = "valid";
 	var cbs = {};
 	var publicAPI = {
@@ -83,6 +84,14 @@ function elem(_id) {
 			publicAPI.dispatchEvent({ type: "_innerHTML", target: publicAPI });
 			return v;
 		},
+		get innerText() {
+			return _text;
+		},
+		set innerText(v) {
+			_text = v;
+			publicAPI.dispatchEvent({ type: "_innerText", target: publicAPI });
+			return v;
+		},
 		get className() {
 			return _className;
 		},