simpler implementation of the previous commit

Author: jashkenas

lib/coffee-script/nodes.js

@@ -2566,7 +2566,7 @@
     For.prototype.children = ['body', 'source', 'guard', 'step'];
 
     For.prototype.compileNode = function(o) {
-      var body, defPart, forPart, forVarPart, guardPart, idt1, index, ivar, kvar, kvarAssign, lastJumps, lvar, name, namePart, ref, resultPart, returnResult, rvar, scope, source, stepPart, stepvar, svar, varPart, _base, _ref2;
+      var body, defPart, forPart, forVarPart, guardPart, idt1, index, ivar, kvar, kvarAssign, lastJumps, lvar, name, namePart, ref, resultPart, returnResult, rvar, scope, source, step, stepPart, stepVar, svar, varPart, _ref2, _ref3;
       body = Block.wrap([this.body]);
       lastJumps = (_ref2 = last(body.expressions)) != null ? _ref2.jumps() : void 0;
       if (lastJumps && lastJumps instanceof Return) {
@@ -2589,8 +2589,7 @@
       kvar = (this.range && name) || index || ivar;
       kvarAssign = kvar !== ivar ? "" + kvar + " = " : "";
       if (this.step && !this.range) {
-        this.complexStep = !(typeof (_base = this.step).isSimpleNumber === "function" ? _base.isSimpleNumber() : void 0);
-        stepvar = this.complexStep ? scope.freeVariable("step") : this.step.compile(o, LEVEL_OP);
+        _ref3 = this.step.cache(o, LEVEL_LIST), step = _ref3[0], stepVar = _ref3[1];
       }
       if (this.pattern) {
         name = ivar;
@@ -2617,10 +2616,10 @@
         if (!this.object) {
           lvar = scope.freeVariable('len');
           forVarPart = "" + kvarAssign + ivar + " = 0, " + lvar + " = " + svar + ".length";
-          if (this.complexStep) {
-            forVarPart += ", " + stepvar + " = " + (this.step.compile(o, LEVEL_OP));
+          if (step !== stepVar) {
+            forVarPart += ", " + step;
           }
-          stepPart = "" + kvarAssign + (this.step ? "" + ivar + " += " + stepvar : (kvar !== ivar ? "++" + ivar : "" + ivar + "++"));
+          stepPart = "" + kvarAssign + (this.step ? "" + ivar + " += " + stepVar : (kvar !== ivar ? "++" + ivar : "" + ivar + "++"));
           forPart = "" + forVarPart + "; " + ivar + " < " + lvar + "; " + stepPart;
         }
       }

src/nodes.coffee

@@ -1743,8 +1743,7 @@ exports.For = class For extends While
     kvarAssign = if kvar isnt ivar then "#{kvar} = " else ""
     # the `_by` variable is created twice in `Range`s if we don't prevent it from being declared here
     if @step and not @range
-      @complexStep = not @step.isSimpleNumber?()
-      stepvar = if @complexStep then scope.freeVariable "step" else @step.compile(o, LEVEL_OP)
+      [step, stepVar] = @step.cache o, LEVEL_LIST
     name      = ivar if @pattern
     varPart   = ''
     guardPart = ''
@@ -1762,8 +1761,8 @@ exports.For = class For extends While
       unless @object
         lvar       = scope.freeVariable 'len'
         forVarPart = "#{kvarAssign}#{ivar} = 0, #{lvar} = #{svar}.length"
-        forVarPart += ", #{stepvar} = #{@step.compile o, LEVEL_OP}" if @complexStep
-        stepPart   = "#{kvarAssign}#{if @step then "#{ivar} += #{stepvar}" else (if kvar isnt ivar then "++#{ivar}" else "#{ivar}++")}"
+        forVarPart += ", #{step}" if step isnt stepVar
+        stepPart   = "#{kvarAssign}#{if @step then "#{ivar} += #{stepVar}" else (if kvar isnt ivar then "++#{ivar}" else "#{ivar}++")}"
         forPart    = "#{forVarPart}; #{ivar} < #{lvar}; #{stepPart}"
     if @returns
       resultPart   = "#{@tab}#{rvar} = [];\n"