git.iko.soy/Idris-dev
on master help sign in
javascript: adjust functionnames
4830e91raichoo
jsrts/Runtime-browser.js+2−2
compare with master
unifiedsplit
@@ -1,9 +1,9 @@
1−var __IDRRT__print = function(s) {
1+var i$putStr = function(s) {
2 console.log(s);
2 console.log(s);
3};
3};
4
4
5
5
6−var __IDRRT__systemInfo = function(index) {
6+var i$systemInfo = function(index) {
7 switch(index) {
7 switch(index) {
8 case 0:
8 case 0:
9 return "javascript";
9 return "javascript";
jsrts/Runtime-common.js+2−2
@@ -49,14 +49,14 @@ var i$CALL = function(fun,args) {
49 i$callstack.push(fun);
49 i$callstack.push(fun);
50}
50}
51
51
52−var __IDRRT__charCode = function(str) {
52+var i$charCode = function(str) {
53 if (typeof str == "string")
53 if (typeof str == "string")
54 return str.charCodeAt(0);
54 return str.charCodeAt(0);
55 else
55 else
56 return str;
56 return str;
57}
57}
58
58
59−var __IDRRT__fromCharCode = function(chr) {
59+var i$fromCharCode = function(chr) {
60 if (typeof chr == "string")
60 if (typeof chr == "string")
61 return chr;
61 return chr;
62 else
62 else
jsrts/Runtime-node.js+2−2
@@ -1,11 +1,11 @@
1−var putStr = (function() {
1+var i$putStr = (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);
5 };
5 };
6})();
6})();
7
7
8−var __IDRRT__systemInfo = function(index) {
8+var i$systemInfo = function(index) {
9 var os = require('os')
9 var os = require('os')
10 switch(index) {
10 switch(index) {
11 case 0:
11 case 0:
src/IRTS/CodegenJavaScript.hs+7−7
@@ -583,7 +583,7 @@ jsFOREIGN _ reg n args
583 JSAssign (
583 JSAssign (
584 translateReg reg
584 translateReg reg
585 ) (
585 ) (
586− JSApp (JSIdent n) [translateReg arg]
586+ JSApp (JSIdent "i$putStr") [translateReg arg]
587 )
587 )
588
588
589 | n == "isNull"
589 | n == "isNull"
@@ -791,11 +791,11 @@ jsOP _ reg op args = JSAssign (translateReg reg) jsOP'
791
791
792 | (LPlus (ATInt ITChar)) <- op
792 | (LPlus (ATInt ITChar)) <- op
793 , (lhs:rhs:_) <- args =
793 , (lhs:rhs:_) <- args =
794− jsCall "__IDRRT__fromCharCode" [
794+ jsCall "i$fromCharCode" [
795 JSBinOp "+" (
795 JSBinOp "+" (
796− jsCall "__IDRRT__charCode" [translateReg lhs]
796+ jsCall "i$charCode" [translateReg lhs]
797 ) (
797 ) (
798− jsCall "__IDRRT__charCode" [translateReg rhs]
798+ jsCall "i$charCode" [translateReg rhs]
799 )
799 )
800 ]
800 ]
801
801
@@ -1280,9 +1280,9 @@ jsOP _ reg op args = JSAssign (translateReg reg) jsOP'
1280 | (LFloatInt ITNative) <- op
1280 | (LFloatInt ITNative) <- op
1281 , (arg:_) <- args = translateReg arg
1281 , (arg:_) <- args = translateReg arg
1282 | (LChInt ITNative) <- op
1282 | (LChInt ITNative) <- op
1283− , (arg:_) <- args = jsCall "__IDRRT__charCode" [translateReg arg]
1283+ , (arg:_) <- args = jsCall "i$charCode" [translateReg arg]
1284 | (LIntCh ITNative) <- op
1284 | (LIntCh ITNative) <- op
1285− , (arg:_) <- args = jsCall "__IDRRT__fromCharCode" [translateReg arg]
1285+ , (arg:_) <- args = jsCall "i$fromCharCode" [translateReg arg]
1286
1286
1287 | LFExp <- op
1287 | LFExp <- op
1288 , (arg:_) <- args = jsCall "Math.exp" [translateReg arg]
1288 , (arg:_) <- args = jsCall "Math.exp" [translateReg arg]
@@ -1324,7 +1324,7 @@ jsOP _ reg op args = JSAssign (translateReg reg) jsOP'
1324 ]
1324 ]
1325
1325
1326 | LSystemInfo <- op
1326 | LSystemInfo <- op
1327− , (arg:_) <- args = jsCall "__IDRRT__systemInfo" [translateReg arg]
1327+ , (arg:_) <- args = jsCall "i$systemInfo" [translateReg arg]
1328 | LNullPtr <- op
1328 | LNullPtr <- op
1329 , (_) <- args = JSNull
1329 , (_) <- args = JSNull
1330 | otherwise = JSError $ "Not implemented: " ++ show op
1330 | otherwise = JSError $ "Not implemented: " ++ show op