Fix regression with executable class bodies and prototypal attachment.

jashkenas · Apr 6, 2013 · 0cadcdc · 0cadcdc
1 parent 78d10f3
commit 0cadcdc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 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
@@ -146,8 +146,8 @@ exports.Base = class Base
 
   traverseChildren: (crossScope, func) ->
     @eachChild (child) ->
-      return false if func(child) is false
+      recur = func(child)
-      child.traverseChildren crossScope, func
+      child.traverseChildren(crossScope, func) unless recur is no
 
   invert: ->
     new Op '!', this

diff --git a/test/classes.coffee b/test/classes.coffee
@@ -337,6 +337,18 @@ test "#2502: parenthesizing inner object values", ->
   eq (new A).sections.default, 0
 
 
+test "conditional prototype property assignment", ->
+  debug = false
+
+  class Person
+    if debug
+      age: -> 10
+    else
+      age: -> 20
+
+  eq (new Person).age(), 20
+
+
 test "mild metaprogramming", ->
 
   class Base