Only donate methods inside the runtime

adambeynon · adambeynon · commit dd76afce0fb9 · 2014-11-27T11:37:37.000Z
diff --git a/lib/opal/nodes/module.rb b/lib/opal/nodes/module.rb
@@ -24,7 +24,6 @@ def compile
 
           line scope.to_vars
           line body_code
-          line scope.to_donate_methods
         end
 
         line "})(", base, ")"
diff --git a/lib/opal/nodes/scope.rb b/lib/opal/nodes/scope.rb
@@ -110,14 +110,6 @@ def proto
         "def"
       end
 
-      # A scope donates its methods if it is a module, or the core Object
-      # class. Modules donate their methods to classes or objects they are
-      # included in. Object donates methods to bridged classes whose native
-      # prototypes do not actually inherit from Opal.Object.prototype.
-      def should_donate?
-        @type == :module
-      end
-
       ##
       # Vars to use inside each scope
       def to_vars
@@ -148,15 +140,6 @@ def to_vars
         fragment(result)
       end
 
-      # Generates code for this module to donate methods
-      def to_donate_methods
-        if should_donate? and !@methods.empty?
-          fragment("%s;Opal.donate(self, [%s]);" % [@compiler.parser_indent, @methods.map(&:inspect).join(', ')])
-        else
-          fragment("")
-        end
-      end
-
       def add_scope_ivar(ivar)
         if def_in_class?
           @parent.add_proto_ivar ivar
diff --git a/opal/corelib/module.rb b/opal/corelib/module.rb
@@ -47,11 +47,7 @@ def <(other)
 
   def alias_method(newname, oldname)
     %x{
-      self.$$proto['$' + newname] = self.$$proto['$' + oldname];
-
-      if (self.$$methods) {
-        Opal.donate(self, ['$' + newname ])
-      }
+      Opal.defn(self, '$' + newname, self.$$proto['$' + oldname]);
     }
     self
   end
@@ -88,18 +84,16 @@ def attr_accessor(*names)
 
   def attr_reader(*names)
     %x{
-      var proto = self.$$proto, cls = self;
       for (var i = 0, length = names.length; i < length; i++) {
         (function(name) {
-          proto[name] = nil;
+          self.$$proto[name] = nil;
           var func = function() { return this[name] };
 
-          if (cls.$$is_singleton) {
-            proto.constructor.prototype['$' + name] = func;
+          if (self.$$is_singleton) {
+            self.$$proto.constructor.prototype['$' + name] = func;
           }
           else {
-            proto['$' + name] = func;
-            Opal.donate(self, ['$' + name ]);
+            Opal.defn(self, '$' + name, func);
           }
         })(names[i]);
       }
@@ -110,18 +104,16 @@ def attr_reader(*names)
 
   def attr_writer(*names)
     %x{
-      var proto = self.$$proto, cls = self;
       for (var i = 0, length = names.length; i < length; i++) {
         (function(name) {
-          proto[name] = nil;
+          self.$$proto[name] = nil;
           var func = function(value) { return this[name] = value; };
 
-          if (cls.$$is_singleton) {
-            proto.constructor.prototype['$' + name + '='] = func;
+          if (self.$$is_singleton) {
+            self.$$proto.constructor.prototype['$' + name + '='] = func;
           }
           else {
-            proto['$' + name + '='] = func;
-            Opal.donate(self, ['$' + name + '=']);
+            Opal.defn(self, '$' + name + '=', func);
           }
         })(names[i]);
       }
@@ -241,12 +233,7 @@ def define_method(name, method = undefined, &block)
       block.$$s    = null;
       block.$$def  = block;
 
-      if (self.$$is_mod) {
-        block.$$owner = obj;
-      }
-
-      self.$$proto[jsid] = block;
-      Opal.donate(self, [jsid]);
+      Opal.defn(self, jsid, block);
 
       return name;
     }
