Rename .rb_stub to .$$stub

elia · elia · commit 930f2fae15a6 · 2014-09-16T22:59:55.000+02:00
Ref: #583
diff --git a/lib/opal/nodes/defined.rb b/lib/opal/nodes/defined.rb
@@ -33,7 +33,7 @@ def compile_call
         recv = value[1] ? expr(value[1]) : 'self'
 
         with_temp do |tmp|
-          push "(((#{tmp} = ", recv, "#{mid}) && !#{tmp}.rb_stub) || ", recv
+          push "(((#{tmp} = ", recv, "#{mid}) && !#{tmp}.$$stub) || ", recv
           push "['$respond_to_missing?']('#{value[2].to_s}') ? 'method' : nil)"
         end
       end
diff --git a/lib/opal/nodes/masgn.rb b/lib/opal/nodes/masgn.rb
@@ -17,7 +17,7 @@ def compile
         elsif rhs.type == :to_ary
           push "#{tmp} = $opal.to_ary(", expr(rhs[1]), ")"
         elsif rhs.type == :splat
-          push "(#{tmp} = ", expr(rhs[1]), ")['$to_a'] && !#{tmp}['$to_a'].rb_stub ? (#{tmp} = #{tmp}['$to_a']())"
+          push "(#{tmp} = ", expr(rhs[1]), ")['$to_a'] && !#{tmp}['$to_a'].$$stub ? (#{tmp} = #{tmp}['$to_a']())"
           push " : (#{tmp}).$$is_array ? #{tmp} : (#{tmp} = [#{tmp}])"
         else
           raise "unsupported mlhs type"
diff --git a/opal/corelib/kernel.rb b/opal/corelib/kernel.rb
@@ -25,7 +25,7 @@ def method(name)
     %x{
       var meth = self['$' + name];
 
-      if (!meth || meth.rb_stub) {
+      if (!meth || meth.$$stub) {
         #{raise NameError, "undefined method `#{name}' for class `#{self.class.name}'"};
       }
 
@@ -44,7 +44,7 @@ def methods(all = true)
               continue;
             }
           }
-          if (self[key].rb_stub === undefined) {
+          if (self[key].$$stub === undefined) {
             methods.push(key.substr(1));
           }
         }
@@ -497,7 +497,7 @@ def respond_to?(name, include_all = false)
     %x{
       var body = self['$' + name];
 
-      if (typeof(body) === "function" && !body.rb_stub) {
+      if (typeof(body) === "function" && !body.$$stub) {
         return true;
       }
     }
diff --git a/opal/corelib/module.rb b/opal/corelib/module.rb
@@ -110,7 +110,7 @@ def append_features(klass)
         var method = methods[i], current;
 
 
-        if (prototype.hasOwnProperty(method) && !(current = prototype[method]).$$donated && !current.rb_stub) {
+        if (prototype.hasOwnProperty(method) && !(current = prototype[method]).$$donated && !current.$$stub) {
           // if the target class already has a method of the same name defined
           // and that method was NOT donated, then it must be a method defined
           // by the class so we do not want to override it
@@ -345,7 +345,7 @@ def instance_method(name)
     %x{
       var meth = self.$$proto['$' + name];
 
-      if (!meth || meth.rb_stub) {
+      if (!meth || meth.$$stub) {
         #{raise NameError, "undefined method `#{name}' for class `#{self.name}'"};
       }
 
@@ -419,7 +419,7 @@ def module_exec(&block)
   def method_defined?(method)
     %x{
       var body = self.$$proto['$' + method];
-      return (!!body) && !body.rb_stub;
+      return (!!body) && !body.$$stub;
     }
   end
 
diff --git a/opal/corelib/runtime.js b/opal/corelib/runtime.js
@@ -458,7 +458,7 @@
    *
    *    Opal.add_stubs(["$foo", "$bar", "$baz="]);
    *
-   * All stub functions will have a private `rb_stub` property set to true so
+   * All stub functions will have a private `$$stub` property set to true so
    * that other internal methods can detect if a method is just a stub or not.
    * `Kernel#respond_to?` uses this property to detect a methods presence.
    *
@@ -528,7 +528,7 @@
       return this.$method_missing.apply(this, [method_name.slice(1)].concat($slice.call(arguments)));
     };
 
-    method_missing_stub.rb_stub = true;
+    method_missing_stub.$$stub = true;
 
     return method_missing_stub;
   }
@@ -702,7 +702,7 @@
     if (value.$$is_array) {
       return value;
     }
-    else if (value.$to_ary && !value.$to_ary.rb_stub) {
+    else if (value.$to_ary && !value.$to_ary.$$stub) {
       return value.$to_ary();
     }
 
diff --git a/spec/opal/core/kernel/respond_to_spec.rb b/spec/opal/core/kernel/respond_to_spec.rb
@@ -34,8 +34,8 @@ def some_method
     @a.respond_to?(:undefed_method).should be_false
   end
 
-  it "returns false if a method exists, but is marked with a 'rb_stub' property" do
-    `#{@a}.$some_method.rb_stub = true`
+  it "returns false if a method exists, but is marked with a '$$stub' property" do
+    `#{@a}.$some_method.$$stub = true`
     @a.respond_to?(:some_method).should be_false
   end
 end

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ def method(name)`
`25`	`25`	`%x{`
`26`	`26`	`var meth = self['$' + name];`
`27`	`27`
`28`		`- if (!meth \|\| meth.rb_stub) {`
	`28`	`+ if (!meth \|\| meth.$$stub) {`
`29`	`29`	#{raise NameError, "undefined method `#{name}' for class `#{self.class.name}'"};
`30`	`30`	`}`
`31`	`31`
`@@ -44,7 +44,7 @@ def methods(all = true)`
`44`	`44`	`continue;`
`45`	`45`	`}`
`46`	`46`	`}`
`47`		`- if (self[key].rb_stub === undefined) {`
	`47`	`+ if (self[key].$$stub === undefined) {`
`48`	`48`	`methods.push(key.substr(1));`
`49`	`49`	`}`
`50`	`50`	`}`
`@@ -497,7 +497,7 @@ def respond_to?(name, include_all = false)`
`497`	`497`	`%x{`
`498`	`498`	`var body = self['$' + name];`
`499`	`499`
`500`		`- if (typeof(body) === "function" && !body.rb_stub) {`
	`500`	`+ if (typeof(body) === "function" && !body.$$stub) {`
`501`	`501`	`return true;`
`502`	`502`	`}`
`503`	`503`	`}`
Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,7 @@`
`458`	`458`	`*`
`459`	`459`	`* Opal.add_stubs(["$foo", "$bar", "$baz="]);`
`460`	`460`	`*`
`461`		- * All stub functions will have a private `rb_stub` property set to true so
	`461`	+ * All stub functions will have a private `$$stub` property set to true so
`462`	`462`	`* that other internal methods can detect if a method is just a stub or not.`
`463`	`463`	* `Kernel#respond_to?` uses this property to detect a methods presence.
`464`	`464`	`*`
`@@ -528,7 +528,7 @@`
`528`	`528`	`return this.$method_missing.apply(this, [method_name.slice(1)].concat($slice.call(arguments)));`
`529`	`529`	`};`
`530`	`530`
`531`		`- method_missing_stub.rb_stub = true;`
	`531`	`+ method_missing_stub.$$stub = true;`
`532`	`532`
`533`	`533`	`return method_missing_stub;`
`534`	`534`	`}`
`@@ -702,7 +702,7 @@`
`702`	`702`	`if (value.$$is_array) {`
`703`	`703`	`return value;`
`704`	`704`	`}`
`705`		`- else if (value.$to_ary && !value.$to_ary.rb_stub) {`
	`705`	`+ else if (value.$to_ary && !value.$to_ary.$$stub) {`
`706`	`706`	`return value.$to_ary();`
`707`	`707`	`}`
`708`	`708`