Fixes #2781, fixes #2782. Reverting to old method of instance method binding.

Author: jashkenas

lib/coffee-script/nodes.js

@@ -983,14 +983,9 @@ exports.Class = class Class extends Base
   # Ensure that all functions bound to the instance are proxied in the
   # constructor.
   addBoundFunctions: (o) ->
-    if @boundFuncs.length
-      o.scope.assign '_this', 'this'
-      for [name, func] in @boundFuncs
-        lhs = new Value (new Literal "this"), [new Access name]
-        body = new Block [new Return new Literal "#{@ctor.name}.prototype.#{name.value}.apply(_this, arguments)"]
-        rhs = new Code func.params, body, 'boundfunc'
-        bound = new Assign lhs, rhs
-        @ctor.body.push bound
+    for bvar in @boundFuncs
+      lhs = (new Value (new Literal "this"), [new Access bvar]).compile o
+      @ctor.body.unshift new Literal "#{lhs} = #{utility 'bind'}(#{lhs}, this)"
     return
 
   # Merge the properties from a top-level object as prototypal properties
@@ -1020,7 +1015,7 @@ exports.Class = class Class extends Base
           else
             assign.variable = new Value(new Literal(name), [(new Access new Literal 'prototype'), new Access base ])
             if func instanceof Code and func.bound
-              @boundFuncs.push [base, func]
+              @boundFuncs.push base
               func.bound = no
       assign
     compact exprs
@@ -2122,6 +2117,11 @@ UTILITIES =
     function(child, parent) { for (var key in parent) { if (#{utility 'hasProp'}.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }
   """
 
+  # Create a function bound to the current value of "this".
+  bind: -> '''
+    function(fn, me){ return function(){ return fn.apply(me, arguments); }; }
+  '''
+
   # Discover if an item is in an array.
   indexOf: -> """
     [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }

src/nodes.coffee

@@ -730,23 +730,27 @@ test "#2359: extending native objects that use other typed constructors requires
   eq 'yes!', workingArray.method()
 
 
-test "#2489: removing __bind", ->
-
-  class Thing
-    foo: (a, b, c) ->
-    bar: (a, b, c) =>
+test "#2782: non-alphanumeric-named bound functions", ->
+  class A
+    'b:c': =>
+      'd'
 
-  thing = new Thing
+  eq (new A)['b:c'](), 'd'
 
-  eq thing.foo.length, 3
-  eq thing.bar.length, 3
 
+test "#2781: overriding bound functions", ->
+  class A
+    a: ->
+        @b()
+    b: =>
+        1
 
-test "#2773: overriding bound functions", ->
-  class Foo
-    method: => 'Foo'
+  class B extends A
+    b: =>
+        2
 
-  class Bar extends Foo
-    method: => 'Bar'
+  b = (new A).b
+  eq b(), 1
 
-  eq (new Bar).method(), 'Bar'
+  b = (new B).b
+  eq b(), 2