fixed bound constructor with backcall

satyr · Nov 21, 2012 · 6117604 · 6117604
1 parent 0804bc3
commit 6117604
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/lib/ast.js b/lib/ast.js
@@ -2199,7 +2199,7 @@ exports.Fun = Fun = (function(superclass){
     if (this.bound === 'this$') {
       if (this.ctor) {
         scope.assign('this$', 'this instanceof ctor$ ? this : new ctor$');
-        body.add(Return(Literal('this$')));
+        body.lines.push(Return(Literal('this$')));
       } else if (that = (ref$ = sscope.fun) != null ? ref$.bound : void 8) {
         this.bound = that;
       } else {

diff --git a/src/ast.co b/src/ast.co
@@ -1344,7 +1344,7 @@ class exports.Fun extends Node
     if @bound is \this$
       if @ctor
         scope.assign \this$ 'this instanceof ctor$ ? this : new ctor$'
-        body.add Return Literal \this$
+        body.lines.push Return Literal \this$
       else if sscope.fun?bound
       then @bound = that
       else sscope.assign \this$ \this

diff --git a/test/oo.co b/test/oo.co
@@ -147,7 +147,11 @@ class BoundCtor extends (-> {@attr})
     eq super(...).attr, @attr
     @method = ~> this
 
-class BoundChild extends BoundCtor then ~> super ...
+class BoundChild extends BoundCtor
+  ~>
+    super ...
+    # Auto-`return this` even with backcall.
+    <- Object
 
 for C of [BoundCtor, BoundChild]
   bc = C 'attr'