Got for ... from working with complex expressions

weepy · Jun 15, 2011 · e402200 · e402200
1 parent 6890295
commit e402200
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/lib/plugins/extend_for.js b/lib/plugins/extend_for.js
@@ -107,17 +107,20 @@ module.exports = function(stream) {
         if (var2)
           var2.prev.remove(var2)
         iter = var1.text
-        val = var2 ? var2.text : closure.getUnusedVar()
         closure.vars[iter] = true
-        closure.vars[val] = true
+
+        if (var2) {
+          val = var2.text
+          closure.vars[val] = true
+        }
 
         var string = iter + " in " + expressionText
         bracket.after(string)
       }
 
       var text = ''
-      text += loopWord.text == "from" ? "if (!" + expressionText + ".hasOwnProperty(" + iter + ")) continue;" : ''
-      text += " "/* + this.indent()*/ + val + " = " + (complex ? "_xpr" : expressionText) + "[" + iter + "];"
+      text += loopWord.text == "from" ? "if (!" + (complex ? "_xpr" : expressionText) + ".hasOwnProperty(" + iter + ")) continue;" : ''
+      text += val ? " "/* + this.indent()*/ + val + " = " + (complex ? "_xpr" : expressionText) + "[" + iter + "];" : ''
 
       this.block.after(text)
 

diff --git a/web/try/kaffeine-browser.js b/web/try/kaffeine-browser.js
@@ -1067,17 +1067,20 @@ module.exports = function(stream) {
         if (var2)
           var2.prev.remove(var2)
         iter = var1.text
-        val = var2 ? var2.text : closure.getUnusedVar()
         closure.vars[iter] = true
-        closure.vars[val] = true
+
+        if (var2) {
+          val = var2.text
+          closure.vars[val] = true
+        }
 
         var string = iter + " in " + expressionText
         bracket.after(string)
       }
 
       var text = ''
-      text += loopWord.text == "from" ? "if (!" + expressionText + ".hasOwnProperty(" + iter + ")) continue;" : ''
-      text += " "/* + this.indent()*/ + val + " = " + (complex ? "_xpr" : expressionText) + "[" + iter + "];"
+      text += loopWord.text == "from" ? "if (!" + (complex ? "_xpr" : expressionText) + ".hasOwnProperty(" + iter + ")) continue;" : ''
+      text += val ? " "/* + this.indent()*/ + val + " = " + (complex ? "_xpr" : expressionText) + "[" + iter + "];" : ''
 
       this.block.after(text)