git.iko.soy/Idris-dev
on master help sign in
Merge pull request #521 from raichoo/master

javascript

commit463752d6e22f6e8d500e4812b85473e83cf4edc9 authorEdwin Brady <edwin.brady@gmail.com> dateSun 13 Oct 2013, 08:09 (13 years ago) parent13a588116fe40d
8 files changed+1674−481
compare with master
unifiedsplit
idris.cabal+5−3 js/Runtime-common.js−393 js/Runtime-browser.js → jsrts/Runtime-browser.js jsrts/Runtime-common.js+51 js/Runtime-node.js → jsrts/Runtime-node.js jsrts/jsbn/LICENSE+40 jsrts/jsbn/jsbn.js+1235 src/IRTS/CodegenJavaScript.hs+343−85
idris.cabal+5−3
@@ -46,9 +46,11 @@ Cabal-Version: >= 1.6
4646
4747Build-type: Custom
4848
49−Data-files: js/Runtime-browser.js
50− js/Runtime-common.js
51− js/Runtime-node.js
49+Data-files: jsrts/Runtime-browser.js
50+ jsrts/Runtime-common.js
51+ jsrts/Runtime-node.js
52+ jsrts/jsbn/jsbn.js
53+ jsrts/jsbn/LICENSE
5254 rts/idris_gc.h
5355 rts/idris_gmp.h
5456 rts/idris_main.c
js/Runtime-common.jsdeleted−393
@@ -1,393 +0,0 @@
1−/** @constructor */
2−var __IDRRT__Type = function(type) {
3− this.type = type;
4−};
5−
6−var __IDRRT__Int = new __IDRRT__Type('Int');
7−var __IDRRT__Char = new __IDRRT__Type('Char');
8−var __IDRRT__String = new __IDRRT__Type('String');
9−var __IDRRT__Integer = new __IDRRT__Type('Integer');
10−var __IDRRT__Float = new __IDRRT__Type('Float');
11−var __IDRRT__Ptr = new __IDRRT__Type('Pointer');
12−var __IDRRT__Forgot = new __IDRRT__Type('Forgot');
13−
14−
15−/** @constructor */
16−var __IDRRT__Tailcall = function(fun, args) {
17− this.fun = fun;
18− this.args = args;
19−};
20−
21−var __IDRRT__ffiWrap = function(fid) {
22− return function(){
23− var res = fid;
24− var i = 0;
25− var arg;
26− while (res instanceof __IDRRT__Con){
27− arg = arguments[i];
28− res = __IDRRT__tailcall(__IDR__mAPPLY0, [res, arg]);
29− ++i;
30− }
31− return res;
32− }
33−};
34−
35−/** @constructor */
36−var __IDRRT__Con = function(tag,vars) {
37− this.tag = tag;
38− this.vars = vars;
39−};
40−
41−var __IDRRT__tailcall = function(fun, args) {
42− var ret = new __IDRRT__Tailcall(fun, args);
43− while (ret instanceof __IDRRT__Tailcall)
44− ret = ret.fun.apply(this, ret.args);
45−
46− return ret;
47−};
48−
49−/*
50− BigInteger Javascript code taken from:
51− https://github.com/peterolson
52−*/
53−var __IDRRT__bigInt = (function () {
54− var base = 10000000, logBase = 7;
55− var sign = {
56− positive: false,
57− negative: true
58− };
59−
60− var normalize = function (first, second) {
61− var a = first.value, b = second.value;
62− var length = a.length > b.length ? a.length : b.length;
63− for (var i = 0; i < length; i++) {
64− a[i] = a[i] || 0;
65− b[i] = b[i] || 0;
66− }
67− for (var i = length - 1; i >= 0; i--) {
68− if (a[i] === 0 && b[i] === 0) {
69− a.pop();
70− b.pop();
71− } else break;
72− }
73− if (!a.length) a = [0], b = [0];
74− first.value = a;
75− second.value = b;
76− };
77−
78− var parse = function (text, first) {
79− if (typeof text === "object") return text;
80− text += "";
81− var s = sign.positive, value = [];
82− if (text[0] === "-") {
83− s = sign.negative;
84− text = text.slice(1);
85− }
86− var text = text.split("e");
87− if (text.length > 2) throw new Error("Invalid integer");
88− if (text[1]) {
89− var exp = text[1];
90− if (exp[0] === "+") exp = exp.slice(1);
91− exp = parse(exp);
92− if (exp.lesser(0)) throw new Error("Cannot include negative exponent part for integers");
93− while (exp.notEquals(0)) {
94− text[0] += "0";
95− exp = exp.prev();
96− }
97− }
98− text = text[0];
99− if (text === "-0") text = "0";
100− var isValid = /^([0-9][0-9]*)$/.test(text);
101− if (!isValid) throw new Error("Invalid integer");
102− while (text.length) {
103− var divider = text.length > logBase ? text.length - logBase : 0;
104− value.push(+text.slice(divider));
105− text = text.slice(0, divider);
106− }
107− var val = bigInt(value, s);
108− if (first) normalize(first, val);
109− return val;
110− };
111−
112− var goesInto = function (a, b) {
113− var a = bigInt(a, sign.positive), b = bigInt(b, sign.positive);
114− if (a.equals(0)) throw new Error("Cannot divide by 0");
115− var n = 0;
116− do {
117− var inc = 1;
118− var c = bigInt(a.value, sign.positive), t = c.times(10);
119− while (t.lesser(b)) {
120− c = t;
121− inc *= 10;
122− t = t.times(10);
123− }
124− while (c.lesserOrEquals(b)) {
125− b = b.minus(c);
126− n += inc;
127− }
128− } while (a.lesserOrEquals(b));
129−
130− return {
131− remainder: b.value,
132− result: n
133− };
134− };
135−
136− var bigInt = function (value, s) {
137− var self = {
138− value: value,
139− sign: s
140− };
141− var o = {
142− value: value,
143− sign: s,
144− negate: function (m) {
145− var first = m || self;
146− return bigInt(first.value, !first.sign);
147− },
148− abs: function (m) {
149− var first = m || self;
150− return bigInt(first.value, sign.positive);
151− },
152− add: function (n, m) {
153− var s, first = self, second;
154− if (m) (first = parse(n)) && (second = parse(m));
155− else second = parse(n, first);
156− s = first.sign;
157− if (first.sign !== second.sign) {
158− first = bigInt(first.value, sign.positive);
159− second = bigInt(second.value, sign.positive);
160− return s === sign.positive ?
161− o.subtract(first, second) :
162− o.subtract(second, first);
163− }
164− normalize(first, second);
165− var a = first.value, b = second.value;
166− var result = [],
167− carry = 0;
168− for (var i = 0; i < a.length || carry > 0; i++) {
169− var sum = (a[i] || 0) + (b[i] || 0) + carry;
170− carry = sum >= base ? 1 : 0;
171− sum -= carry * base;
172− result.push(sum);
173− }
174− return bigInt(result, s);
175− },
176− plus: function (n, m) {
177− return o.add(n, m);
178− },
179− subtract: function (n, m) {
180− var first = self, second;
181− if (m) (first = parse(n)) && (second = parse(m));
182− else second = parse(n, first);
183− if (first.sign !== second.sign) return o.add(first, o.negate(second));
184− if (first.sign === sign.negative) return o.subtract(o.negate(second), o.negate(first));
185− if (o.compare(first, second) === -1) return o.negate(o.subtract(second, first));
186− var a = first.value, b = second.value;
187− var result = [],
188− borrow = 0;
189− for (var i = 0; i < a.length; i++) {
190− a[i] -= borrow;
191− borrow = a[i] < b[i] ? 1 : 0;
192− var minuend = (borrow * base) + a[i] - b[i];
193− result.push(minuend);
194− }
195− return bigInt(result, sign.positive);
196− },
197− minus: function (n, m) {
198− return o.subtract(n, m);
199− },
200− multiply: function (n, m) {
201− var s, first = self, second;
202− if (m) (first = parse(n)) && (second = parse(m));
203− else second = parse(n, first);
204− s = first.sign !== second.sign;
205− var a = first.value, b = second.value;
206− var resultSum = [];
207− for (var i = 0; i < a.length; i++) {
208− resultSum[i] = [];
209− var j = i;
210− while (j--) {
211− resultSum[i].push(0);
212− }
213− }
214− var carry = 0;
215− for (var i = 0; i < a.length; i++) {
216− var x = a[i];
217− for (var j = 0; j < b.length || carry > 0; j++) {
218− var y = b[j];
219− var product = y ? (x * y) + carry : carry;
220− carry = product > base ? Math.floor(product / base) : 0;
221− product -= carry * base;
222− resultSum[i].push(product);
223− }
224− }
225− var max = -1;
226− for (var i = 0; i < resultSum.length; i++) {
227− var len = resultSum[i].length;
228− if (len > max) max = len;
229− }
230− var result = [], carry = 0;
231− for (var i = 0; i < max || carry > 0; i++) {
232− var sum = carry;
233− for (var j = 0; j < resultSum.length; j++) {
234− sum += resultSum[j][i] || 0;
235− }
236− carry = sum > base ? Math.floor(sum / base) : 0;
237− sum -= carry * base;
238− result.push(sum);
239− }
240− return bigInt(result, s);
241− },
242− times: function (n, m) {
243− return o.multiply(n, m);
244− },
245− divmod: function (n, m) {
246− var s, first = self, second;
247− if (m) (first = parse(n)) && (second = parse(m));
248− else second = parse(n, first);
249− s = first.sign !== second.sign;
250− if (bigInt(first.value, first.sign).equals(0)) return {
251− quotient: bigInt([0], sign.positive),
252− remainder: bigInt([0], sign.positive)
253− };
254− if (second.equals(0)) throw new Error("Cannot divide by zero");
255− var a = first.value, b = second.value;
256− var result = [], remainder = [];
257− for (var i = a.length - 1; i >= 0; i--) {
258− var n = [a[i]].concat(remainder);
259− var quotient = goesInto(b, n);
260− result.push(quotient.result);
261− remainder = quotient.remainder;
262− }
263− result.reverse();
264− return {
265− quotient: bigInt(result, s),
266− remainder: bigInt(remainder, first.sign)
267− };
268− },
269− divide: function (n, m) {
270− return o.divmod(n, m).quotient;
271− },
272− over: function (n, m) {
273− return o.divide(n, m);
274− },
275− mod: function (n, m) {
276− return o.divmod(n, m).remainder;
277− },
278− pow: function (n, m) {
279− var first = self, second;
280− if (m) (first = parse(n)) && (second = parse(m));
281− else second = parse(n, first);
282− var a = first, b = second;
283− if (b.lesser(0)) return ZERO;
284− if (b.equals(0)) return ONE;
285− var result = bigInt(a.value, a.sign);
286−
287− if (b.mod(2).equals(0)) {
288− var c = result.pow(b.over(2));
289− return c.times(c);
290− } else {
291− return result.times(result.pow(b.minus(1)));
292− }
293− },
294− next: function (m) {
295− var first = m || self;
296− return o.add(first, 1);
297− },
298− prev: function (m) {
299− var first = m || self;
300− return o.subtract(first, 1);
301− },
302− compare: function (n, m) {
303− var first = self, second;
304− if (m) (first = parse(n)) && (second = parse(m, first));
305− else second = parse(n, first);
306− normalize(first, second);
307− if (first.value.length === 1 && second.value.length === 1 && first.value[0] === 0 && second.value[0] === 0) return 0;
308− if (second.sign !== first.sign) return first.sign === sign.positive ? 1 : -1;
309− var multiplier = first.sign === sign.positive ? 1 : -1;
310− var a = first.value, b = second.value;
311− for (var i = a.length - 1; i >= 0; i--) {
312− if (a[i] > b[i]) return 1 * multiplier;
313− if (b[i] > a[i]) return -1 * multiplier;
314− }
315− return 0;
316− },
317− compareAbs: function (n, m) {
318− var first = self, second;
319− if (m) (first = parse(n)) && (second = parse(m, first));
320− else second = parse(n, first);
321− first.sign = second.sign = sign.positive;
322− return o.compare(first, second);
323− },
324− equals: function (n, m) {
325− return o.compare(n, m) === 0;
326− },
327− notEquals: function (n, m) {
328− return !o.equals(n, m);
329− },
330− lesser: function (n, m) {
331− return o.compare(n, m) < 0;
332− },
333− greater: function (n, m) {
334− return o.compare(n, m) > 0;
335− },
336− greaterOrEquals: function (n, m) {
337− return o.compare(n, m) >= 0;
338− },
339− lesserOrEquals: function (n, m) {
340− return o.compare(n, m) <= 0;
341− },
342− isPositive: function (m) {
343− var first = m || self;
344− return first.sign === sign.positive;
345− },
346− isNegative: function (m) {
347− var first = m || self;
348− return first.sign === sign.negative;
349− },
350− isEven: function (m) {
351− var first = m || self;
352− return first.value[0] % 2 === 0;
353− },
354− isOdd: function (m) {
355− var first = m || self;
356− return first.value[0] % 2 === 1;
357− },
358− toString: function (m) {
359− var first = m || self;
360− var str = "", len = first.value.length;
361− while (len--) {
362− str += (base.toString() + first.value[len]).slice(-logBase);
363− }
364− while (str[0] === "0") {
365− str = str.slice(1);
366− }
367− if (!str.length) str = "0";
368− var s = first.sign === sign.positive ? "" : "-";
369− return s + str;
370− },
371− toJSNumber: function (m) {
372− return +o.toString(m);
373− },
374− valueOf: function (m) {
375− return o.toJSNumber(m);
376− }
377− };
378− return o;
379− };
380−
381− var ZERO = bigInt([0], sign.positive);
382− var ONE = bigInt([1], sign.positive);
383− var MINUS_ONE = bigInt([1], sign.negative);
384−
385− var fnReturn = function (a) {
386− if (typeof a === "undefined") return ZERO;
387− return parse(a);
388− };
389− fnReturn.zero = ZERO;
390− fnReturn.one = ONE;
391− fnReturn.minusOne = MINUS_ONE;
392− return fnReturn;
393−})();
js/Runtime-browser.js → jsrts/Runtime-browser.jsrenamed

The content is the same.

jsrts/Runtime-common.jsnew file+51
@@ -0,0 +1,51 @@
1+var __IDRRT__ZERO = __IDRRT__bigInt("0");
2+var __IDRRT__ONE = __IDRRT__bigInt("1");
3+
4+/** @constructor */
5+var __IDRRT__Type = function(type) {
6+ this.type = type;
7+};
8+
9+var __IDRRT__Int = new __IDRRT__Type('Int');
10+var __IDRRT__Char = new __IDRRT__Type('Char');
11+var __IDRRT__String = new __IDRRT__Type('String');
12+var __IDRRT__Integer = new __IDRRT__Type('Integer');
13+var __IDRRT__Float = new __IDRRT__Type('Float');
14+var __IDRRT__Ptr = new __IDRRT__Type('Pointer');
15+var __IDRRT__Forgot = new __IDRRT__Type('Forgot');
16+
17+
18+/** @constructor */
19+var __IDRRT__Cont = function(k) {
20+ this.k = k;
21+};
22+
23+var __IDRRT__ffiWrap = function(fid) {
24+ return function(){
25+ var res = fid;
26+ var i = 0;
27+ var arg;
28+ while (res instanceof __IDRRT__Con){
29+ arg = arguments[i];
30+ res = __IDRRT__tailcall(function(){
31+ return __IDR__mAPPLY0(res, arg);
32+ });
33+ ++i;
34+ }
35+ return res;
36+ }
37+};
38+
39+/** @constructor */
40+var __IDRRT__Con = function(tag,vars) {
41+ this.tag = tag;
42+ this.vars = vars;
43+};
44+
45+var __IDRRT__tailcall = function(k) {
46+ var ret = k();
47+ while (ret instanceof __IDRRT__Cont)
48+ ret = ret.k();
49+
50+ return ret;
51+};
js/Runtime-node.js → jsrts/Runtime-node.jsrenamed

The content is the same.

jsrts/jsbn/LICENSEnew file+40
@@ -0,0 +1,40 @@
1+Licensing
2+---------
3+
4+This software is covered under the following copyright:
5+
6+/*
7+ * Copyright (c) 2003-2005 Tom Wu
8+ * All Rights Reserved.
9+ *
10+ * Permission is hereby granted, free of charge, to any person obtaining
11+ * a copy of this software and associated documentation files (the
12+ * "Software"), to deal in the Software without restriction, including
13+ * without limitation the rights to use, copy, modify, merge, publish,
14+ * distribute, sublicense, and/or sell copies of the Software, and to
15+ * permit persons to whom the Software is furnished to do so, subject to
16+ * the following conditions:
17+ *
18+ * The above copyright notice and this permission notice shall be
19+ * included in all copies or substantial portions of the Software.
20+ *
21+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
22+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
23+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
24+ *
25+ * IN NO EVENT SHALL TOM WU BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
26+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
27+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
28+ * THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
29+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
30+ *
31+ * In addition, the following condition applies:
32+ *
33+ * All redistributions must retain an intact copy of this copyright notice
34+ * and disclaimer.
35+ */
36+
37+Address all questions regarding this license to:
38+
39+ Tom Wu
40+ tjw@cs.Stanford.EDU
jsrts/jsbn/jsbn.jsnew file+1235
@@ -0,0 +1,1235 @@
1+var __IDRRT__bigInt = (function() {
2+// Copyright (c) 2005 Tom Wu
3+// All Rights Reserved.
4+// See "LICENSE" for details.
5+
6+// Basic JavaScript BN library - subset useful for RSA encryption.
7+
8+// Bits per digit
9+var dbits;
10+
11+// JavaScript engine analysis
12+var canary = 0xdeadbeefcafe;
13+var j_lm = ((canary&0xffffff)==0xefcafe);
14+
15+// (public) Constructor
16+function BigInteger(a,b,c) {
17+ if(a != null)
18+ if("number" == typeof a) this.fromNumber(a,b,c);
19+ else if(b == null && "string" != typeof a) this.fromString(a,256);
20+ else this.fromString(a,b);
21+}
22+
23+// return new, unset BigInteger
24+function nbi() { return new BigInteger(null); }
25+
26+// am: Compute w_j += (x*this_i), propagate carries,
27+// c is initial carry, returns final carry.
28+// c < 3*dvalue, x < 2*dvalue, this_i < dvalue
29+// We need to select the fastest one that works in this environment.
30+
31+// am1: use a single mult and divide to get the high bits,
32+// max digit bits should be 26 because
33+// max internal value = 2*dvalue^2-2*dvalue (< 2^53)
34+function am1(i,x,w,j,c,n) {
35+ while(--n >= 0) {
36+ var v = x*this[i++]+w[j]+c;
37+ c = Math.floor(v/0x4000000);
38+ w[j++] = v&0x3ffffff;
39+ }
40+ return c;
41+}
42+// am2 avoids a big mult-and-extract completely.
43+// Max digit bits should be <= 30 because we do bitwise ops
44+// on values up to 2*hdvalue^2-hdvalue-1 (< 2^31)
45+function am2(i,x,w,j,c,n) {
46+ var xl = x&0x7fff, xh = x>>15;
47+ while(--n >= 0) {
48+ var l = this[i]&0x7fff;
49+ var h = this[i++]>>15;
50+ var m = xh*l+h*xl;
51+ l = xl*l+((m&0x7fff)<<15)+w[j]+(c&0x3fffffff);
52+ c = (l>>>30)+(m>>>15)+xh*h+(c>>>30);
53+ w[j++] = l&0x3fffffff;
54+ }
55+ return c;
56+}
57+// Alternately, set max digit bits to 28 since some
58+// browsers slow down when dealing with 32-bit numbers.
59+function am3(i,x,w,j,c,n) {
60+ var xl = x&0x3fff, xh = x>>14;
61+ while(--n >= 0) {
62+ var l = this[i]&0x3fff;
63+ var h = this[i++]>>14;
64+ var m = xh*l+h*xl;
65+ l = xl*l+((m&0x3fff)<<14)+w[j]+c;
66+ c = (l>>28)+(m>>14)+xh*h;
67+ w[j++] = l&0xfffffff;
68+ }
69+ return c;
70+}
71+var in_browser = typeof navigator !== "undefined"
72+if(in_browser && j_lm && (navigator.appName == "Microsoft Internet Explorer")) {
73+ BigInteger.prototype.am = am2;
74+ dbits = 30;
75+}
76+else if(in_browser && j_lm && (navigator.appName != "Netscape")) {
77+ BigInteger.prototype.am = am1;
78+ dbits = 26;
79+}
80+else { // Mozilla/Netscape seems to prefer am3
81+ BigInteger.prototype.am = am3;
82+ dbits = 28;
83+}
84+
85+BigInteger.prototype.DB = dbits;
86+BigInteger.prototype.DM = ((1<<dbits)-1);
87+BigInteger.prototype.DV = (1<<dbits);
88+
89+var BI_FP = 52;
90+BigInteger.prototype.FV = Math.pow(2,BI_FP);
91+BigInteger.prototype.F1 = BI_FP-dbits;
92+BigInteger.prototype.F2 = 2*dbits-BI_FP;
93+
94+// Digit conversions
95+var BI_RM = "0123456789abcdefghijklmnopqrstuvwxyz";
96+var BI_RC = new Array();
97+var rr,vv;
98+rr = "0".charCodeAt(0);
99+for(vv = 0; vv <= 9; ++vv) BI_RC[rr++] = vv;
100+rr = "a".charCodeAt(0);
101+for(vv = 10; vv < 36; ++vv) BI_RC[rr++] = vv;
102+rr = "A".charCodeAt(0);
103+for(vv = 10; vv < 36; ++vv) BI_RC[rr++] = vv;
104+
105+function int2char(n) { return BI_RM.charAt(n); }
106+function intAt(s,i) {
107+ var c = BI_RC[s.charCodeAt(i)];
108+ return (c==null)?-1:c;
109+}
110+
111+// (protected) copy this to r
112+function bnpCopyTo(r) {
113+ for(var i = this.t-1; i >= 0; --i) r[i] = this[i];
114+ r.t = this.t;
115+ r.s = this.s;
116+}
117+
118+// (protected) set from integer value x, -DV <= x < DV
119+function bnpFromInt(x) {
120+ this.t = 1;
121+ this.s = (x<0)?-1:0;
122+ if(x > 0) this[0] = x;
123+ else if(x < -1) this[0] = x+this.DV;
124+ else this.t = 0;
125+}
126+
127+// return bigint initialized to value
128+function nbv(i) { var r = nbi(); r.fromInt(i); return r; }
129+
130+// (protected) set from string and radix
131+function bnpFromString(s,b) {
132+ var k;
133+ if(b == 16) k = 4;
134+ else if(b == 8) k = 3;
135+ else if(b == 256) k = 8; // byte array
136+ else if(b == 2) k = 1;
137+ else if(b == 32) k = 5;
138+ else if(b == 4) k = 2;
139+ else { this.fromRadix(s,b); return; }
140+ this.t = 0;
141+ this.s = 0;
142+ var i = s.length, mi = false, sh = 0;
143+ while(--i >= 0) {
144+ var x = (k==8)?s[i]&0xff:intAt(s,i);
145+ if(x < 0) {
146+ if(s.charAt(i) == "-") mi = true;
147+ continue;
148+ }
149+ mi = false;
150+ if(sh == 0)
151+ this[this.t++] = x;
152+ else if(sh+k > this.DB) {
153+ this[this.t-1] |= (x&((1<<(this.DB-sh))-1))<<sh;
154+ this[this.t++] = (x>>(this.DB-sh));
155+ }
156+ else
157+ this[this.t-1] |= x<<sh;
158+ sh += k;
159+ if(sh >= this.DB) sh -= this.DB;
160+ }
161+ if(k == 8 && (s[0]&0x80) != 0) {
162+ this.s = -1;
163+ if(sh > 0) this[this.t-1] |= ((1<<(this.DB-sh))-1)<<sh;
164+ }
165+ this.clamp();
166+ if(mi) BigInteger.ZERO.subTo(this,this);
167+}
168+
169+// (protected) clamp off excess high words
170+function bnpClamp() {
171+ var c = this.s&this.DM;
172+ while(this.t > 0 && this[this.t-1] == c) --this.t;
173+}
174+
175+// (public) return string representation in given radix
176+function bnToString(b) {
177+ if(this.s < 0) return "-"+this.negate().toString(b);
178+ var k;
179+ if(b == 16) k = 4;
180+ else if(b == 8) k = 3;
181+ else if(b == 2) k = 1;
182+ else if(b == 32) k = 5;
183+ else if(b == 4) k = 2;
184+ else return this.toRadix(b);
185+ var km = (1<<k)-1, d, m = false, r = "", i = this.t;
186+ var p = this.DB-(i*this.DB)%k;
187+ if(i-- > 0) {
188+ if(p < this.DB && (d = this[i]>>p) > 0) { m = true; r = int2char(d); }
189+ while(i >= 0) {
190+ if(p < k) {
191+ d = (this[i]&((1<<p)-1))<<(k-p);
192+ d |= this[--i]>>(p+=this.DB-k);
193+ }
194+ else {
195+ d = (this[i]>>(p-=k))&km;
196+ if(p <= 0) { p += this.DB; --i; }
197+ }
198+ if(d > 0) m = true;
199+ if(m) r += int2char(d);
200+ }
201+ }
202+ return m?r:"0";
203+}
204+
205+// (public) -this
206+function bnNegate() { var r = nbi(); BigInteger.ZERO.subTo(this,r); return r; }
207+
208+// (public) |this|
209+function bnAbs() { return (this.s<0)?this.negate():this; }
210+
211+// (public) return + if this > a, - if this < a, 0 if equal
212+function bnCompareTo(a) {
213+ var r = this.s-a.s;
214+ if(r != 0) return r;
215+ var i = this.t;
216+ r = i-a.t;
217+ if(r != 0) return (this.s<0)?-r:r;
218+ while(--i >= 0) if((r=this[i]-a[i]) != 0) return r;
219+ return 0;
220+}
221+
222+// returns bit length of the integer x
223+function nbits(x) {
224+ var r = 1, t;
225+ if((t=x>>>16) != 0) { x = t; r += 16; }
226+ if((t=x>>8) != 0) { x = t; r += 8; }
227+ if((t=x>>4) != 0) { x = t; r += 4; }
228+ if((t=x>>2) != 0) { x = t; r += 2; }
229+ if((t=x>>1) != 0) { x = t; r += 1; }
230+ return r;
231+}
232+
233+// (public) return the number of bits in "this"
234+function bnBitLength() {
235+ if(this.t <= 0) return 0;
236+ return this.DB*(this.t-1)+nbits(this[this.t-1]^(this.s&this.DM));
237+}
238+
239+// (protected) r = this << n*DB
240+function bnpDLShiftTo(n,r) {
241+ var i;
242+ for(i = this.t-1; i >= 0; --i) r[i+n] = this[i];
243+ for(i = n-1; i >= 0; --i) r[i] = 0;
244+ r.t = this.t+n;
245+ r.s = this.s;
246+}
247+
248+// (protected) r = this >> n*DB
249+function bnpDRShiftTo(n,r) {
250+ for(var i = n; i < this.t; ++i) r[i-n] = this[i];
251+ r.t = Math.max(this.t-n,0);
252+ r.s = this.s;
253+}
254+
255+// (protected) r = this << n
256+function bnpLShiftTo(n,r) {
257+ var bs = n%this.DB;
258+ var cbs = this.DB-bs;
259+ var bm = (1<<cbs)-1;
260+ var ds = Math.floor(n/this.DB), c = (this.s<<bs)&this.DM, i;
261+ for(i = this.t-1; i >= 0; --i) {
262+ r[i+ds+1] = (this[i]>>cbs)|c;
263+ c = (this[i]&bm)<<bs;
264+ }
265+ for(i = ds-1; i >= 0; --i) r[i] = 0;
266+ r[ds] = c;
267+ r.t = this.t+ds+1;
268+ r.s = this.s;
269+ r.clamp();
270+}
271+
272+// (protected) r = this >> n
273+function bnpRShiftTo(n,r) {
274+ r.s = this.s;
275+ var ds = Math.floor(n/this.DB);
276+ if(ds >= this.t) { r.t = 0; return; }
277+ var bs = n%this.DB;
278+ var cbs = this.DB-bs;
279+ var bm = (1<<bs)-1;
280+ r[0] = this[ds]>>bs;
281+ for(var i = ds+1; i < this.t; ++i) {
282+ r[i-ds-1] |= (this[i]&bm)<<cbs;
283+ r[i-ds] = this[i]>>bs;
284+ }
285+ if(bs > 0) r[this.t-ds-1] |= (this.s&bm)<<cbs;
286+ r.t = this.t-ds;
287+ r.clamp();
288+}
289+
290+// (protected) r = this - a
291+function bnpSubTo(a,r) {
292+ var i = 0, c = 0, m = Math.min(a.t,this.t);
293+ while(i < m) {
294+ c += this[i]-a[i];
295+ r[i++] = c&this.DM;
296+ c >>= this.DB;
297+ }
298+ if(a.t < this.t) {
299+ c -= a.s;
300+ while(i < this.t) {
301+ c += this[i];
302+ r[i++] = c&this.DM;
303+ c >>= this.DB;
304+ }
305+ c += this.s;
306+ }
307+ else {
308+ c += this.s;
309+ while(i < a.t) {
310+ c -= a[i];
311+ r[i++] = c&this.DM;
312+ c >>= this.DB;
313+ }
314+ c -= a.s;
315+ }
316+ r.s = (c<0)?-1:0;
317+ if(c < -1) r[i++] = this.DV+c;
318+ else if(c > 0) r[i++] = c;
319+ r.t = i;
320+ r.clamp();
321+}
322+
323+// (protected) r = this * a, r != this,a (HAC 14.12)
324+// "this" should be the larger one if appropriate.
325+function bnpMultiplyTo(a,r) {
326+ var x = this.abs(), y = a.abs();
327+ var i = x.t;
328+ r.t = i+y.t;
329+ while(--i >= 0) r[i] = 0;
330+ for(i = 0; i < y.t; ++i) r[i+x.t] = x.am(0,y[i],r,i,0,x.t);
331+ r.s = 0;
332+ r.clamp();
333+ if(this.s != a.s) BigInteger.ZERO.subTo(r,r);
334+}
335+
336+// (protected) r = this^2, r != this (HAC 14.16)
337+function bnpSquareTo(r) {
338+ var x = this.abs();
339+ var i = r.t = 2*x.t;
340+ while(--i >= 0) r[i] = 0;
341+ for(i = 0; i < x.t-1; ++i) {
342+ var c = x.am(i,x[i],r,2*i,0,1);
343+ if((r[i+x.t]+=x.am(i+1,2*x[i],r,2*i+1,c,x.t-i-1)) >= x.DV) {
344+ r[i+x.t] -= x.DV;
345+ r[i+x.t+1] = 1;
346+ }
347+ }
348+ if(r.t > 0) r[r.t-1] += x.am(i,x[i],r,2*i,0,1);
349+ r.s = 0;
350+ r.clamp();
351+}
352+
353+// (protected) divide this by m, quotient and remainder to q, r (HAC 14.20)
354+// r != q, this != m. q or r may be null.
355+function bnpDivRemTo(m,q,r) {
356+ var pm = m.abs();
357+ if(pm.t <= 0) return;
358+ var pt = this.abs();
359+ if(pt.t < pm.t) {
360+ if(q != null) q.fromInt(0);
361+ if(r != null) this.copyTo(r);
362+ return;
363+ }
364+ if(r == null) r = nbi();
365+ var y = nbi(), ts = this.s, ms = m.s;
366+ var nsh = this.DB-nbits(pm[pm.t-1]); // normalize modulus
367+ if(nsh > 0) { pm.lShiftTo(nsh,y); pt.lShiftTo(nsh,r); }
368+ else { pm.copyTo(y); pt.copyTo(r); }
369+ var ys = y.t;
370+ var y0 = y[ys-1];
371+ if(y0 == 0) return;
372+ var yt = y0*(1<<this.F1)+((ys>1)?y[ys-2]>>this.F2:0);
373+ var d1 = this.FV/yt, d2 = (1<<this.F1)/yt, e = 1<<this.F2;
374+ var i = r.t, j = i-ys, t = (q==null)?nbi():q;
375+ y.dlShiftTo(j,t);
376+ if(r.compareTo(t) >= 0) {
377+ r[r.t++] = 1;
378+ r.subTo(t,r);
379+ }
380+ BigInteger.ONE.dlShiftTo(ys,t);
381+ t.subTo(y,y); // "negative" y so we can replace sub with am later
382+ while(y.t < ys) y[y.t++] = 0;
383+ while(--j >= 0) {
384+ // Estimate quotient digit
385+ var qd = (r[--i]==y0)?this.DM:Math.floor(r[i]*d1+(r[i-1]+e)*d2);
386+ if((r[i]+=y.am(0,qd,r,j,0,ys)) < qd) { // Try it out
387+ y.dlShiftTo(j,t);
388+ r.subTo(t,r);
389+ while(r[i] < --qd) r.subTo(t,r);
390+ }
391+ }
392+ if(q != null) {
393+ r.drShiftTo(ys,q);
394+ if(ts != ms) BigInteger.ZERO.subTo(q,q);
395+ }
396+ r.t = ys;
397+ r.clamp();
398+ if(nsh > 0) r.rShiftTo(nsh,r); // Denormalize remainder
399+ if(ts < 0) BigInteger.ZERO.subTo(r,r);
400+}
401+
402+// (public) this mod a
403+function bnMod(a) {
404+ var r = nbi();
405+ this.abs().divRemTo(a,null,r);
406+ if(this.s < 0 && r.compareTo(BigInteger.ZERO) > 0) a.subTo(r,r);
407+ return r;
408+}
409+
410+// Modular reduction using "classic" algorithm
411+function Classic(m) { this.m = m; }
412+function cConvert(x) {
413+ if(x.s < 0 || x.compareTo(this.m) >= 0) return x.mod(this.m);
414+ else return x;
415+}
416+function cRevert(x) { return x; }
417+function cReduce(x) { x.divRemTo(this.m,null,x); }
418+function cMulTo(x,y,r) { x.multiplyTo(y,r); this.reduce(r); }
419+function cSqrTo(x,r) { x.squareTo(r); this.reduce(r); }
420+
421+Classic.prototype.convert = cConvert;
422+Classic.prototype.revert = cRevert;
423+Classic.prototype.reduce = cReduce;
424+Classic.prototype.mulTo = cMulTo;
425+Classic.prototype.sqrTo = cSqrTo;
426+
427+// (protected) return "-1/this % 2^DB"; useful for Mont. reduction
428+// justification:
429+// xy == 1 (mod m)
430+// xy = 1+km
431+// xy(2-xy) = (1+km)(1-km)
432+// x[y(2-xy)] = 1-k^2m^2
433+// x[y(2-xy)] == 1 (mod m^2)
434+// if y is 1/x mod m, then y(2-xy) is 1/x mod m^2
435+// should reduce x and y(2-xy) by m^2 at each step to keep size bounded.
436+// JS multiply "overflows" differently from C/C++, so care is needed here.
437+function bnpInvDigit() {
438+ if(this.t < 1) return 0;
439+ var x = this[0];
440+ if((x&1) == 0) return 0;
441+ var y = x&3; // y == 1/x mod 2^2
442+ y = (y*(2-(x&0xf)*y))&0xf; // y == 1/x mod 2^4
443+ y = (y*(2-(x&0xff)*y))&0xff; // y == 1/x mod 2^8
444+ y = (y*(2-(((x&0xffff)*y)&0xffff)))&0xffff; // y == 1/x mod 2^16
445+ // last step - calculate inverse mod DV directly;
446+ // assumes 16 < DB <= 32 and assumes ability to handle 48-bit ints
447+ y = (y*(2-x*y%this.DV))%this.DV; // y == 1/x mod 2^dbits
448+ // we really want the negative inverse, and -DV < y < DV
449+ return (y>0)?this.DV-y:-y;
450+}
451+
452+// Montgomery reduction
453+function Montgomery(m) {
454+ this.m = m;
455+ this.mp = m.invDigit();
456+ this.mpl = this.mp&0x7fff;
457+ this.mph = this.mp>>15;
458+ this.um = (1<<(m.DB-15))-1;
459+ this.mt2 = 2*m.t;
460+}
461+
462+// xR mod m
463+function montConvert(x) {
464+ var r = nbi();
465+ x.abs().dlShiftTo(this.m.t,r);
466+ r.divRemTo(this.m,null,r);
467+ if(x.s < 0 && r.compareTo(BigInteger.ZERO) > 0) this.m.subTo(r,r);
468+ return r;
469+}
470+
471+// x/R mod m
472+function montRevert(x) {
473+ var r = nbi();
474+ x.copyTo(r);
475+ this.reduce(r);
476+ return r;
477+}
478+
479+// x = x/R mod m (HAC 14.32)
480+function montReduce(x) {
481+ while(x.t <= this.mt2) // pad x so am has enough room later
482+ x[x.t++] = 0;
483+ for(var i = 0; i < this.m.t; ++i) {
484+ // faster way of calculating u0 = x[i]*mp mod DV
485+ var j = x[i]&0x7fff;
486+ var u0 = (j*this.mpl+(((j*this.mph+(x[i]>>15)*this.mpl)&this.um)<<15))&x.DM;
487+ // use am to combine the multiply-shift-add into one call
488+ j = i+this.m.t;
489+ x[j] += this.m.am(0,u0,x,i,0,this.m.t);
490+ // propagate carry
491+ while(x[j] >= x.DV) { x[j] -= x.DV; x[++j]++; }
492+ }
493+ x.clamp();
494+ x.drShiftTo(this.m.t,x);
495+ if(x.compareTo(this.m) >= 0) x.subTo(this.m,x);
496+}
497+
498+// r = "x^2/R mod m"; x != r
499+function montSqrTo(x,r) { x.squareTo(r); this.reduce(r); }
500+
501+// r = "xy/R mod m"; x,y != r
502+function montMulTo(x,y,r) { x.multiplyTo(y,r); this.reduce(r); }
503+
504+Montgomery.prototype.convert = montConvert;
505+Montgomery.prototype.revert = montRevert;
506+Montgomery.prototype.reduce = montReduce;
507+Montgomery.prototype.mulTo = montMulTo;
508+Montgomery.prototype.sqrTo = montSqrTo;
509+
510+// (protected) true iff this is even
511+function bnpIsEven() { return ((this.t>0)?(this[0]&1):this.s) == 0; }
512+
513+// (protected) this^e, e < 2^32, doing sqr and mul with "r" (HAC 14.79)
514+function bnpExp(e,z) {
515+ if(e > 0xffffffff || e < 1) return BigInteger.ONE;
516+ var r = nbi(), r2 = nbi(), g = z.convert(this), i = nbits(e)-1;
517+ g.copyTo(r);
518+ while(--i >= 0) {
519+ z.sqrTo(r,r2);
520+ if((e&(1<<i)) > 0) z.mulTo(r2,g,r);
521+ else { var t = r; r = r2; r2 = t; }
522+ }
523+ return z.revert(r);
524+}
525+
526+// (public) this^e % m, 0 <= e < 2^32
527+function bnModPowInt(e,m) {
528+ var z;
529+ if(e < 256 || m.isEven()) z = new Classic(m); else z = new Montgomery(m);
530+ return this.exp(e,z);
531+}
532+
533+// protected
534+BigInteger.prototype.copyTo = bnpCopyTo;
535+BigInteger.prototype.fromInt = bnpFromInt;
536+BigInteger.prototype.fromString = bnpFromString;
537+BigInteger.prototype.clamp = bnpClamp;
538+BigInteger.prototype.dlShiftTo = bnpDLShiftTo;
539+BigInteger.prototype.drShiftTo = bnpDRShiftTo;
540+BigInteger.prototype.lShiftTo = bnpLShiftTo;
541+BigInteger.prototype.rShiftTo = bnpRShiftTo;
542+BigInteger.prototype.subTo = bnpSubTo;
543+BigInteger.prototype.multiplyTo = bnpMultiplyTo;
544+BigInteger.prototype.squareTo = bnpSquareTo;
545+BigInteger.prototype.divRemTo = bnpDivRemTo;
546+BigInteger.prototype.invDigit = bnpInvDigit;
547+BigInteger.prototype.isEven = bnpIsEven;
548+BigInteger.prototype.exp = bnpExp;
549+
550+// public
551+BigInteger.prototype.toString = bnToString;
552+BigInteger.prototype.negate = bnNegate;
553+BigInteger.prototype.abs = bnAbs;
554+BigInteger.prototype.compareTo = bnCompareTo;
555+BigInteger.prototype.bitLength = bnBitLength;
556+BigInteger.prototype.mod = bnMod;
557+BigInteger.prototype.modPowInt = bnModPowInt;
558+
559+// "constants"
560+BigInteger.ZERO = nbv(0);
561+BigInteger.ONE = nbv(1);
562+
563+// Copyright (c) 2005-2009 Tom Wu
564+// All Rights Reserved.
565+// See "LICENSE" for details.
566+
567+// Extended JavaScript BN functions, required for RSA private ops.
568+
569+// Version 1.1: new BigInteger("0", 10) returns "proper" zero
570+// Version 1.2: square() API, isProbablePrime fix
571+
572+// (public)
573+function bnClone() { var r = nbi(); this.copyTo(r); return r; }
574+
575+// (public) return value as integer
576+function bnIntValue() {
577+ if(this.s < 0) {
578+ if(this.t == 1) return this[0]-this.DV;
579+ else if(this.t == 0) return -1;
580+ }
581+ else if(this.t == 1) return this[0];
582+ else if(this.t == 0) return 0;
583+ // assumes 16 < DB < 32
584+ return ((this[1]&((1<<(32-this.DB))-1))<<this.DB)|this[0];
585+}
586+
587+// (public) return value as byte
588+function bnByteValue() { return (this.t==0)?this.s:(this[0]<<24)>>24; }
589+
590+// (public) return value as short (assumes DB>=16)
591+function bnShortValue() { return (this.t==0)?this.s:(this[0]<<16)>>16; }
592+
593+// (protected) return x s.t. r^x < DV
594+function bnpChunkSize(r) { return Math.floor(Math.LN2*this.DB/Math.log(r)); }
595+
596+// (public) 0 if this == 0, 1 if this > 0
597+function bnSigNum() {
598+ if(this.s < 0) return -1;
599+ else if(this.t <= 0 || (this.t == 1 && this[0] <= 0)) return 0;
600+ else return 1;
601+}
602+
603+// (protected) convert to radix string
604+function bnpToRadix(b) {
605+ if(b == null) b = 10;
606+ if(this.signum() == 0 || b < 2 || b > 36) return "0";
607+ var cs = this.chunkSize(b);
608+ var a = Math.pow(b,cs);
609+ var d = nbv(a), y = nbi(), z = nbi(), r = "";
610+ this.divRemTo(d,y,z);
611+ while(y.signum() > 0) {
612+ r = (a+z.intValue()).toString(b).substr(1) + r;
613+ y.divRemTo(d,y,z);
614+ }
615+ return z.intValue().toString(b) + r;
616+}
617+
618+// (protected) convert from radix string
619+function bnpFromRadix(s,b) {
620+ this.fromInt(0);
621+ if(b == null) b = 10;
622+ var cs = this.chunkSize(b);
623+ var d = Math.pow(b,cs), mi = false, j = 0, w = 0;
624+ for(var i = 0; i < s.length; ++i) {
625+ var x = intAt(s,i);
626+ if(x < 0) {
627+ if(s.charAt(i) == "-" && this.signum() == 0) mi = true;
628+ continue;
629+ }
630+ w = b*w+x;
631+ if(++j >= cs) {
632+ this.dMultiply(d);
633+ this.dAddOffset(w,0);
634+ j = 0;
635+ w = 0;
636+ }
637+ }
638+ if(j > 0) {
639+ this.dMultiply(Math.pow(b,j));
640+ this.dAddOffset(w,0);
641+ }
642+ if(mi) BigInteger.ZERO.subTo(this,this);
643+}
644+
645+// (protected) alternate constructor
646+function bnpFromNumber(a,b,c) {
647+ if("number" == typeof b) {
648+ // new BigInteger(int,int,RNG)
649+ if(a < 2) this.fromInt(1);
650+ else {
651+ this.fromNumber(a,c);
652+ if(!this.testBit(a-1)) // force MSB set
653+ this.bitwiseTo(BigInteger.ONE.shiftLeft(a-1),op_or,this);
654+ if(this.isEven()) this.dAddOffset(1,0); // force odd
655+ while(!this.isProbablePrime(b)) {
656+ this.dAddOffset(2,0);
657+ if(this.bitLength() > a) this.subTo(BigInteger.ONE.shiftLeft(a-1),this);
658+ }
659+ }
660+ }
661+ else {
662+ // new BigInteger(int,RNG)
663+ var x = new Array(), t = a&7;
664+ x.length = (a>>3)+1;
665+ b.nextBytes(x);
666+ if(t > 0) x[0] &= ((1<<t)-1); else x[0] = 0;
667+ this.fromString(x,256);
668+ }
669+}
670+
671+// (public) convert to bigendian byte array
672+function bnToByteArray() {
673+ var i = this.t, r = new Array();
674+ r[0] = this.s;
675+ var p = this.DB-(i*this.DB)%8, d, k = 0;
676+ if(i-- > 0) {
677+ if(p < this.DB && (d = this[i]>>p) != (this.s&this.DM)>>p)
678+ r[k++] = d|(this.s<<(this.DB-p));
679+ while(i >= 0) {
680+ if(p < 8) {
681+ d = (this[i]&((1<<p)-1))<<(8-p);
682+ d |= this[--i]>>(p+=this.DB-8);
683+ }
684+ else {
685+ d = (this[i]>>(p-=8))&0xff;
686+ if(p <= 0) { p += this.DB; --i; }
687+ }
688+ if((d&0x80) != 0) d |= -256;
689+ if(k == 0 && (this.s&0x80) != (d&0x80)) ++k;
690+ if(k > 0 || d != this.s) r[k++] = d;
691+ }
692+ }
693+ return r;
694+}
695+
696+function bnEquals(a) { return(this.compareTo(a)==0); }
697+function bnMin(a) { return(this.compareTo(a)<0)?this:a; }
698+function bnMax(a) { return(this.compareTo(a)>0)?this:a; }
699+
700+// (protected) r = this op a (bitwise)
701+function bnpBitwiseTo(a,op,r) {
702+ var i, f, m = Math.min(a.t,this.t);
703+ for(i = 0; i < m; ++i) r[i] = op(this[i],a[i]);
704+ if(a.t < this.t) {
705+ f = a.s&this.DM;
706+ for(i = m; i < this.t; ++i) r[i] = op(this[i],f);
707+ r.t = this.t;
708+ }
709+ else {
710+ f = this.s&this.DM;
711+ for(i = m; i < a.t; ++i) r[i] = op(f,a[i]);
712+ r.t = a.t;
713+ }
714+ r.s = op(this.s,a.s);
715+ r.clamp();
716+}
717+
718+// (public) this & a
719+function op_and(x,y) { return x&y; }
720+function bnAnd(a) { var r = nbi(); this.bitwiseTo(a,op_and,r); return r; }
721+
722+// (public) this | a
723+function op_or(x,y) { return x|y; }
724+function bnOr(a) { var r = nbi(); this.bitwiseTo(a,op_or,r); return r; }
725+
726+// (public) this ^ a
727+function op_xor(x,y) { return x^y; }
728+function bnXor(a) { var r = nbi(); this.bitwiseTo(a,op_xor,r); return r; }
729+
730+// (public) this & ~a
731+function op_andnot(x,y) { return x&~y; }
732+function bnAndNot(a) { var r = nbi(); this.bitwiseTo(a,op_andnot,r); return r; }
733+
734+// (public) ~this
735+function bnNot() {
736+ var r = nbi();
737+ for(var i = 0; i < this.t; ++i) r[i] = this.DM&~this[i];
738+ r.t = this.t;
739+ r.s = ~this.s;
740+ return r;
741+}
742+
743+// (public) this << n
744+function bnShiftLeft(n) {
745+ var r = nbi();
746+ if(n < 0) this.rShiftTo(-n,r); else this.lShiftTo(n,r);
747+ return r;
748+}
749+
750+// (public) this >> n
751+function bnShiftRight(n) {
752+ var r = nbi();
753+ if(n < 0) this.lShiftTo(-n,r); else this.rShiftTo(n,r);
754+ return r;
755+}
756+
757+// return index of lowest 1-bit in x, x < 2^31
758+function lbit(x) {
759+ if(x == 0) return -1;
760+ var r = 0;
761+ if((x&0xffff) == 0) { x >>= 16; r += 16; }
762+ if((x&0xff) == 0) { x >>= 8; r += 8; }
763+ if((x&0xf) == 0) { x >>= 4; r += 4; }
764+ if((x&3) == 0) { x >>= 2; r += 2; }
765+ if((x&1) == 0) ++r;
766+ return r;
767+}
768+
769+// (public) returns index of lowest 1-bit (or -1 if none)
770+function bnGetLowestSetBit() {
771+ for(var i = 0; i < this.t; ++i)
772+ if(this[i] != 0) return i*this.DB+lbit(this[i]);
773+ if(this.s < 0) return this.t*this.DB;
774+ return -1;
775+}
776+
777+// return number of 1 bits in x
778+function cbit(x) {
779+ var r = 0;
780+ while(x != 0) { x &= x-1; ++r; }
781+ return r;
782+}
783+
784+// (public) return number of set bits
785+function bnBitCount() {
786+ var r = 0, x = this.s&this.DM;
787+ for(var i = 0; i < this.t; ++i) r += cbit(this[i]^x);
788+ return r;
789+}
790+
791+// (public) true iff nth bit is set
792+function bnTestBit(n) {
793+ var j = Math.floor(n/this.DB);
794+ if(j >= this.t) return(this.s!=0);
795+ return((this[j]&(1<<(n%this.DB)))!=0);
796+}
797+
798+// (protected) this op (1<<n)
799+function bnpChangeBit(n,op) {
800+ var r = BigInteger.ONE.shiftLeft(n);
801+ this.bitwiseTo(r,op,r);
802+ return r;
803+}
804+
805+// (public) this | (1<<n)
806+function bnSetBit(n) { return this.changeBit(n,op_or); }
807+
808+// (public) this & ~(1<<n)
809+function bnClearBit(n) { return this.changeBit(n,op_andnot); }
810+
811+// (public) this ^ (1<<n)
812+function bnFlipBit(n) { return this.changeBit(n,op_xor); }
813+
814+// (protected) r = this + a
815+function bnpAddTo(a,r) {
816+ var i = 0, c = 0, m = Math.min(a.t,this.t);
817+ while(i < m) {
818+ c += this[i]+a[i];
819+ r[i++] = c&this.DM;
820+ c >>= this.DB;
821+ }
822+ if(a.t < this.t) {
823+ c += a.s;
824+ while(i < this.t) {
825+ c += this[i];
826+ r[i++] = c&this.DM;
827+ c >>= this.DB;
828+ }
829+ c += this.s;
830+ }
831+ else {
832+ c += this.s;
833+ while(i < a.t) {
834+ c += a[i];
835+ r[i++] = c&this.DM;
836+ c >>= this.DB;
837+ }
838+ c += a.s;
839+ }
840+ r.s = (c<0)?-1:0;
841+ if(c > 0) r[i++] = c;
842+ else if(c < -1) r[i++] = this.DV+c;
843+ r.t = i;
844+ r.clamp();
845+}
846+
847+// (public) this + a
848+function bnAdd(a) { var r = nbi(); this.addTo(a,r); return r; }
849+
850+// (public) this - a
851+function bnSubtract(a) { var r = nbi(); this.subTo(a,r); return r; }
852+
853+// (public) this * a
854+function bnMultiply(a) { var r = nbi(); this.multiplyTo(a,r); return r; }
855+
856+// (public) this^2
857+function bnSquare() { var r = nbi(); this.squareTo(r); return r; }
858+
859+// (public) this / a
860+function bnDivide(a) { var r = nbi(); this.divRemTo(a,r,null); return r; }
861+
862+// (public) this % a
863+function bnRemainder(a) { var r = nbi(); this.divRemTo(a,null,r); return r; }
864+
865+// (public) [this/a,this%a]
866+function bnDivideAndRemainder(a) {
867+ var q = nbi(), r = nbi();
868+ this.divRemTo(a,q,r);
869+ return new Array(q,r);
870+}
871+
872+// (protected) this *= n, this >= 0, 1 < n < DV
873+function bnpDMultiply(n) {
874+ this[this.t] = this.am(0,n-1,this,0,0,this.t);
875+ ++this.t;
876+ this.clamp();
877+}
878+
879+// (protected) this += n << w words, this >= 0
880+function bnpDAddOffset(n,w) {
881+ if(n == 0) return;
882+ while(this.t <= w) this[this.t++] = 0;
883+ this[w] += n;
884+ while(this[w] >= this.DV) {
885+ this[w] -= this.DV;
886+ if(++w >= this.t) this[this.t++] = 0;
887+ ++this[w];
888+ }
889+}
890+
891+// A "null" reducer
892+function NullExp() {}
893+function nNop(x) { return x; }
894+function nMulTo(x,y,r) { x.multiplyTo(y,r); }
895+function nSqrTo(x,r) { x.squareTo(r); }
896+
897+NullExp.prototype.convert = nNop;
898+NullExp.prototype.revert = nNop;
899+NullExp.prototype.mulTo = nMulTo;
900+NullExp.prototype.sqrTo = nSqrTo;
901+
902+// (public) this^e
903+function bnPow(e) { return this.exp(e,new NullExp()); }
904+
905+// (protected) r = lower n words of "this * a", a.t <= n
906+// "this" should be the larger one if appropriate.
907+function bnpMultiplyLowerTo(a,n,r) {
908+ var i = Math.min(this.t+a.t,n);
909+ r.s = 0; // assumes a,this >= 0
910+ r.t = i;
911+ while(i > 0) r[--i] = 0;
912+ var j;
913+ for(j = r.t-this.t; i < j; ++i) r[i+this.t] = this.am(0,a[i],r,i,0,this.t);
914+ for(j = Math.min(a.t,n); i < j; ++i) this.am(0,a[i],r,i,0,n-i);
915+ r.clamp();
916+}
917+
918+// (protected) r = "this * a" without lower n words, n > 0
919+// "this" should be the larger one if appropriate.
920+function bnpMultiplyUpperTo(a,n,r) {
921+ --n;
922+ var i = r.t = this.t+a.t-n;
923+ r.s = 0; // assumes a,this >= 0
924+ while(--i >= 0) r[i] = 0;
925+ for(i = Math.max(n-this.t,0); i < a.t; ++i)
926+ r[this.t+i-n] = this.am(n-i,a[i],r,0,0,this.t+i-n);
927+ r.clamp();
928+ r.drShiftTo(1,r);
929+}
930+
931+// Barrett modular reduction
932+function Barrett(m) {
933+ // setup Barrett
934+ this.r2 = nbi();
935+ this.q3 = nbi();
936+ BigInteger.ONE.dlShiftTo(2*m.t,this.r2);
937+ this.mu = this.r2.divide(m);
938+ this.m = m;
939+}
940+
941+function barrettConvert(x) {
942+ if(x.s < 0 || x.t > 2*this.m.t) return x.mod(this.m);
943+ else if(x.compareTo(this.m) < 0) return x;
944+ else { var r = nbi(); x.copyTo(r); this.reduce(r); return r; }
945+}
946+
947+function barrettRevert(x) { return x; }
948+
949+// x = x mod m (HAC 14.42)
950+function barrettReduce(x) {
951+ x.drShiftTo(this.m.t-1,this.r2);
952+ if(x.t > this.m.t+1) { x.t = this.m.t+1; x.clamp(); }
953+ this.mu.multiplyUpperTo(this.r2,this.m.t+1,this.q3);
954+ this.m.multiplyLowerTo(this.q3,this.m.t+1,this.r2);
955+ while(x.compareTo(this.r2) < 0) x.dAddOffset(1,this.m.t+1);
956+ x.subTo(this.r2,x);
957+ while(x.compareTo(this.m) >= 0) x.subTo(this.m,x);
958+}
959+
960+// r = x^2 mod m; x != r
961+function barrettSqrTo(x,r) { x.squareTo(r); this.reduce(r); }
962+
963+// r = x*y mod m; x,y != r
964+function barrettMulTo(x,y,r) { x.multiplyTo(y,r); this.reduce(r); }
965+
966+Barrett.prototype.convert = barrettConvert;
967+Barrett.prototype.revert = barrettRevert;
968+Barrett.prototype.reduce = barrettReduce;
969+Barrett.prototype.mulTo = barrettMulTo;
970+Barrett.prototype.sqrTo = barrettSqrTo;
971+
972+// (public) this^e % m (HAC 14.85)
973+function bnModPow(e,m) {
974+ var i = e.bitLength(), k, r = nbv(1), z;
975+ if(i <= 0) return r;
976+ else if(i < 18) k = 1;
977+ else if(i < 48) k = 3;
978+ else if(i < 144) k = 4;
979+ else if(i < 768) k = 5;
980+ else k = 6;
981+ if(i < 8)
982+ z = new Classic(m);
983+ else if(m.isEven())
984+ z = new Barrett(m);
985+ else
986+ z = new Montgomery(m);
987+
988+ // precomputation
989+ var g = new Array(), n = 3, k1 = k-1, km = (1<<k)-1;
990+ g[1] = z.convert(this);
991+ if(k > 1) {
992+ var g2 = nbi();
993+ z.sqrTo(g[1],g2);
994+ while(n <= km) {
995+ g[n] = nbi();
996+ z.mulTo(g2,g[n-2],g[n]);
997+ n += 2;
998+ }
999+ }
1000+
1001+ var j = e.t-1, w, is1 = true, r2 = nbi(), t;
1002+ i = nbits(e[j])-1;
1003+ while(j >= 0) {
1004+ if(i >= k1) w = (e[j]>>(i-k1))&km;
1005+ else {
1006+ w = (e[j]&((1<<(i+1))-1))<<(k1-i);
1007+ if(j > 0) w |= e[j-1]>>(this.DB+i-k1);
1008+ }
1009+
1010+ n = k;
1011+ while((w&1) == 0) { w >>= 1; --n; }
1012+ if((i -= n) < 0) { i += this.DB; --j; }
1013+ if(is1) { // ret == 1, don't bother squaring or multiplying it
1014+ g[w].copyTo(r);
1015+ is1 = false;
1016+ }
1017+ else {
1018+ while(n > 1) { z.sqrTo(r,r2); z.sqrTo(r2,r); n -= 2; }
1019+ if(n > 0) z.sqrTo(r,r2); else { t = r; r = r2; r2 = t; }
1020+ z.mulTo(r2,g[w],r);
1021+ }
1022+
1023+ while(j >= 0 && (e[j]&(1<<i)) == 0) {
1024+ z.sqrTo(r,r2); t = r; r = r2; r2 = t;
1025+ if(--i < 0) { i = this.DB-1; --j; }
1026+ }
1027+ }
1028+ return z.revert(r);
1029+}
1030+
1031+// (public) gcd(this,a) (HAC 14.54)
1032+function bnGCD(a) {
1033+ var x = (this.s<0)?this.negate():this.clone();
1034+ var y = (a.s<0)?a.negate():a.clone();
1035+ if(x.compareTo(y) < 0) { var t = x; x = y; y = t; }
1036+ var i = x.getLowestSetBit(), g = y.getLowestSetBit();
1037+ if(g < 0) return x;
1038+ if(i < g) g = i;
1039+ if(g > 0) {
1040+ x.rShiftTo(g,x);
1041+ y.rShiftTo(g,y);
1042+ }
1043+ while(x.signum() > 0) {
1044+ if((i = x.getLowestSetBit()) > 0) x.rShiftTo(i,x);
1045+ if((i = y.getLowestSetBit()) > 0) y.rShiftTo(i,y);
1046+ if(x.compareTo(y) >= 0) {
1047+ x.subTo(y,x);
1048+ x.rShiftTo(1,x);
1049+ }
1050+ else {
1051+ y.subTo(x,y);
1052+ y.rShiftTo(1,y);
1053+ }
1054+ }
1055+ if(g > 0) y.lShiftTo(g,y);
1056+ return y;
1057+}
1058+
1059+// (protected) this % n, n < 2^26
1060+function bnpModInt(n) {
1061+ if(n <= 0) return 0;
1062+ var d = this.DV%n, r = (this.s<0)?n-1:0;
1063+ if(this.t > 0)
1064+ if(d == 0) r = this[0]%n;
1065+ else for(var i = this.t-1; i >= 0; --i) r = (d*r+this[i])%n;
1066+ return r;
1067+}
1068+
1069+// (public) 1/this % m (HAC 14.61)
1070+function bnModInverse(m) {
1071+ var ac = m.isEven();
1072+ if((this.isEven() && ac) || m.signum() == 0) return BigInteger.ZERO;
1073+ var u = m.clone(), v = this.clone();
1074+ var a = nbv(1), b = nbv(0), c = nbv(0), d = nbv(1);
1075+ while(u.signum() != 0) {
1076+ while(u.isEven()) {
1077+ u.rShiftTo(1,u);
1078+ if(ac) {
1079+ if(!a.isEven() || !b.isEven()) { a.addTo(this,a); b.subTo(m,b); }
1080+ a.rShiftTo(1,a);
1081+ }
1082+ else if(!b.isEven()) b.subTo(m,b);
1083+ b.rShiftTo(1,b);
1084+ }
1085+ while(v.isEven()) {
1086+ v.rShiftTo(1,v);
1087+ if(ac) {
1088+ if(!c.isEven() || !d.isEven()) { c.addTo(this,c); d.subTo(m,d); }
1089+ c.rShiftTo(1,c);
1090+ }
1091+ else if(!d.isEven()) d.subTo(m,d);
1092+ d.rShiftTo(1,d);
1093+ }
1094+ if(u.compareTo(v) >= 0) {
1095+ u.subTo(v,u);
1096+ if(ac) a.subTo(c,a);
1097+ b.subTo(d,b);
1098+ }
1099+ else {
1100+ v.subTo(u,v);
1101+ if(ac) c.subTo(a,c);
1102+ d.subTo(b,d);
1103+ }
1104+ }
1105+ if(v.compareTo(BigInteger.ONE) != 0) return BigInteger.ZERO;
1106+ if(d.compareTo(m) >= 0) return d.subtract(m);
1107+ if(d.signum() < 0) d.addTo(m,d); else return d;
1108+ if(d.signum() < 0) return d.add(m); else return d;
1109+}
1110+
1111+var lowprimes = [2,3,5,7,11,13,17,19,23,29,31,37,41,43,47,53,59,61,67,71,73,79,83,89,97,101,103,107,109,113,127,131,137,139,149,151,157,163,167,173,179,181,191,193,197,199,211,223,227,229,233,239,241,251,257,263,269,271,277,281,283,293,307,311,313,317,331,337,347,349,353,359,367,373,379,383,389,397,401,409,419,421,431,433,439,443,449,457,461,463,467,479,487,491,499,503,509,521,523,541,547,557,563,569,571,577,587,593,599,601,607,613,617,619,631,641,643,647,653,659,661,673,677,683,691,701,709,719,727,733,739,743,751,757,761,769,773,787,797,809,811,821,823,827,829,839,853,857,859,863,877,881,883,887,907,911,919,929,937,941,947,953,967,971,977,983,991,997];
1112+var lplim = (1<<26)/lowprimes[lowprimes.length-1];
1113+
1114+// (public) test primality with certainty >= 1-.5^t
1115+function bnIsProbablePrime(t) {
1116+ var i, x = this.abs();
1117+ if(x.t == 1 && x[0] <= lowprimes[lowprimes.length-1]) {
1118+ for(i = 0; i < lowprimes.length; ++i)
1119+ if(x[0] == lowprimes[i]) return true;
1120+ return false;
1121+ }
1122+ if(x.isEven()) return false;
1123+ i = 1;
1124+ while(i < lowprimes.length) {
1125+ var m = lowprimes[i], j = i+1;
1126+ while(j < lowprimes.length && m < lplim) m *= lowprimes[j++];
1127+ m = x.modInt(m);
1128+ while(i < j) if(m%lowprimes[i++] == 0) return false;
1129+ }
1130+ return x.millerRabin(t);
1131+}
1132+
1133+// (protected) true if probably prime (HAC 4.24, Miller-Rabin)
1134+function bnpMillerRabin(t) {
1135+ var n1 = this.subtract(BigInteger.ONE);
1136+ var k = n1.getLowestSetBit();
1137+ if(k <= 0) return false;
1138+ var r = n1.shiftRight(k);
1139+ t = (t+1)>>1;
1140+ if(t > lowprimes.length) t = lowprimes.length;
1141+ var a = nbi();
1142+ for(var i = 0; i < t; ++i) {
1143+ //Pick bases at random, instead of starting at 2
1144+ a.fromInt(lowprimes[Math.floor(Math.random()*lowprimes.length)]);
1145+ var y = a.modPow(r,this);
1146+ if(y.compareTo(BigInteger.ONE) != 0 && y.compareTo(n1) != 0) {
1147+ var j = 1;
1148+ while(j++ < k && y.compareTo(n1) != 0) {
1149+ y = y.modPowInt(2,this);
1150+ if(y.compareTo(BigInteger.ONE) == 0) return false;
1151+ }
1152+ if(y.compareTo(n1) != 0) return false;
1153+ }
1154+ }
1155+ return true;
1156+}
1157+
1158+// protected
1159+BigInteger.prototype.chunkSize = bnpChunkSize;
1160+BigInteger.prototype.toRadix = bnpToRadix;
1161+BigInteger.prototype.fromRadix = bnpFromRadix;
1162+BigInteger.prototype.fromNumber = bnpFromNumber;
1163+BigInteger.prototype.bitwiseTo = bnpBitwiseTo;
1164+BigInteger.prototype.changeBit = bnpChangeBit;
1165+BigInteger.prototype.addTo = bnpAddTo;
1166+BigInteger.prototype.dMultiply = bnpDMultiply;
1167+BigInteger.prototype.dAddOffset = bnpDAddOffset;
1168+BigInteger.prototype.multiplyLowerTo = bnpMultiplyLowerTo;
1169+BigInteger.prototype.multiplyUpperTo = bnpMultiplyUpperTo;
1170+BigInteger.prototype.modInt = bnpModInt;
1171+BigInteger.prototype.millerRabin = bnpMillerRabin;
1172+
1173+// public
1174+BigInteger.prototype.clone = bnClone;
1175+BigInteger.prototype.intValue = bnIntValue;
1176+BigInteger.prototype.byteValue = bnByteValue;
1177+BigInteger.prototype.shortValue = bnShortValue;
1178+BigInteger.prototype.signum = bnSigNum;
1179+BigInteger.prototype.toByteArray = bnToByteArray;
1180+BigInteger.prototype.equals = bnEquals;
1181+BigInteger.prototype.min = bnMin;
1182+BigInteger.prototype.max = bnMax;
1183+BigInteger.prototype.and = bnAnd;
1184+BigInteger.prototype.or = bnOr;
1185+BigInteger.prototype.xor = bnXor;
1186+BigInteger.prototype.andNot = bnAndNot;
1187+BigInteger.prototype.not = bnNot;
1188+BigInteger.prototype.shiftLeft = bnShiftLeft;
1189+BigInteger.prototype.shiftRight = bnShiftRight;
1190+BigInteger.prototype.getLowestSetBit = bnGetLowestSetBit;
1191+BigInteger.prototype.bitCount = bnBitCount;
1192+BigInteger.prototype.testBit = bnTestBit;
1193+BigInteger.prototype.setBit = bnSetBit;
1194+BigInteger.prototype.clearBit = bnClearBit;
1195+BigInteger.prototype.flipBit = bnFlipBit;
1196+BigInteger.prototype.add = bnAdd;
1197+BigInteger.prototype.subtract = bnSubtract;
1198+BigInteger.prototype.multiply = bnMultiply;
1199+BigInteger.prototype.divide = bnDivide;
1200+BigInteger.prototype.remainder = bnRemainder;
1201+BigInteger.prototype.divideAndRemainder = bnDivideAndRemainder;
1202+BigInteger.prototype.modPow = bnModPow;
1203+BigInteger.prototype.modInverse = bnModInverse;
1204+BigInteger.prototype.pow = bnPow;
1205+BigInteger.prototype.gcd = bnGCD;
1206+BigInteger.prototype.isProbablePrime = bnIsProbablePrime;
1207+
1208+// JSBN-specific extension
1209+BigInteger.prototype.square = bnSquare;
1210+
1211+// BigInteger interfaces not implemented in jsbn:
1212+
1213+// BigInteger(int signum, byte[] magnitude)
1214+// double doubleValue()
1215+// float floatValue()
1216+// int hashCode()
1217+// long longValue()
1218+//
1219+BigInteger.prototype.lesser = function(rhs) {
1220+ return this.compareTo(rhs) < 0
1221+}
1222+BigInteger.prototype.lesserOrEquals = function(rhs) {
1223+ return this.compareTo(rhs) <= 0
1224+}
1225+BigInteger.prototype.greater = function(rhs) {
1226+ return this.compareTo(rhs) > 0
1227+}
1228+BigInteger.prototype.greaterOrEquals = function(rhs) {
1229+ return this.compareTo(rhs) >= 0
1230+}
1231+
1232+return function(val) {
1233+ return new BigInteger(val);
1234+}
1235+})();
src/IRTS/CodegenJavaScript.hs+343−85
@@ -12,6 +12,7 @@ import Paths_idris
1212import Util.System
1313
1414import Control.Arrow
15+import Control.Applicative ((<$>), (<*>), pure)
1516import Data.Char
1617import Data.List
1718import Data.Maybe
@@ -37,8 +38,10 @@ data JSType = JSIntTy
3738data JSNum = JSInt Int
3839 | JSFloat Double
3940 | JSInteger Integer
41+ deriving Eq
4042
4143data JS = JSRaw String
44+ | JSIdent String
4245 | JSFunction [String] JS
4346 | JSType JSType
4447 | JSSeq [JS]
@@ -52,6 +55,7 @@ data JS = JSRaw String
5255 | JSNull
5356 | JSThis
5457 | JSTrue
58+ | JSFalse
5559 | JSArray [JS]
5660 | JSObject [(String, JS)]
5761 | JSString String
@@ -61,11 +65,15 @@ data JS = JSRaw String
6165 | JSIndex JS JS
6266 | JSCond [(JS, JS)]
6367 | JSTernary JS JS JS
68+ deriving Eq
6469
6570compileJS :: JS -> String
6671compileJS (JSRaw code) =
6772 code
6873
74+compileJS (JSIdent ident) =
75+ ident
76+
6977compileJS (JSFunction args body) =
7078 "function("
7179 ++ intercalate "," args
@@ -108,6 +116,8 @@ compileJS (JSOp op lhs rhs) =
108116compileJS (JSProj obj field)
109117 | JSFunction {} <- obj =
110118 concat ["(", compileJS obj, ").", field]
119+ | JSAssign {} <- obj =
120+ concat ["(", compileJS obj, ").", field]
111121 | otherwise =
112122 compileJS obj ++ '.' : field
113123
@@ -123,6 +133,9 @@ compileJS JSThis =
123133compileJS JSTrue =
124134 "true"
125135
136+compileJS JSFalse =
137+ "false"
138+
126139compileJS (JSArray elems) =
127140 "[" ++ intercalate "," (map compileJS elems) ++ "]"
128141
@@ -163,12 +176,14 @@ compileJS (JSTernary cond true false) =
163176 f = compileJS false in
164177 "(" ++ c ++ ")?(" ++ t ++ "):(" ++ f ++ ")"
165178
166−jsTailcall :: String -> [JS] -> JS
167−jsTailcall fun args =
168− jsCall (idrRTNamespace ++ "tailcall") [JSRaw fun, JSArray args]
179+jsTailcall :: JS -> JS
180+jsTailcall call =
181+ jsCall (idrRTNamespace ++ "tailcall") [
182+ JSFunction [] (JSReturn call)
183+ ]
169184
170185jsCall :: String -> [JS] -> JS
171−jsCall fun = JSApp (JSRaw fun)
186+jsCall fun = JSApp (JSIdent fun)
172187
173188jsMeth :: JS -> String -> [JS] -> JS
174189jsMeth obj meth =
@@ -184,10 +199,10 @@ jsAnd :: JS -> JS -> JS
184199jsAnd = JSOp "&&"
185200
186201jsType :: JS
187−jsType = JSRaw $ idrRTNamespace ++ "Type"
202+jsType = JSIdent $ idrRTNamespace ++ "Type"
188203
189204jsCon :: JS
190−jsCon = JSRaw $ idrRTNamespace ++ "Con"
205+jsCon = JSIdent $ idrRTNamespace ++ "Con"
191206
192207jsTag :: JS -> JS
193208jsTag obj = JSProj obj "tag"
@@ -196,8 +211,9 @@ jsTypeTag :: JS -> JS
196211jsTypeTag obj = JSProj obj "type"
197212
198213jsBigInt :: JS -> JS
199−jsBigInt val =
200− JSApp (JSRaw $ idrRTNamespace ++ "bigInt") [val]
214+jsBigInt (JSString "0") = JSIdent "__IDRRT__ZERO"
215+jsBigInt (JSString "1") = JSIdent "__IDRRT__ONE"
216+jsBigInt val = JSApp (JSIdent $ idrRTNamespace ++ "bigInt") [val]
201217
202218jsVar :: Int -> String
203219jsVar = ("__var_" ++) . show
@@ -210,42 +226,259 @@ jsLet name value body =
210226 )
211227 ) [value]
212228
213−jsSubst :: String -> [JS] -> JS -> [JS]
214−jsSubst _ [] _ = []
215−jsSubst var (x@(JSVar old) : xs) new
216− | var == translateVariableName old = new : xs
217− | otherwise = x : jsSubst var xs new
218−jsSubst _ xs _ = xs
229+jsSubst :: String -> JS -> JS -> JS
230+jsSubst var new (JSVar old)
231+ | var == translateVariableName old = new
219232
220−optimizeJS :: JS -> JS
221−optimizeJS (JSApp
222− (JSFunction [arg] (JSReturn ret))
223− [val]
224− )
225− | JSNew con [tag, JSArray vals] <- ret =
226− JSNew con [tag, JSArray $ jsSubst arg vals (optimizeJS val)]
227− | JSApp (JSRaw tc@"__IDRRT__tailcall") [fun, JSArray args] <- ret =
228− JSApp (JSRaw tc) [fun, JSArray $ jsSubst arg args (optimizeJS val)]
233+jsSubst var new (JSIdent old)
234+ | var == old = new
235+
236+jsSubst var new (JSArray fields) =
237+ JSArray (map (jsSubst var new) fields)
238+
239+jsSubst var new (JSNew con [tag, vals]) =
240+ JSNew con [tag, jsSubst var new vals]
241+
242+jsSubst var new (JSNew con [JSFunction [] (JSReturn (JSApp fun vars))]) =
243+ JSNew con [JSFunction [] (
244+ JSReturn $ JSApp fun (map (jsSubst var new) vars)
245+ )]
246+
247+jsSubst var new (JSApp (JSIdent "__IDRRT__tailcall") [JSFunction [] (
248+ JSReturn (JSApp fun args)
249+ )]) =
250+ JSApp (JSIdent "__IDRRT__tailcall") [JSFunction [] (
251+ JSReturn $ JSApp fun (map (jsSubst var new) args)
252+ )]
253+
254+jsSubst var new (JSApp (JSFunction [arg] body) vals)
255+ | var /= arg =
256+ JSApp (JSFunction [arg] (
257+ jsSubst var new body
258+ )) $ map (jsSubst var new) vals
259+
260+jsSubst var new (JSReturn ret) =
261+ JSReturn $ jsSubst var new ret
262+
263+jsSubst _ _ js = js
264+
265+inlineJS :: JS -> JS
266+inlineJS (JSApp (JSFunction [] (JSSeq ret)) []) =
267+ JSApp (JSFunction [] (JSSeq (map inlineJS ret))) []
268+
269+inlineJS (JSApp (JSFunction [arg] (JSReturn ret)) [val])
270+ | JSNew con [tag, vals] <- ret
271+ , opt <- inlineJS val =
272+ JSNew con [tag, jsSubst arg opt vals]
273+
274+ | JSNew con [JSFunction [] (JSReturn (JSApp fun vars))] <- ret
275+ , opt <- inlineJS val =
276+ JSNew con [JSFunction [] (
277+ JSReturn $ JSApp fun (map (jsSubst arg opt) vars)
278+ )]
279+
280+ | JSApp (JSIdent "__IDRRT__tailcall") [JSFunction [] (
281+ JSReturn (JSApp fun args)
282+ )] <- ret
283+ , opt <- inlineJS val =
284+ JSApp (JSIdent "__IDRRT__tailcall") [JSFunction [] (
285+ JSReturn $ JSApp fun (map (jsSubst arg opt) args)
286+ )]
287+
288+ | JSIndex (JSProj obj field) idx <- ret
289+ , opt <- inlineJS val =
290+ JSIndex (JSProj (
291+ jsSubst arg opt obj
292+ ) field
293+ ) (jsSubst arg opt idx)
294+
295+ | JSOp op lhs rhs <- ret =
296+ JSOp op (jsSubst arg (inlineJS val) lhs) $
297+ (jsSubst arg (inlineJS val) rhs)
298+
299+inlineJS (JSApp fun args) =
300+ JSApp (inlineJS fun) (map inlineJS args)
301+
302+inlineJS (JSNew con args) =
303+ JSNew con $ map inlineJS args
304+
305+inlineJS (JSArray fields) =
306+ JSArray (map inlineJS fields)
307+
308+inlineJS (JSAssign lhs rhs) =
309+ JSAssign lhs (inlineJS rhs)
310+
311+inlineJS (JSSeq seq) =
312+ JSSeq (map inlineJS seq)
313+
314+inlineJS (JSFunction args body) =
315+ JSFunction args (inlineJS body)
316+
317+inlineJS (JSProj (JSFunction args body) "apply") =
318+ JSProj (JSFunction args (inlineJS body)) "apply"
319+
320+inlineJS (JSReturn js) =
321+ JSReturn $ inlineJS js
322+
323+inlineJS (JSAlloc name (Just js)) =
324+ JSAlloc name (Just $ inlineJS js)
325+
326+inlineJS (JSCond cases) =
327+ JSCond (map (second inlineJS) cases)
328+
329+inlineJS (JSObject fields) =
330+ JSObject (map (second inlineJS) fields)
331+
332+inlineJS js = js
333+
334+reduceJS :: [JS] -> [JS]
335+reduceJS js = reduceLoop [] ([], js)
336+
337+funName :: JS -> String
338+funName (JSAlloc fun _) = fun
339+
340+removeIDs :: [JS] -> [JS]
341+removeIDs js =
342+ case partition isID js of
343+ ([], rest) -> rest
344+ (ids, rest) -> removeIDs $ map (removeIDCall (map idFor ids)) rest
345+ where isID :: JS -> Bool
346+ isID (JSAlloc _ (Just (JSFunction _ (JSSeq body))))
347+ | JSReturn (JSVar _) <- last body = True
348+
349+ isID _ = False
350+
351+ idFor :: JS -> (String, Int)
352+ idFor (JSAlloc fun (Just (JSFunction _ (JSSeq body))))
353+ | JSReturn (JSVar (Loc pos)) <- last body = (fun, pos)
354+
355+ removeIDCall :: [(String, Int)] -> JS -> JS
356+ removeIDCall ids (JSApp (JSIdent "__IDRRT__tailcall") [JSFunction [] (
357+ JSReturn (JSApp (JSIdent fun) args)
358+ )])
359+ | Just pos <- lookup fun ids
360+ , pos < length args = args !! pos
361+
362+ removeIDCall ids (JSNew _ [JSFunction [] (
363+ JSReturn (JSApp (JSIdent fun) args)
364+ )])
365+ | Just pos <- lookup fun ids
366+ , pos < length args = args !! pos
367+
368+ removeIDCall ids js@(JSApp id@(JSIdent fun) args)
369+ | Just pos <- lookup fun ids
370+ , pos < length args = args !! pos
371+
372+ removeIDCall ids (JSAlloc fun (Just body)) =
373+ JSAlloc fun (Just $ removeIDCall ids body)
229374
230−optimizeJS (JSSeq seq) =
231− JSSeq (map optimizeJS seq)
375+ removeIDCall ids (JSReturn js) =
376+ JSReturn $ removeIDCall ids js
232377
233−optimizeJS (JSFunction args body) =
234− JSFunction args (optimizeJS body)
378+ removeIDCall ids (JSSeq js) =
379+ JSSeq $ map (removeIDCall ids) js
235380
236−optimizeJS (JSApp fun args) =
237− JSApp (optimizeJS fun) (map optimizeJS args)
381+ removeIDCall ids (JSNew con args) =
382+ JSNew con $ map (removeIDCall ids) args
238383
239−optimizeJS (JSReturn js) =
240− JSReturn $ optimizeJS js
384+ removeIDCall ids (JSFunction args body) =
385+ JSFunction args $ removeIDCall ids body
241386
242−optimizeJS (JSAlloc name (Just js)) =
243− JSAlloc name (Just $ optimizeJS js)
387+ removeIDCall ids (JSApp fun args) =
388+ JSApp (removeIDCall ids fun) $ map (removeIDCall ids) args
244389
245−optimizeJS js = js
390+ removeIDCall ids (JSProj obj field) =
391+ JSProj (removeIDCall ids obj) field
246392
247−optJS :: Int -> JS -> JS
248−optJS c = foldr (.) id $ take c $ repeat optimizeJS
393+ removeIDCall ids (JSCond conds) =
394+ JSCond $ map (removeIDCall ids *** removeIDCall ids) conds
395+
396+ removeIDCall ids (JSAssign lhs rhs) =
397+ JSAssign (removeIDCall ids lhs) (removeIDCall ids rhs)
398+
399+ removeIDCall ids (JSArray fields) =
400+ JSArray $ map (removeIDCall ids) fields
401+
402+ removeIDCall _ js = js
403+
404+
405+reduceLoop :: [String] -> ([JS], [JS]) -> [JS]
406+reduceLoop reduced (cons, program) =
407+ case partition findConstructors program of
408+ ([], js) -> cons ++ js
409+ (candidates, rest) ->
410+ let names = reduced ++ map funName candidates in
411+ reduceLoop names (
412+ cons ++ map reduce candidates, map (reduceCall names) rest
413+ )
414+ where findConstructors :: JS -> Bool
415+ findConstructors js
416+ | (JSAlloc fun (Just (JSFunction _ (JSSeq body)))) <- js =
417+ reducable $ last body
418+ | otherwise = False
419+ where reducable :: JS -> Bool
420+ reducable (JSReturn js) = reducable js
421+ reducable (JSNew _ args) = and $ map reducable args
422+ reducable (JSArray fields) = and $ map reducable fields
423+ reducable (JSNum _) = True
424+ reducable JSNull = True
425+ reducable (JSIdent _) = True
426+ reducable _ = False
427+
428+ reduce :: JS -> JS
429+ reduce (JSAlloc fun (Just (JSFunction _ (JSSeq body))))
430+ | JSReturn js <- last body = (JSAlloc fun (Just js))
431+
432+ reduce js = js
433+
434+ reduceCall :: [String] -> JS -> JS
435+ reduceCall funs (JSApp (JSIdent "__IDRRT__tailcall") [JSFunction [] (
436+ JSReturn (JSApp id@(JSIdent ret) _)
437+ )])
438+ | ret `elem` funs = id
439+
440+ reduceCall funs js@(JSApp id@(JSIdent fun) _)
441+ | fun `elem` funs = id
442+
443+ reduceCall funs (JSAlloc fun (Just body)) =
444+ JSAlloc fun (Just $ reduceCall funs body)
445+
446+ reduceCall funs (JSReturn js) =
447+ JSReturn $ reduceCall funs js
448+
449+ reduceCall funs (JSSeq js) =
450+ JSSeq $ map (reduceCall funs) js
451+
452+ reduceCall funs (JSNew con args) =
453+ JSNew con $ map (reduceCall funs) args
454+
455+ reduceCall funs (JSFunction args body) =
456+ JSFunction args $ reduceCall funs body
457+
458+ reduceCall funs (JSApp fun args) =
459+ JSApp (reduceCall funs fun) $ map (reduceCall funs) args
460+
461+ reduceCall funs (JSProj obj field) =
462+ JSProj (reduceCall funs obj) field
463+
464+ reduceCall funs (JSCond conds) =
465+ JSCond $ map (reduceCall funs *** reduceCall funs) conds
466+
467+ reduceCall funs (JSAssign lhs rhs) =
468+ JSAssign (reduceCall funs lhs) (reduceCall funs rhs)
469+
470+ reduceCall funs (JSArray fields) =
471+ JSArray $ map (reduceCall funs) fields
472+
473+ reduceCall _ js = js
474+
475+optimizeJS :: JS -> JS
476+optimizeJS = inlineLoop
477+ where inlineLoop :: JS -> JS
478+ inlineLoop js
479+ | opt <- inlineJS js
480+ , opt /= js = inlineLoop opt
481+ | otherwise = js
249482
250483codegenJavaScript
251484 :: JSTarget
@@ -259,13 +492,16 @@ codegenJavaScript target definitions filename outputType = do
259492 ("#!/usr/bin/env node\n", "-node")
260493 JavaScript ->
261494 ("", "-browser")
262− path <- getDataDir
263− idrRuntime <- readFile $ path ++ "/js/Runtime-common.js"
264− tgtRuntime <- readFile $ concat [path, "/js/Runtime", runtime, ".js"]
265− writeFile filename $ intercalate "\n" $ [ header
266− , idrRuntime
267− , tgtRuntime
268− ] ++ functions ++ [mainLoop]
495+ path <- (++) <$> getDataDir <*> (pure "/jsrts/")
496+ idrRuntime <- readFile $ path ++ "Runtime-common.js"
497+ tgtRuntime <- readFile $ concat [path, "Runtime", runtime, ".js"]
498+ jsbn <- readFile $ path ++ "jsbn/jsbn.js"
499+ writeFile filename $ header ++ (
500+ intercalate "\n" $ [ jsbn
501+ , idrRuntime
502+ , tgtRuntime
503+ ] ++ functions ++ [mainLoop, invokeLoop]
504+ )
269505
270506 setPermissions filename (emptyPermissions { readable = True
271507 , executable = target == Node
@@ -276,18 +512,29 @@ codegenJavaScript target definitions filename outputType = do
276512 def = map (first translateNamespace) definitions
277513
278514 functions :: [String]
279− functions = map (compileJS . optJS 1 . translateDeclaration) def
515+ functions =
516+ map compileJS ((reduceJS . removeIDs) $ map (optimizeJS . translateDeclaration) def)
280517
281518 mainLoop :: String
282519 mainLoop = compileJS $
283− JSSeq [ JSAlloc "main" $ Just $ JSFunction [] (
284− jsTailcall mainFun []
285− )
286− , jsCall "main" []
287− ]
520+ JSAlloc "main" $ Just $ JSFunction [] (
521+ case target of
522+ Node -> mainFun
523+ JavaScript -> jsMeth (JSIdent "window") "addEventListener" [
524+ JSString "DOMContentLoaded", JSFunction [] (
525+ mainFun
526+ ), JSFalse
527+ ]
528+ )
529+ where
530+ mainFun :: JS
531+ mainFun = jsTailcall $ jsCall runMain []
288532
289− mainFun :: String
290− mainFun = idrNamespace ++ translateName (MN 0 "runMain")
533+ runMain :: String
534+ runMain = idrNamespace ++ translateName (MN 0 "runMain")
535+
536+ invokeLoop :: String
537+ invokeLoop = compileJS $ jsCall "main" []
291538
292539translateIdentifier :: String -> String
293540translateIdentifier =
@@ -386,7 +633,7 @@ translateConstant (AType ATFloat) = JSType JSFloatTy
386633translateConstant (AType (ATInt ITChar)) = JSType JSCharTy
387634translateConstant PtrType = JSType JSPtrTy
388635translateConstant Forgot = JSType JSForgotTy
389−translateConstant (BI i) = jsBigInt $ JSNum (JSInteger i)
636+translateConstant (BI i) = jsBigInt $ JSString (show i)
390637translateConstant c =
391638 JSError $ "Unimplemented Constant: " ++ show c
392639
@@ -399,13 +646,13 @@ translateDeclaration (path, SFun name params stackSize body)
399646 lookup = "[" ++ lvar ++ ".tag](fn0,arg0," ++ lvar ++ ")" in
400647 JSSeq [ lookupTable [(var, "chk")] var cases
401648 , jsDecl $ JSFunction ["fn0", "arg0"] (
402− JSSeq [ JSAlloc "__var_0" (Just $ JSRaw "fn0")
649+ JSSeq [ JSAlloc "__var_0" (Just $ JSIdent "fn0")
403650 , JSReturn $ jsLet (translateVariableName var) (
404651 translateExpression val
405652 ) (JSTernary (
406653 (JSVar var `jsInstanceOf` jsCon) `jsAnd`
407654 (hasProp lookupTableName (translateVariableName var))
408− ) (JSRaw $
655+ ) (JSIdent $
409656 lookupTableName ++ lookup
410657 ) JSNull
411658 )
@@ -418,9 +665,9 @@ translateDeclaration (path, SFun name params stackSize body)
418665 JSSeq [ lookupTable [] var cases
419666 , jsDecl $ JSFunction ["arg0"] (JSReturn $
420667 JSTernary (
421− (JSRaw "arg0" `jsInstanceOf` jsCon) `jsAnd`
668+ (JSIdent "arg0" `jsInstanceOf` jsCon) `jsAnd`
422669 (hasProp lookupTableName "arg0")
423− ) (JSRaw $ lookupTableName ++ "[arg0.tag](arg0)") (JSRaw "arg0")
670+ ) (JSRaw $ lookupTableName ++ "[arg0.tag](arg0)") (JSIdent "arg0")
424671 )
425672 ]
426673 | otherwise =
@@ -430,14 +677,14 @@ translateDeclaration (path, SFun name params stackSize body)
430677 where
431678 hasProp :: String -> String -> JS
432679 hasProp table var =
433− jsMeth (JSRaw table) "hasOwnProperty" [JSRaw $ var ++ ".tag"]
680+ JSIndex (JSIdent table) (JSProj (JSIdent var) "tag")
434681
435682 caseFun :: [(LVar, String)] -> LVar -> SAlt -> JS
436683 caseFun aux var cse =
437684 jsFunAux aux (translateCase (Just (translateVariableName var)) cse)
438685
439− getTag :: SAlt -> Maybe String
440− getTag (SConCase _ tag _ _ _) = Just $ show tag
686+ getTag :: SAlt -> Maybe Int
687+ getTag (SConCase _ tag _ _ _) = Just tag
441688 getTag _ = Nothing
442689
443690 lookupTableName :: String
@@ -446,10 +693,22 @@ translateDeclaration (path, SFun name params stackSize body)
446693 lookupTable :: [(LVar, String)] -> LVar -> [SAlt] -> JS
447694 lookupTable aux var cases =
448695 JSAlloc lookupTableName $ Just (
449− JSObject $ catMaybes $ map (lookupEntry aux var) cases
696+ JSApp (JSFunction [] (
697+ JSSeq $ [
698+ JSAlloc "t" $ Just (JSArray [])
699+ ] ++ assignEntries (catMaybes $ map (lookupEntry aux var) cases) ++ [
700+ JSReturn (JSIdent "t")
701+ ]
702+ )) []
450703 )
451704 where
452− lookupEntry :: [(LVar, String)] -> LVar -> SAlt -> Maybe (String, JS)
705+ assignEntries :: [(Int, JS)] -> [JS]
706+ assignEntries entries =
707+ map (\(tag, fun) ->
708+ JSAssign (JSIndex (JSIdent "t") (JSNum $ JSInt tag)) fun
709+ ) entries
710+
711+ lookupEntry :: [(LVar, String)] -> LVar -> SAlt -> Maybe (Int, JS)
453712 lookupEntry aux var alt = do
454713 tag <- getTag alt
455714 return (tag, caseFun aux var alt)
@@ -476,11 +735,11 @@ translateDeclaration (path, SFun name params stackSize body)
476735 allocVar n = JSAlloc (jsVar n) Nothing
477736
478737 assignVar :: Int -> String -> JS
479− assignVar n s = JSAlloc (jsVar n) (Just $ JSRaw s)
738+ assignVar n s = JSAlloc (jsVar n) (Just $ JSIdent s)
480739
481740 assignAux :: (LVar, String) -> JS
482741 assignAux (var, val) =
483− JSAssign (JSRaw $ translateVariableName var) (JSRaw val)
742+ JSAssign (JSIdent $ translateVariableName var) (JSIdent val)
484743
485744 p :: [String]
486745 p = map translateName params
@@ -503,26 +762,25 @@ translateExpression (SV var) =
503762
504763translateExpression (SApp tc name vars)
505764 | False <- tc =
506− jsTailcall (translateFunctionCall name) (map JSVar vars)
765+ jsTailcall $ translateFunctionCall name vars
507766 | True <- tc =
508− JSNew (idrRTNamespace ++ "Tailcall")
509− [ JSRaw $ translateFunctionCall name
510− , JSArray $ map JSVar vars
511− ]
767+ JSNew (idrRTNamespace ++ "Cont") [JSFunction [] (
768+ JSReturn $ translateFunctionCall name vars
769+ )]
512770 where
513− translateFunctionCall name =
514− translateNamespace name ++ translateName name
771+ translateFunctionCall name vars =
772+ jsCall (translateNamespace name ++ translateName name) (map JSVar vars)
515773
516774translateExpression (SOp op vars)
517775 | LNoOp <- op = JSVar (last vars)
518776
519− | (LZExt _ ITBig) <- op = jsBigInt $ JSVar (last vars)
777+ | (LZExt _ ITBig) <- op = jsBigInt $ jsCall "String" [JSVar (last vars)]
520778 | (LPlus (ATInt ITBig)) <- op
521779 , (lhs:rhs:_) <- vars = invokeMeth lhs "add" [rhs]
522780 | (LMinus (ATInt ITBig)) <- op
523− , (lhs:rhs:_) <- vars = invokeMeth lhs "minus" [rhs]
781+ , (lhs:rhs:_) <- vars = invokeMeth lhs "subtract" [rhs]
524782 | (LTimes (ATInt ITBig)) <- op
525− , (lhs:rhs:_) <- vars = invokeMeth lhs "times" [rhs]
783+ , (lhs:rhs:_) <- vars = invokeMeth lhs "multiply" [rhs]
526784 | (LSDiv (ATInt ITBig)) <- op
527785 , (lhs:rhs:_) <- vars = invokeMeth lhs "divide" [rhs]
528786 | (LSRem (ATInt ITBig)) <- op
@@ -604,9 +862,9 @@ translateExpression (SOp op vars)
604862 | (LIntStr ITNative) <- op
605863 , (arg:_) <- vars = jsCall "String" [JSVar arg]
606864 | (LSExt ITNative ITBig) <- op
607− , (arg:_) <- vars = jsBigInt $ JSVar arg
865+ , (arg:_) <- vars = jsBigInt $ jsCall "String" [JSVar arg]
608866 | (LTrunc ITBig ITNative) <- op
609− , (arg:_) <- vars = jsMeth (JSVar arg) "valueOf" []
867+ , (arg:_) <- vars = jsMeth (JSVar arg) "intValue" []
610868 | (LIntStr ITBig) <- op
611869 , (arg:_) <- vars = jsMeth (JSVar arg) "toString" []
612870 | (LStrInt ITBig) <- op
@@ -650,7 +908,7 @@ translateExpression (SOp op vars)
650908 | LStrCons <- op
651909 , (lhs:rhs:_) <- vars = translateBinaryOp "+" lhs rhs
652910 | LStrHead <- op
653− , (arg:_) <- vars = JSIndex (JSVar arg) (JSRaw "0")
911+ , (arg:_) <- vars = JSIndex (JSVar arg) (JSNum (JSInt 0))
654912 | LStrRev <- op
655913 , (arg:_) <- vars = JSProj (JSVar arg) "split('').reverse().join('')"
656914 | LStrIndex <- op
@@ -697,17 +955,17 @@ translateExpression patterncase
697955 expandCase _ (CaseCond DefaultCase, branch) = (JSTrue , branch)
698956 expandCase var (CaseCond caseTy, branch)
699957 | ConCase tag <- caseTy =
700− let checkCon = JSRaw var `jsInstanceOf` jsCon
701− checkTag = (JSRaw $ show tag) `jsEq` jsTag (JSRaw var) in
958+ let checkCon = JSIdent var `jsInstanceOf` jsCon
959+ checkTag = (JSNum $ JSInt tag) `jsEq` jsTag (JSIdent var) in
702960 (checkCon `jsAnd` checkTag, branch)
703961
704962 | TypeCase ty <- caseTy =
705− let checkTy = JSRaw var `jsInstanceOf` jsType
706− checkTag = jsTypeTag (JSRaw var) `jsEq` JSType ty in
963+ let checkTy = JSIdent var `jsInstanceOf` jsType
964+ checkTag = jsTypeTag (JSIdent var) `jsEq` JSType ty in
707965 (checkTy `jsAnd` checkTag, branch)
708966
709967translateExpression (SCon i name vars) =
710− JSNew (idrRTNamespace ++ "Con") [ JSRaw $ show i
968+ JSNew (idrRTNamespace ++ "Con") [ JSNum $ JSInt i
711969 , JSArray $ map JSVar vars
712970 ]
713971
@@ -715,7 +973,7 @@ translateExpression (SUpdate var e) =
715973 JSAssign (JSVar var) (translateExpression e)
716974
717975translateExpression (SProj var i) =
718− JSIndex (JSProj (JSVar var) "vars") (JSRaw $ show i)
976+ JSIndex (JSProj (JSVar var) "vars") (JSNum $ JSInt i)
719977
720978translateExpression SNothing = JSNull
721979
@@ -778,11 +1036,11 @@ translateCaseCond var cse@(SConstCase ty _)
7781036 matchHelper ty = (CaseCond $ TypeCase ty, translateCase Nothing cse)
7791037
7801038translateCaseCond var cse@(SConstCase cst@(BI _) _) =
781− let cond = jsMeth (JSRaw var) "equals" [translateConstant cst] in
1039+ let cond = jsMeth (JSIdent var) "equals" [translateConstant cst] in
7821040 (RawCond cond, translateCase Nothing cse)
7831041
7841042translateCaseCond var cse@(SConstCase cst _) =
785− let cond = JSRaw var `jsEq` translateConstant cst in
1043+ let cond = JSIdent var `jsEq` translateConstant cst in
7861044 (RawCond cond, translateCase Nothing cse)
7871045
7881046translateCaseCond var cse@(SConCase _ tag _ _ _) =
@@ -794,5 +1052,5 @@ translateCase _ (SConstCase _ e) = translateExpression e
7941052translateCase (Just var) (SConCase a _ _ vars e) =
7951053 let params = map jsVar [a .. (a + length vars)] in
7961054 jsMeth (JSFunction params (JSReturn $ translateExpression e)) "apply" [
797− JSThis, JSProj (JSRaw var) "vars"
1055+ JSThis, JSProj (JSIdent var) "vars"
7981056 ]