Methods defined inside block should donate to modules (if inside module)

opal · Oct 11, 2013 · 18e1002 · 18e1002
1 parent 7712501
commit 18e1002
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/corelib/runtime.js b/corelib/runtime.js
@@ -566,6 +566,21 @@
     }
   };
 
+  Opal.defn = function(obj, jsid, body) {
+    if (obj.__mod__) {
+      obj._proto[jsid] = body;
+      Opal.donate(obj, [jsid]);
+    }
+    else if (obj._isClass) {
+      obj._proto[jsid] = body;
+    }
+    else {
+      obj[jsid] = body;
+    }
+
+    return nil;
+  };
+
   // Initialization
   // --------------
 

diff --git a/lib/opal/parser.rb b/lib/opal/parser.rb
@@ -1180,7 +1180,9 @@ def js_def(recvr, mid, args, stmts, line, end_line, sexp, level)
         end
 
         [f("#{uses_super}#{@scope.proto}#{jsid} = ", sexp), result]
-      else # :top, :iter
+      elsif @scope.iter?
+        [f("$opal.defn(self, '$#{mid}', "), result, f(")")]
+      else # :top
         [f("def#{jsid} = ", sexp), result]
       end