From cd416bc9a9f51b482f234f7392d97a72c738f663 Mon Sep 17 00:00:00 2001 From: jmoenig Date: Tue, 8 Jul 2014 17:04:15 +0200 Subject: revert changes made for JSLint’s sake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit after the issue was fixed in JSLint --- history.txt | 1 + threads.js | 16 +++++----------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/history.txt b/history.txt index 06a29ab..818112d 100755 --- a/history.txt +++ b/history.txt @@ -2184,3 +2184,4 @@ ______ * GUI: show username in ‘logout’ entry of cloud menu * GUI, Objects: fixed scrolling glitch in the palette, thanks, Kunal! * GUI, Objects: add keyboard shortcut for “new project”: ctr-n +* revert changes made for JSLint’s sake after the issue was fixed in JSLint diff --git a/threads.js b/threads.js index 1ad18b9..104e129 100644 --- a/threads.js +++ b/threads.js @@ -998,8 +998,6 @@ Process.prototype.evaluateCustomBlock = function () { runnable, extra, i, - inp, - decs, value, upvars, outer; @@ -1033,19 +1031,17 @@ Process.prototype.evaluateCustomBlock = function () { if (!isNil(parms[i])) { value = parms[i]; } - inp = context.inputs[i]; - outer.variables.addVar(inp, value); + outer.variables.addVar(context.inputs[i], value); // if the parameter is an upvar, // create an UpvarReference to it - decs = declarations[inp]; - if (decs[0] === '%upvar') { + if (declarations[context.inputs[i]][0] === '%upvar') { if (!upvars) { // lazy initialization upvars = new UpvarReference(this.context.upvars); } upvars.addReference( value, - inp, + context.inputs[i], outer.variables ); } @@ -1063,7 +1059,6 @@ Process.prototype.evaluateCustomBlock = function () { } }; - // Process variables primitives Process.prototype.doDeclareVariables = function (varNames) { @@ -3162,9 +3157,8 @@ UpvarReference.prototype.find = function (name) { }; UpvarReference.prototype.getVar = function (name) { - var tuple = this.vars[name], - varName = tuple[0], - varFrame = tuple[1], + var varName = this.vars[name][0], + varFrame = this.vars[name][1], value = varFrame.vars[varName]; return (value === 0 ? 0 : value || 0); // don't return null }; -- cgit v1.3.1