Merge branch 'stable' of github.com:jashkenas/coffee-script into stable

lib/lexer.js

@@ -459,7 +459,7 @@
     Lexer.prototype.balancedString = function(str, end) {
       var i, letter, prev, stack, _ref;
       stack = [end];
-      for (i = 1, _ref = str.length; (1 <= _ref ? i < _ref : i > _ref); (1 <= _ref ? i += 1 : i -= 1)) {
+      for (i = 1, _ref = str.length; 1 <= _ref ? i < _ref : i > _ref; 1 <= _ref ? i++ : i--) {
         switch (letter = str.charAt(i)) {
           case '\\':
             i++;

lib/nodes.js

@@ -782,7 +782,7 @@
       }
     };
     Range.prototype.compileNode = function(o) {
-      var compare, idx, incr, intro, step, stepPart, vars;
+      var compare, cond, idx, incr, step, vars;
       this.compileVariables(o);
       if (!o.index) {
         return this.compileArray(o);
@@ -793,10 +793,9 @@
       idx = del(o, 'index');
       step = del(o, 'step');
       vars = ("" + idx + " = " + this.from) + (this.to !== this.toVar ? ", " + this.to : '');
-      intro = "(" + this.fromVar + " <= " + this.toVar + " ? " + idx;
-      compare = "" + intro + " <" + this.equals + " " + this.toVar + " : " + idx + " >" + this.equals + " " + this.toVar + ")";
-      stepPart = step ? step.compile(o) : '1';
-      incr = step ? "" + idx + " += " + stepPart : "" + intro + " += " + stepPart + " : " + idx + " -= " + stepPart + ")";
+      cond = "" + this.fromVar + " <= " + this.toVar;
+      compare = "" + cond + " ? " + idx + " <" + this.equals + " " + this.toVar + " : " + idx + " >" + this.equals + " " + this.toVar;
+      incr = step ? "" + idx + " += " + (step.compile(o)) : "" + cond + " ? " + idx + "++ : " + idx + "--";
       return "" + vars + "; " + compare + "; " + incr;
     };
     Range.prototype.compileSimple = function(o) {
@@ -816,7 +815,7 @@
       if (this.fromNum && this.toNum && Math.abs(this.fromNum - this.toNum) <= 20) {
         range = (function() {
           _results = [];
-          for (var _i = _ref = +this.fromNum, _ref2 = +this.toNum; _ref <= _ref2 ? _i <= _ref2 : _i >= _ref2; _ref <= _ref2 ? _i += 1 : _i -= 1){ _results.push(_i); }
+          for (var _i = _ref = +this.fromNum, _ref2 = +this.toNum; _ref <= _ref2 ? _i <= _ref2 : _i >= _ref2; _ref <= _ref2 ? _i++ : _i--){ _results.push(_i); }
           return _results;
         }).apply(this, arguments);
         if (this.exclusive) {
@@ -834,7 +833,7 @@
       } else {
         vars = ("" + i + " = " + this.from) + (this.to !== this.toVar ? ", " + this.to : '');
         clause = "" + this.fromVar + " <= " + this.toVar + " ?";
-        body = "var " + vars + "; " + clause + " " + i + " <" + this.equals + " " + this.toVar + " : " + i + " >" + this.equals + " " + this.toVar + "; " + clause + " " + i + " += 1 : " + i + " -= 1";
+        body = "var " + vars + "; " + clause + " " + i + " <" + this.equals + " " + this.toVar + " : " + i + " >" + this.equals + " " + this.toVar + "; " + clause + " " + i + "++ : " + i + "--";
       }
       post = "{ " + result + ".push(" + i + "); }\n" + idt + "return " + result + ";\n" + o.indent;
       return "(function() {" + pre + "\n" + idt + "for (" + body + ")" + post + "}).apply(this, arguments)";
@@ -1662,13 +1661,15 @@
     Op.prototype.compileExistence = function(o) {
       var fst, ref;
       if (this.first.isComplex()) {
-        ref = o.scope.freeVariable('ref');
-        fst = new Parens(new Assign(new Literal(ref), this.first));
+        ref = new Literal(o.scope.freeVariable('ref'));
+        fst = new Parens(new Assign(ref, this.first));
       } else {
         fst = this.first;
-        ref = fst.compile(o);
+        ref = fst;
       }
-      return new Existence(fst).compile(o) + (" ? " + ref + " : " + (this.second.compile(o, LEVEL_LIST)));
+      return new If(new Existence(fst), ref, {
+        type: 'if'
+      }).addElse(this.second).compile(o);
     };
     Op.prototype.compileUnary = function(o) {
       var op, parts;
@@ -1719,6 +1720,9 @@
         }
         return _results;
       }).call(this);
+      if (tests.length === 0) {
+        return 'false';
+      }
       tests = tests.join(cnj);
       if (o.level < LEVEL_OP) {
         return tests;

src/nodes.coffee

@@ -642,10 +642,9 @@ exports.Range = class Range extends Base
     idx      = del o, 'index'
     step     = del o, 'step'
     vars     = "#{idx} = #{@from}" + if @to isnt @toVar then ", #{@to}" else ''
-    intro    = "(#{@fromVar} <= #{@toVar} ? #{idx}"
-    compare  = "#{intro} <#{@equals} #{@toVar} : #{idx} >#{@equals} #{@toVar})"
-    stepPart = if step then step.compile(o) else '1'
-    incr     = if step then "#{idx} += #{stepPart}" else "#{intro} += #{stepPart} : #{idx} -= #{stepPart})"
+    cond     = "#{@fromVar} <= #{@toVar}"
+    compare  = "#{cond} ? #{idx} <#{@equals} #{@toVar} : #{idx} >#{@equals} #{@toVar}"
+    incr     = if step then "#{idx} += #{step.compile(o)}" else "#{cond} ? #{idx}++ : #{idx}--"
     "#{vars}; #{compare}; #{incr}"
 
   # Compile a simple range comprehension, with integers.
@@ -671,11 +670,11 @@ exports.Range = class Range extends Base
     pre    = "\n#{idt}#{result} = [];"
     if @fromNum and @toNum
       o.index = i
-      body = @compileSimple o
+      body    = @compileSimple o
     else
-      vars = "#{i} = #{@from}" + if @to isnt @toVar then ", #{@to}" else ''
-      clause = "#{@fromVar} <= #{@toVar} ?"
-      body   = "var #{vars}; #{clause} #{i} <#{@equals} #{@toVar} : #{i} >#{@equals} #{@toVar}; #{clause} #{i} += 1 : #{i} -= 1"
+      vars    = "#{i} = #{@from}" + if @to isnt @toVar then ", #{@to}" else ''
+      cond    = "#{@fromVar} <= #{@toVar}"
+      body    = "var #{vars}; #{cond} ? #{i} <#{@equals} #{@toVar} : #{i} >#{@equals} #{@toVar}; #{cond} ? #{i}++ : #{i}--"
     post   = "{ #{result}.push(#{i}); }\n#{idt}return #{result};\n#{o.indent}"
     "(function() {#{pre}\n#{idt}for (#{body})#{post}}).apply(this, arguments)"
 
@@ -1301,12 +1300,12 @@ exports.Op = class Op extends Base
 
   compileExistence: (o) ->
     if @first.isComplex()
-      ref = o.scope.freeVariable 'ref'
-      fst = new Parens new Assign new Literal(ref), @first
+      ref = new Literal o.scope.freeVariable 'ref'
+      fst = new Parens new Assign ref, @first
     else
       fst = @first
-      ref = fst.compile o
-    new Existence(fst).compile(o) + " ? #{ref} : #{ @second.compile o, LEVEL_LIST }"
+      ref = fst
+    new If(new Existence(fst), ref, type: 'if').addElse(@second).compile o
 
   # Compile a unary **Op**.
   compileUnary: (o) ->
@@ -1340,6 +1339,7 @@ exports.In = class In extends Base
     [cmp, cnj] = if @negated then [' !== ', ' && '] else [' === ', ' || ']
     tests = for item, i in @array.base.objects
       (if i then ref else sub) + cmp + item.compile o, LEVEL_OP
+    return 'false' if tests.length is 0
     tests = tests.join cnj
     if o.level < LEVEL_OP then tests else "(#{tests})"
 

test/array_literals.coffee

@@ -58,6 +58,7 @@ test "mixed shorthand objects in array lists", ->
   eq arr[2].b, 1
   eq arr[3], 'b'
 
+
 test "array splats with nested arrays", ->
   nonce = {}
   a = [nonce]

test/assignment.coffee

@@ -229,6 +229,10 @@ test "destructuring assignment against an expression", ->
   eq a, y
   eq b, z
 
+test "bracket insertion when necessary", ->
+  [a] = [0] ? [1]
+  eq a, 0
+
 # for implicit destructuring assignment in comprehensions, see the comprehension tests
 
 test "destructuring assignment with context (@) properties", ->

test/operators.coffee

@@ -184,6 +184,10 @@ test "#768: `in` should preserve evaluation order", ->
   ok a() not in [b(),c()]
   eq 3, share
 
+test "#1099: empty array after `in` should compile to `false`", ->
+  eq 1, [5 in []].length
+  eq false, do -> return 0 in []
+
 
 # Chained Comparison