on master help sign in
javascript: adjust functionnames
commit4830e9183ef07500eb0c4edc42ec74b079b284fa authorraichoo <raichoo@googlemail.com> dateTue 24 Jun 2014, 10:23 (12 years ago) parent90a0928
4 files changed+13−13
jsrts/Runtime-browser.js+2−2 jsrts/Runtime-common.js+2−2 jsrts/Runtime-node.js+2−2 src/IRTS/CodegenJavaScript.hs+7−7
jsrts/Runtime-browser.js+2−2
@@ -1,9 +1,9 @@
1−var __IDRRT__print = function(s) {
1+var i$putStr = function(s) {
22 console.log(s);
33};
44
55
6−var __IDRRT__systemInfo = function(index) {
6+var i$systemInfo = function(index) {
77 switch(index) {
88 case 0:
99 return "javascript";
jsrts/Runtime-common.js+2−2
@@ -49,14 +49,14 @@ var i$CALL = function(fun,args) {
4949 i$callstack.push(fun);
5050}
5151
52−var __IDRRT__charCode = function(str) {
52+var i$charCode = function(str) {
5353 if (typeof str == "string")
5454 return str.charCodeAt(0);
5555 else
5656 return str;
5757}
5858
59−var __IDRRT__fromCharCode = function(chr) {
59+var i$fromCharCode = function(chr) {
6060 if (typeof chr == "string")
6161 return chr;
6262 else
jsrts/Runtime-node.js+2−2
@@ -1,11 +1,11 @@
1−var putStr = (function() {
1+var i$putStr = (function() {
22 var util = require('util');
33 return function(s) {
44 util.print(s);
55 };
66})();
77
8−var __IDRRT__systemInfo = function(index) {
8+var i$systemInfo = function(index) {
99 var os = require('os')
1010 switch(index) {
1111 case 0:
src/IRTS/CodegenJavaScript.hs+7−7
@@ -583,7 +583,7 @@ jsFOREIGN _ reg n args
583583 JSAssign (
584584 translateReg reg
585585 ) (
586− JSApp (JSIdent n) [translateReg arg]
586+ JSApp (JSIdent "i$putStr") [translateReg arg]
587587 )
588588
589589 | n == "isNull"
@@ -791,11 +791,11 @@ jsOP _ reg op args = JSAssign (translateReg reg) jsOP'
791791
792792 | (LPlus (ATInt ITChar)) <- op
793793 , (lhs:rhs:_) <- args =
794− jsCall "__IDRRT__fromCharCode" [
794+ jsCall "i$fromCharCode" [
795795 JSBinOp "+" (
796− jsCall "__IDRRT__charCode" [translateReg lhs]
796+ jsCall "i$charCode" [translateReg lhs]
797797 ) (
798− jsCall "__IDRRT__charCode" [translateReg rhs]
798+ jsCall "i$charCode" [translateReg rhs]
799799 )
800800 ]
801801
@@ -1280,9 +1280,9 @@ jsOP _ reg op args = JSAssign (translateReg reg) jsOP'
12801280 | (LFloatInt ITNative) <- op
12811281 , (arg:_) <- args = translateReg arg
12821282 | (LChInt ITNative) <- op
1283− , (arg:_) <- args = jsCall "__IDRRT__charCode" [translateReg arg]
1283+ , (arg:_) <- args = jsCall "i$charCode" [translateReg arg]
12841284 | (LIntCh ITNative) <- op
1285− , (arg:_) <- args = jsCall "__IDRRT__fromCharCode" [translateReg arg]
1285+ , (arg:_) <- args = jsCall "i$fromCharCode" [translateReg arg]
12861286
12871287 | LFExp <- op
12881288 , (arg:_) <- args = jsCall "Math.exp" [translateReg arg]
@@ -1324,7 +1324,7 @@ jsOP _ reg op args = JSAssign (translateReg reg) jsOP'
13241324 ]
13251325
13261326 | LSystemInfo <- op
1327− , (arg:_) <- args = jsCall "__IDRRT__systemInfo" [translateReg arg]
1327+ , (arg:_) <- args = jsCall "i$systemInfo" [translateReg arg]
13281328 | LNullPtr <- op
13291329 , (_) <- args = JSNull
13301330 | otherwise = JSError $ "Not implemented: " ++ show op