git.iko.soy/Idris-dev
on master help sign in
javascript: get more out of google closure
fa526e4raichoo
js/Runtime-browser.js+1−1
compare with master
unifiedsplit
@@ -1,3 +1,3 @@
1−__IDRRT__.print = function(s) {
1+var __IDRRT__print = function(s) {
2 console.log(s);
2 console.log(s);
3};
3};
js/Runtime-common.js+16−20
@@ -1,36 +1,34 @@
1−var __IDRRT__ = {};
2−
3/** @constructor */
1/** @constructor */
4−__IDRRT__.Type = function(type) {
2+var __IDRRT__Type = function(type) {
5 this.type = type;
3 this.type = type;
6};
4};
7
5
8−__IDRRT__.Int = new __IDRRT__.Type('Int');
6+var __IDRRT__Int = new __IDRRT__Type('Int');
9−__IDRRT__.Char = new __IDRRT__.Type('Char');
7+var __IDRRT__Char = new __IDRRT__Type('Char');
10−__IDRRT__.String = new __IDRRT__.Type('String');
8+var __IDRRT__String = new __IDRRT__Type('String');
11−__IDRRT__.Integer = new __IDRRT__.Type('Integer');
9+var __IDRRT__Integer = new __IDRRT__Type('Integer');
12−__IDRRT__.Float = new __IDRRT__.Type('Float');
10+var __IDRRT__Float = new __IDRRT__Type('Float');
13−__IDRRT__.Ptr = new __IDRRT__.Type('Pointer');
11+var __IDRRT__Ptr = new __IDRRT__Type('Pointer');
14−__IDRRT__.Forgot = new __IDRRT__.Type('Forgot');
12+var __IDRRT__Forgot = new __IDRRT__Type('Forgot');
15
13
16
14
17/** @constructor */
15/** @constructor */
18−__IDRRT__.Tailcall = function(f) { this.f = f };
16+var __IDRRT__Tailcall = function(f) { this.f = f };
19−__IDRRT__.ffiWrap = function(fid) {
17+var __IDRRT__ffiWrap = function(fid) {
20 return function(arg) {
18 return function(arg) {
21− return __IDRRT__.tailcall(function(){
19+ return __IDRRT__tailcall(function(){
22− return __IDR__.APPLY0(fid, arg);
20+ return __IDR__APPLY0(fid, arg);
23 });
21 });
24 };
22 };
25};
23};
26
24
27/** @constructor */
25/** @constructor */
28−__IDRRT__.Con = function(i,vars) {
26+var __IDRRT__Con = function(i,vars) {
29 this.i = i;
27 this.i = i;
30 this.vars = vars;
28 this.vars = vars;
31};
29};
32
30
33−__IDRRT__.tailcall = function(f) {
31+var __IDRRT__tailcall = function(f) {
34 var __f = f;
32 var __f = f;
35 var ret;
33 var ret;
36 while (__f) {
34 while (__f) {
@@ -38,7 +36,7 @@ __IDRRT__.tailcall = function(f) {
38 __f = null;
36 __f = null;
39 ret = f();
37 ret = f();
40
38
41− if (ret instanceof __IDRRT__.Tailcall) {
39+ if (ret instanceof __IDRRT__Tailcall) {
42 __f = ret.f;
40 __f = ret.f;
43 } else {
41 } else {
44 return ret;
42 return ret;
@@ -50,7 +48,7 @@ __IDRRT__.tailcall = function(f) {
50 BigInteger Javascript code taken from:
48 BigInteger Javascript code taken from:
51 https://github.com/peterolson
49 https://github.com/peterolson
52*/
50*/
53−__IDRRT__.bigInt = (function () {
51+var __IDRRT__bigInt = (function () {
54 var base = 10000000, logBase = 7;
52 var base = 10000000, logBase = 7;
55 var sign = {
53 var sign = {
56 positive: false,
54 positive: false,
@@ -391,5 +389,3 @@ __IDRRT__.bigInt = (function () {
391 fnReturn.minusOne = MINUS_ONE;
389 fnReturn.minusOne = MINUS_ONE;
392 return fnReturn;
390 return fnReturn;
393})();
391})();
394−
395−var __IDR__ = {};
js/Runtime-node.js+1−1
@@ -1,4 +1,4 @@
1−__IDRRT__.print = (function() {
1+var __IDRRT__print = (function() {
2 var util = require('util');
2 var util = require('util');
3 return function(s) {
3 return function(s) {
4 util.print(s);
4 util.print(s);
src/IRTS/CodegenJavaScript.hs+22−32
@@ -41,7 +41,6 @@ codegenJavaScript target definitions filename outputType = do
41 writeFile filename ( header
41 writeFile filename ( header
42 ++ idrRuntime
42 ++ idrRuntime
43 ++ tgtRuntime
43 ++ tgtRuntime
44− ++ modules
45 ++ functions
44 ++ functions
46 ++ mainLoop)
45 ++ mainLoop)
47
46
@@ -56,19 +55,10 @@ codegenJavaScript target definitions filename outputType = do
56
55
57 mainLoop :: String
56 mainLoop :: String
58 mainLoop = intercalate "\n" [ "\nfunction main() {"
57 mainLoop = intercalate "\n" [ "\nfunction main() {"
59− , createTailcall "__IDR__.runMain0()"
58+ , createTailcall "__IDR__runMain0()"
60 , "}\n\nmain();\n"
59 , "}\n\nmain();\n"
61 ]
60 ]
62
61
63− modules =
64− concatMap allocMod mods
65− where
66− allocMod m = intercalate "." m ++ " = {};\n"
67− sortMods a b = compare (length a) (length b)
68−
69− mods =
70− drop 1 $ sortBy sortMods $ nub $ concatMap (inits . fst) def
71−
72translateIdentifier :: String -> String
62translateIdentifier :: String -> String
73translateIdentifier =
63translateIdentifier =
74 replaceReserved . concatMap replaceBadChars
64 replaceReserved . concatMap replaceBadChars
@@ -139,16 +129,16 @@ translateName (MN i name) = translateIdentifier name ++ show i
139
129
140translateConstant :: Const -> String
130translateConstant :: Const -> String
141translateConstant (I i) = show i
131translateConstant (I i) = show i
142−translateConstant (BI i) = "__IDRRT__.bigInt('" ++ show i ++ "')"
132+translateConstant (BI i) = "__IDRRT__bigInt('" ++ show i ++ "')"
143translateConstant (Fl f) = show f
133translateConstant (Fl f) = show f
144translateConstant (Ch c) = show c
134translateConstant (Ch c) = show c
145translateConstant (Str s) = show s
135translateConstant (Str s) = show s
146−translateConstant (AType (ATInt ITNative)) = "__IDRRT__.Int"
136+translateConstant (AType (ATInt ITNative)) = "__IDRRT__Int"
147−translateConstant StrType = "__IDRRT__.String"
137+translateConstant StrType = "__IDRRT__String"
148−translateConstant (AType (ATInt ITBig)) = "__IDRRT__.Integer"
138+translateConstant (AType (ATInt ITBig)) = "__IDRRT__Integer"
149−translateConstant (AType ATFloat) = "__IDRRT__.Float"
139+translateConstant (AType ATFloat) = "__IDRRT__Float"
150−translateConstant PtrType = "__IDRRT__.Ptr"
140+translateConstant PtrType = "__IDRRT__Ptr"
151−translateConstant Forgot = "__IDRRT__.Forgot"
141+translateConstant Forgot = "__IDRRT__Forgot"
152translateConstant c =
142translateConstant c =
153 "(function(){throw 'Unimplemented Const: " ++ show c ++ "';})()"
143 "(function(){throw 'Unimplemented Const: " ++ show c ++ "';})()"
154
144
@@ -159,7 +149,7 @@ translateParameterlist =
159
149
160translateDeclaration :: ([String], SDecl) -> String
150translateDeclaration :: ([String], SDecl) -> String
161translateDeclaration (path, SFun name params stackSize body) =
151translateDeclaration (path, SFun name params stackSize body) =
162− intercalate "." (path ++ [translateName name])
152+ "var " ++ concat (path ++ [translateName name])
163 ++ " = function("
153 ++ " = function("
164 ++ intercalate "," p
154 ++ intercalate "," p
165 ++ "){\n"
155 ++ "){\n"
@@ -205,12 +195,13 @@ translateExpression (SApp False name vars) =
205 createTailcall $ translateFunctionCall name vars
195 createTailcall $ translateFunctionCall name vars
206
196
207translateExpression (SApp True name vars) =
197translateExpression (SApp True name vars) =
208− "new __IDRRT__.Tailcall("
198+ "new __IDRRT__Tailcall("
209 ++ "function(){\n"
199 ++ "function(){\n"
210 ++ "return " ++ translateFunctionCall name vars
200 ++ "return " ++ translateFunctionCall name vars
211 ++ ";\n})"
201 ++ ";\n})"
212
202
213translateExpression (SOp op vars)
203translateExpression (SOp op vars)
204+ | LNoOp <- op = translateVariableName (last vars) ++ "/* NOOP */"
214 | (LPlus _) <- op
205 | (LPlus _) <- op
215 , (lhs:rhs:_) <- vars = translateBinaryOp "+" lhs rhs
206 , (lhs:rhs:_) <- vars = translateBinaryOp "+" lhs rhs
216 | (LMinus _) <- op
207 | (LMinus _) <- op
@@ -298,13 +289,13 @@ translateExpression (SOp op vars)
298 | (LIntStr ITNative) <- op
289 | (LIntStr ITNative) <- op
299 , (arg:_) <- vars = "String(" ++ translateVariableName arg ++ ")"
290 , (arg:_) <- vars = "String(" ++ translateVariableName arg ++ ")"
300 | (LSExt ITNative ITBig) <- op
291 | (LSExt ITNative ITBig) <- op
301− , (arg:_) <- vars = "__IDRRT__.bigInt(" ++ translateVariableName arg ++ ")"
292+ , (arg:_) <- vars = "__IDRRT__bigInt(" ++ translateVariableName arg ++ ")"
302 | (LTrunc ITBig ITNative) <- op
293 | (LTrunc ITBig ITNative) <- op
303 , (arg:_) <- vars = translateVariableName arg ++ ".valueOf()"
294 , (arg:_) <- vars = translateVariableName arg ++ ".valueOf()"
304 | (LIntStr ITBig) <- op
295 | (LIntStr ITBig) <- op
305 , (arg:_) <- vars = translateVariableName arg ++ ".toString()"
296 , (arg:_) <- vars = translateVariableName arg ++ ".toString()"
306 | (LStrInt ITBig) <- op
297 | (LStrInt ITBig) <- op
307− , (arg:_) <- vars = "__IDRRT__.bigInt(" ++ translateVariableName arg ++ ")"
298+ , (arg:_) <- vars = "__IDRRT__bigInt(" ++ translateVariableName arg ++ ")"
308 | LFloatStr <- op
299 | LFloatStr <- op
309 , (arg:_) <- vars = "String(" ++ translateVariableName arg ++ ")"
300 , (arg:_) <- vars = "String(" ++ translateVariableName arg ++ ")"
310 | LStrFloat <- op
301 | LStrFloat <- op
@@ -367,7 +358,7 @@ translateExpression (SError msg) =
367 "(function(){throw \'" ++ msg ++ "\';})()"
358 "(function(){throw \'" ++ msg ++ "\';})()"
368
359
369translateExpression (SForeign _ _ "putStr" [(FString, var)]) =
360translateExpression (SForeign _ _ "putStr" [(FString, var)]) =
370− "__IDRRT__.print(" ++ translateVariableName var ++ ")"
361+ "__IDRRT__print(" ++ translateVariableName var ++ ")"
371
362
372translateExpression (SForeign _ _ fun args)
363translateExpression (SForeign _ _ fun args)
373 | "[]=" `isSuffixOf` fun
364 | "[]=" `isSuffixOf` fun
@@ -423,8 +414,8 @@ translateExpression (SForeign _ _ fun args)
423 '(' : intercalate "," (map generateWrapper as) ++ ")"
414 '(' : intercalate "," (map generateWrapper as) ++ ")"
424
415
425 generateWrapper (ffunc, name)
416 generateWrapper (ffunc, name)
426− | FFunction <- ffunc = "__IDRRT__.ffiWrap(" ++ translateVariableName name ++ ")"
417+ | FFunction <- ffunc = "__IDRRT__ffiWrap(" ++ translateVariableName name ++ ")"
427− | FFunctionIO <- ffunc = "__IDRRT__.ffiWrap(" ++ translateVariableName name ++ ")"
418+ | FFunctionIO <- ffunc = "__IDRRT__ffiWrap(" ++ translateVariableName name ++ ")"
428
419
429 generateWrapper (_, name) =
420 generateWrapper (_, name) =
430 translateVariableName name
421 translateVariableName name
@@ -444,7 +435,7 @@ translateExpression (SCase var cases) =
444 ++ ")"
435 ++ ")"
445
436
446translateExpression (SCon i name vars) =
437translateExpression (SCon i name vars) =
447− concat [ "new __IDRRT__.Con("
438+ concat [ "new __IDRRT__Con("
448 , show i
439 , show i
449 , ",["
440 , ",["
450 , intercalate "," $ map translateVariableName vars
441 , intercalate "," $ map translateVariableName vars
@@ -480,7 +471,7 @@ translateCase var (SConstCase ty e)
480 matchHelper tyName = translateTypeMatch var tyName e
471 matchHelper tyName = translateTypeMatch var tyName e
481
472
482translateCase var (SConstCase cst@(BI _) e) =
473translateCase var (SConstCase cst@(BI _) e) =
483− let cond = "__IDRRT__.bigInt(" ++ var ++ ").equals(" ++ translateConstant cst ++ ")" in
474+ let cond = "__IDRRT__bigInt(" ++ var ++ ").equals(" ++ translateConstant cst ++ ")" in
484 createIfBlock cond (translateExpression e)
475 createIfBlock cond (translateExpression e)
485
476
486translateCase var (SConstCase cst e) =
477translateCase var (SConstCase cst e) =
@@ -488,7 +479,7 @@ translateCase var (SConstCase cst e) =
488 createIfBlock cond (translateExpression e)
479 createIfBlock cond (translateExpression e)
489
480
490translateCase var (SConCase a i name vars e) =
481translateCase var (SConCase a i name vars e) =
491− let isCon = var ++ " instanceof __IDRRT__.Con"
482+ let isCon = var ++ " instanceof __IDRRT__Con"
492 isI = show i ++ " == " ++ var ++ ".i"
483 isI = show i ++ " == " ++ var ++ ".i"
493 params = intercalate "," $ map (("__var_" ++) . show) [a..(a+length vars)]
484 params = intercalate "," $ map (("__var_" ++) . show) [a..(a+length vars)]
494 args = ".apply(this," ++ var ++ ".vars)"
485 args = ".apply(this," ++ var ++ ".vars)"
@@ -503,7 +494,7 @@ translateTypeMatch :: String -> String -> SExp -> String
503translateTypeMatch var ty exp =
494translateTypeMatch var ty exp =
504 let e = translateExpression exp in
495 let e = translateExpression exp in
505 createIfBlock (var
496 createIfBlock (var
506− ++ " instanceof __IDRRT__.Type && "
497+ ++ " instanceof __IDRRT__Type && "
507 ++ var ++ ".type == '"++ ty ++"'") e
498 ++ var ++ ".type == '"++ ty ++"'") e
508
499
509
500
@@ -513,11 +504,10 @@ createIfBlock cond e =
513 ++ ";\n}"
504 ++ ";\n}"
514
505
515createTailcall call =
506createTailcall call =
516− "__IDRRT__.tailcall(function(){return " ++ call ++ "})"
507+ "__IDRRT__tailcall(function(){return " ++ call ++ "})"
517
508
518translateFunctionCall name vars =
509translateFunctionCall name vars =
519− concat (intersperse "." $ translateNamespace name)
510+ concat (translateNamespace name)
520− ++ "."
521 ++ translateName name
511 ++ translateName name
522 ++ "("
512 ++ "("
523 ++ intercalate "," (map translateVariableName vars)
513 ++ intercalate "," (map translateVariableName vars)