Fixes #1876

jashkenas · Dec 14, 2011 · b0948f8 · b0948f8
1 parent 00f9e24
commit b0948f8
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/lib/coffee-script/nodes.js b/lib/coffee-script/nodes.js
diff --git a/src/nodes.coffee b/src/nodes.coffee
@@ -937,12 +937,20 @@ exports.Class = class Class extends Base
     @walkBody name, o
     @ensureConstructor name
     @body.spaced = yes
-    @body.expressions.unshift new Extends lname, @parent if @parent
+    if @parent
+      @superClass = new Literal o.scope.freeVariable 'super'
+      @body.expressions.unshift new Extends lname, @superClass
     @body.expressions.unshift @ctor unless @ctor instanceof Code
     @body.expressions.push lname
     @addBoundFunctions o
 
-    klass = new Parens Closure.wrap(@body), true
+    call  = Closure.wrap @body
+
+    if @parent
+      call.args.push @parent
+      call.variable.params.push new Param @superClass
+
+    klass = new Parens call, true
     klass = new Assign @variable, klass if @variable
     klass.compile o
 

diff --git a/test/classes.coffee b/test/classes.coffee
@@ -555,4 +555,11 @@ test "#1842: Regression with bound functions within bound class methods", ->
 
   Store.bound()
   Store.unbound()
-  (new Store).instance()
+  (new Store).instance()
+
+test "#1876: Class @A extends A", ->
+  class A
+  class @A extends A
+
+  ok (new @A) instanceof A
+