Module do not need a constructor to be generated

opal · Oct 6, 2013 · f58c758 · f58c758
1 parent 13cf9b1
commit f58c758
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/corelib/runtime.js b/corelib/runtime.js
@@ -188,7 +188,7 @@
   };
 
   // Define new module (or return existing module)
-  Opal.module = function(base, id, constructor) {
+  Opal.module = function(base, id) {
     var module;
 
     if (!base._isClass) {

diff --git a/lib/opal/parser.rb b/lib/opal/parser.rb
@@ -1007,9 +1007,8 @@ def process_module(sexp, level)
       indent do
         in_scope(:module) do
           @scope.name = name
-          @scope.add_temp "self = #{name}",
-                          "#{@scope.proto} = #{name}._proto",
-                          "$scope = #{name}._scope"
+          @scope.add_temp "#{@scope.proto} = self._proto",
+                          "$scope = self._scope"
           body = process body, :stmt
 
           code << f(@indent)
@@ -1022,10 +1021,9 @@ def process_module(sexp, level)
       end
 
       spacer  = "\n#{@indent}#{INDENT}"
-      cls     = "function #{name}() {};"
-      boot    = "self = #{name} = $module($base, #{name.inspect}, #{name});"
+      boot    = "var self = $module($base, #{name.inspect});"
 
-      code.unshift f("(function($base){#{spacer}#{cls}#{spacer}#{boot}\n", sexp)
+      code.unshift f("(function($base){#{spacer}#{boot}\n", sexp)
       code << f("\n#@indent})(")
       code << base
       code << f(")")
@@ -1159,7 +1157,7 @@ def js_def(recvr, mid, args, stmts, line, end_line, sexp, level)
 
       def_code = if recvr
         if smethod
-          [f("#{@scope.name}.constructor.prototype['$#{mid}'] = ", sexp), result]
+          [f("self.constructor.prototype['$#{mid}'] = ", sexp), result]
         else
           [recv, f("#{jsid} = ", sexp), result]
         end

diff --git a/lib/opal/target_scope.rb b/lib/opal/target_scope.rb
@@ -149,7 +149,7 @@ def f(code, sexp = nil)
     # Generates code for this module to donate methods
     def to_donate_methods
       if should_donate? and !@methods.empty?
-        f("%s;$opal.donate(#{@name}, [%s]);" % [@parser.parser_indent, @methods.map(&:inspect).join(', ')])
+        f("%s;$opal.donate(self, [%s]);" % [@parser.parser_indent, @methods.map(&:inspect).join(', ')])
       else
         f("")
       end