Kaynağa Gözat

follow up previous commit

Vladislav Folts 11 yıl önce
ebeveyn
işleme
165800c7a5

+ 2 - 1
src/nodejs.js

@@ -60,7 +60,8 @@ function compile(text, handleErrors, handleCompiledModule){
             handleErrors,
             function(name, code){
                 if (rtlCodeWatcher.used()){
-                    code = "var RTL$ = require(\"RTL$.js\").RTL$;\n" + code;
+                    code = "var " + rtl.name() + " = require(\"" + rtl.name() 
+                         + ".js\")." + rtl.name() + ";\n" + code;
                     rtlCodeWatcher.reset();
                 }
                 handleCompiledModule(name, code);

+ 4 - 4
test/expected/nodejs/export/m.js

@@ -4,7 +4,7 @@ var vi = 0;
 
 function p1(){
 }
-exports.ci = ci
-exports.p = function(){return p;}
-exports.vi = function(){return vi;}
-exports.p1 = p1
+exports.ci = ci;
+exports.p = function(){return p;};
+exports.vi = function(){return vi;};
+exports.p1 = p1;

+ 2 - 0
test/expected/nodejs/modules/RTL$.js

@@ -41,3 +41,5 @@ var RTL$ = {
         return result;
     }
 };
+
+exports.RTL$ = RTL$;

+ 11 - 11
test/expected/nodejs/modules/m1.js

@@ -1,4 +1,4 @@
-var RTL$ = require("RTL$.js");
+var RTL$ = require("RTL$.js").RTL$;
 var ci = 123;
 var Base = RTL$.extend({
 	init: function Base(){
@@ -32,13 +32,13 @@ function makeTPA(){
 	return result;
 }
 pr = new anonymous$1();
-exports.ci = ci
-exports.Base = Base
-exports.T = T
-exports.TP = TP
-exports.TPA = TPA
-exports.i = function(){return i;}
-exports.pr = function(){return pr;}
-exports.pr2 = function(){return pr2;}
-exports.p = p
-exports.makeTPA = makeTPA
+exports.ci = ci;
+exports.Base = Base;
+exports.T = T;
+exports.TP = TP;
+exports.TPA = TPA;
+exports.i = function(){return i;};
+exports.pr = function(){return pr;};
+exports.pr2 = function(){return pr2;};
+exports.p = p;
+exports.makeTPA = makeTPA;

+ 2 - 2
test/expected/nodejs/modules/m2.js

@@ -1,5 +1,5 @@
-var RTL$ = require("RTL$.js");
-var m1 = require(m1.js);
+var RTL$ = require("RTL$.js").RTL$;
+var m1 = require("m1.js");
 var r = new m1.T();
 var pb = null;
 var ptr = null;

+ 3 - 3
test/expected/nodejs/modules/m3.js

@@ -1,6 +1,6 @@
-var RTL$ = require("RTL$.js");
-var m1 = require(m2.js);
-var m2 = require(m1.js);
+var RTL$ = require("RTL$.js").RTL$;
+var m1 = require("m2.js");
+var m2 = require("m1.js");
 var r = new m2.T();
 var a = RTL$.makeArray(3, function(){return new m2.Base();});
 var ptr = null;

+ 2 - 0
test/run_nodejs.cmd

@@ -0,0 +1,2 @@
+SET NODE_PATH=.;
+"C:\Program Files\nodejs\node.exe" %*