Fixes #2489, fixes #1819, fixes #1821 -- remove the __bind helper.

Author: jashkenas

lib/coffee-script/nodes.js

@@ -868,9 +868,22 @@ exports.Class = class Class extends Base
   # Ensure that all functions bound to the instance are proxied in the
   # constructor.
   addBoundFunctions: (o) ->
-    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)"
+    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.unshift bound
+
+        # {base} = assign.variable
+        # lhs = (new Value (new Literal "this"), [new Access base]).compile o
+        # @ctor.body.unshift new Literal """#{lhs} = function() {
+        # #{o.indent}  return #{@ctor.name}.prototype.#{base.value}.apply(_this, arguments);
+        # #{o.indent}}\n
+        # """
     return
 
   # Merge the properties from a top-level object as prototypal properties
@@ -900,7 +913,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
+              @boundFuncs.push [base, func]
               func.bound = no
       assign
     compact exprs
@@ -1960,11 +1973,6 @@ 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

@@ -728,3 +728,15 @@ test "#2359: extending native objects that use other typed constructors requires
   workingArray = new WorkingArray
   ok workingArray instanceof WorkingArray
   eq 'yes!', workingArray.method()
+
+
+test "#2489: removing __bind", ->
+
+  class Thing
+    foo: (a, b, c) ->
+    bar: (a, b, c) =>
+
+  thing = new Thing
+
+  eq thing.foo.length, 3
+  eq thing.bar.length, 3