Changeset 27630

Timestamp:

12/30/08 22:57:49 (4 years ago)

Author:

fujidig

Message:

mainLoop の生成で eval を使わず Function コンストラクタを使うように

Location:

lang/javascript/hsp-on-js/trunk/src

Files:

• evaluator.js (modified) (2 diffs)
• head-for-run-in-shell.js (added)
• run-in-shell (modified) (1 diff)

lang/javascript/hsp-on-js/trunk/src/evaluator.js

@@ -52 +52 @@
 Evaluator.prototype = {
         evaluate: function evaluate() {
-                this.mainLoop = eval('Object(function mainLoop(stack, literals, variables, userDefFuncs) {\n' +
-                                this.createMainLoop(this.literals, this.userDefFuncs) + '\n})');
+                this.mainLoop = this.createMainLoop();
                 try {
                         this.mainLoop(this.stack, this.literals, this.variables, this.userDefFuncs);
@@ -130 +129 @@
         onStop: function onStop() {
         },
-        createMainLoop: function createMainLoop(literals, userDefFuncs) {
+        createMainLoop: function createMainLoop() {
+                var src = '';
+                for(var prop in HSPonJS) {
+                        src += 'var '+prop+' = HSPonJS.'+prop+';\n';
+                }
+                src += 'return function mainLoop(stack, literals, variables, userDefFuncs) {\n';
+                src += this.createMainLoopSrc(this.literals, this.userDefFuncs) + '\n};';
+                return Function(src)();
+        },
+        createMainLoopSrc: function createMainLoopSrc(literals, userDefFuncs) {
                 function push(line) {
                         lines.push(Utils.strTimes('\t', indent) + line);

lang/javascript/hsp-on-js/trunk/src/run-in-shell

@@ -40 +40 @@
 else
   filenames = %w[
+    head-for-run-in-shell.js
     binary-parser.js
     cp932.js