Merge pull request #12 from bfanger/master

tests/cases/classes.coffee now "passes" using coffeescript 1.3.3

Author: alxlit

src/CoffeeScript/Nodes.php

@@ -62,7 +62,7 @@ static function utility_extends()
     . 'function ctor() { '
     .   'this.constructor = child; '
     . '} '
-    . 'ctor.prototype = parent.prototype; child.prototype = new ctor; child.__super__ = parent.prototype; '
+    . 'ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; '
     . 'return child; '
     . '}';
   }

src/CoffeeScript/yy/Class.php

@@ -121,11 +121,6 @@ function compile_node($options)
       array_unshift($this->body->expressions, $this->ctor);
     }
 
-    if ($decl)
-    {
-      array_unshift($this->body->expressions, yy('Assign', yy('Value', yy('Literal', $name), array(yy('Access', yy('Literal', 'name')))), yy('Literal', "'{$name}'")));
-    }
-
     $this->body->expressions[] = $lname;
     $this->body->expressions = array_merge($this->directives, $this->body->expressions);
 

tests/cases/assignment.coffee

@@ -350,3 +350,18 @@ test "#1838: Regression with variable assignment", ->
   'dave'
 
   eq name, 'dave'
+
+test '#2211: splats in destructured parameters', ->
+  doesNotThrow -> CoffeeScript.compile '([a...]) ->'
+  doesNotThrow -> CoffeeScript.compile '([a...],b) ->'
+  doesNotThrow -> CoffeeScript.compile '([a...],[b...]) ->'
+  throws -> CoffeeScript.compile '([a...,[a...]]) ->'
+  doesNotThrow -> CoffeeScript.compile '([a...,[b...]]) ->'
+
+test '#2213: invocations within destructured parameters', ->
+  throws -> CoffeeScript.compile '([a()])->'
+  throws -> CoffeeScript.compile '([a:b()])->'
+  throws -> CoffeeScript.compile '([a:b.c()])->'
+  throws -> CoffeeScript.compile '({a()})->'
+  throws -> CoffeeScript.compile '({a:b()})->'
+  throws -> CoffeeScript.compile '({a:b.c()})->'

tests/cases/classes.coffee

@@ -595,17 +595,6 @@ test "#1813: Passing class definitions as expressions", ->
 
   eq result, B
 
-test "#494: Named classes", ->
-
-  class A
-  eq A.name, 'A'
-
-  class A.B
-  eq A.B.name, 'B'
-
-  class A.B["C"]
-  ok A.B.C.name isnt 'C'
-
 test "#1966: external constructors should produce their return value", ->
   ctor = -> {}
   class A then constructor: ctor
@@ -679,3 +668,11 @@ test "#1534: class then 'use strict'", ->
     #{error}"""
   ]
   throws (-> CoffeeScript.run directive, bare: yes) for directive in directives
+
+test "#2052: classes should work in strict mode", ->
+  try
+    do ->
+      'use strict'
+      class A
+  catch e
+    ok no

tests/cases/comprehensions.coffee

@@ -244,21 +244,13 @@ test "Optimized range comprehensions.", ->
 
   exxes = ('x' for [0...10])
   ok exxes.join(' ') is 'x x x x x x x x x x'
-
-
-test "Comprehensions safely redeclare parameters if they're not present in closest scope.", ->
-
-  rule = (x) -> x
-
-  learn = ->
-    rule for rule in [1, 2, 3]
-
-  ok learn().join(' ') is '1 2 3'
-
-  ok rule(101) is 101
-
-  f = -> [-> ok no, 'should cache source']
-  ok yes for k of [f] = f()
+  
+  
+test "Loop variables should be able to reference outer variables", ->
+  outer = 1
+  do ->
+    null for outer in [1, 2, 3]
+  eq outer, 3
 
 
 test "Lenient on pure statements not trying to reach out of the closure", ->
@@ -499,3 +491,14 @@ test "#2007: Return object literal from comprehension", ->
   eq 2, y.length
   eq 1, y[0].x
   eq 0, y[1].x
+  
+test "#2274: Allow @values as loop variables", ->
+  obj = {
+    item: null
+    method: ->
+      for @item in [1, 2, 3]
+        null
+  }
+  eq obj.item, null
+  obj.method()
+  eq obj.item, 3

tests/cases/functions.coffee

@@ -95,6 +95,13 @@ test "splats", ->
   arrayEq [0, 1], (((splat..., _, _1) -> splat) 0, 1, 2, 3)
   arrayEq [2], (((_, _1, splat..., _2) -> splat) 0, 1, 2, 3)
 
+test "destructured splatted parameters", ->
+  arr = [0,1,2]
+  splatArray = ([a...]) -> a
+  splatArrayRest = ([a...],b...) -> arrayEq(a,b); b
+  arrayEq splatArray(arr), arr
+  arrayEq splatArrayRest(arr,0,1,2), arr
+
 test "@-parameters: automatically assign an argument's value to a property of the context", ->
   nonce = {}
 
@@ -186,3 +193,16 @@ test "#1844: bound functions in nested comprehensions causing empty var statemen
 test "#1859: inline function bodies shouldn't modify prior postfix ifs", ->
   list = [1, 2, 3]
   ok true if list.some (x) -> x is 2
+
+test "#2258: allow whitespace-style parameter lists in function definitions", ->
+  func = (
+    a, b, c
+  ) -> c
+  eq func(1, 2, 3), 3
+  
+  func = (
+    a
+    b
+    c
+  ) -> b
+  eq func(1, 2, 3), 2

tests/cases/objects.coffee

@@ -269,3 +269,11 @@ test "#1961, #1974, regression with compound assigning to an implicit object", -
     four: 4
 
   eq obj.four, 4
+
+test "#2207: Immediate implicit closes don't close implicit objects", ->
+  func = ->
+    key: for i in [1, 2, 3] then i
+      
+  eq func().key.join(' '), '1 2 3'
+  
+  

tests/cases/operators.coffee

@@ -274,4 +274,11 @@ test "#2155 ... conditional assignment to a closure", ->
   x = null
   func = -> x ?= (-> if true then 'hi')
   func()
-  eq x(), 'hi'
+  eq x(), 'hi'
+  
+test "#2197: Existential existential double trouble", ->
+  counter = 0
+  func = -> counter++
+  func()? ? 100
+  eq counter, 1
+  

tests/cases/scope.coffee

@@ -41,3 +41,66 @@ test "#1973: redefining Array/Object constructors shouldn't confuse __X helpers"
   obj = {arr}
   for own k of obj
     eq arr, obj[k]
+
+test "#2255: global leak with splatted @-params", ->
+  ok not x?
+  arrayEq [0], ((@x...) -> @x).call {}, 0
+  ok not x?
+
+test "#1183: super + fat arrows", ->
+  dolater = (cb) -> cb()
+
+  class A
+  	constructor: ->
+  		@_i = 0
+  	foo : (cb) ->
+  		dolater => 
+  			@_i += 1 
+  			cb()
+
+  class B extends A
+  	constructor : ->
+  		super
+  	foo : (cb) ->
+  		dolater =>
+  			dolater =>
+  				@_i += 2
+  				super cb
+          
+  b = new B
+  b.foo => eq b._i, 3
+
+test "#1183: super + wrap", ->
+  class A
+    m : -> 10
+    
+  class B extends A
+    constructor : -> super
+    
+  B::m = -> r = try super()
+  
+  eq (new B).m(), 10
+
+test "#1183: super + closures", ->
+  class A
+    constructor: ->
+      @i = 10
+    foo : -> @i
+    
+  class B extends A
+    foo : ->
+      ret = switch 1
+        when 0 then 0
+        when 1 then super()
+      ret
+  eq (new B).foo(), 10
+ 
+test "#2331: bound super regression", ->
+  class A
+    @value = 'A'
+    method: -> @constructor.value
+    
+  class B extends A
+    method: => super
+  
+  eq (new B).method(), 'A'

tests/cases/soaks.coffee

@@ -23,7 +23,7 @@ test "soaked property access caches method calls", ->
   eq nonce    , obj.fn()?.a
   eq undefined, obj.fn()?.b
 
-test "soaked property access chaching", ->
+test "soaked property access caching", ->
   nonce = {}
   counter = 0
   fn = ->