enabled variables access for experimental JS-compiler

history.txt

@@ -4054,4 +4054,5 @@ in development:
 
 180320
 ------
-* Threads: refactored experimental JS-Compiler
+* Threads: refactored experimental JS-compiler
+* Threads: enabled variables access for experimental JS-compiler

threads.js

@@ -4230,8 +4230,7 @@ JSCompiler.prototype.toString = function () {
 };
 
 JSCompiler.prototype.compileFunction = function (aContext) {
-    var func,
+    var block = aContext.expression,
-		block = aContext.expression,
   		parameters = aContext.inputs,
         parms = [],
         hasEmptySlots = false,
@@ -4239,36 +4238,28 @@ JSCompiler.prototype.compileFunction = function (aContext) {
 
 	this.source = aContext;
 
-     // scan for unbound variables and empty input slots
+	// scan for empty input slots
-     block.allChildren().forEach(function (morph) {
+ 	hasEmptySlots = !isNil(detect(
-        if (morph.selector === 'reportGetVar' &&
+  		block.allChildren(),
-            !contains(parameters, morph.blockSpec)
+    	function (morph) {return morph.isEmptySlot && morph.isEmptySlot(); }
-        ) {
+    ));
-            throw new Error(
-                'compiling does not yet support\n' +
-                'variables that are not\nformal parameters'
-            );
-        } else if (morph.isEmptySlot && morph.isEmptySlot()) {
-            hasEmptySlots = true;
-        }
-    });
 
     // translate formal parameters into gensyms
     this.gensyms = {};
     if (parameters.length) {
         // test for conflicts
         if (hasEmptySlots) {
-            throw new Error(
+        	throw new Error(
                 'compiling does not yet support\n' +
                 'mixing explicit formal parameters\n' +
                 'with empty input slots'
             );
-         }
+        }
         // map explicit formal parameters
         parameters.forEach(function (pName, idx) {
-            var pn = 'p' + idx;
+        	var pn = 'p' + idx;
-             parms.push(pn);
+            parms.push(pn);
-            myself.gensyms[pName] = pn;
+        	myself.gensyms[pName] = pn;
         });
     } else if (hasEmptySlots) {
         // allow for a single implicit formal parameter
@@ -4276,12 +4267,10 @@ JSCompiler.prototype.compileFunction = function (aContext) {
     }
  
     // compile using gensyms
-    func = Function.apply(
+    return Function.apply(
         null,
         parms.concat(['return ' + this.compileExpression(block)])
     );
-    this.gensyms = {};
-    return func;
 };
 
 JSCompiler.prototype.compileExpression = function (block) {
@@ -4366,11 +4355,16 @@ JSCompiler.prototype.compileInput = function (inp) {
         }
     } else if (inp instanceof BlockMorph) {
         if (inp.selector === 'reportGetVar') {
-            // un-quoted gensym:
+        	if (contains(this.source.inputs, inp.blockSpec)) {
-            return this.gensyms[inp.blockSpec];
+            	// un-quoted gensym:
-        } else {
+            	return this.gensyms[inp.blockSpec];
-            return this.compileExpression(inp);
+        	}
+         	// redirect var query to process
+            return 'arguments[arguments.length - 1].getVarNamed("' +
+            	inp.blockSpec +
+            	'")';
         }
+        return this.compileExpression(inp);
     } else {
         throw new Error(
             'compiling does not yet support\n' +