[macruby-changes] [1273] MacRuby/branches/experimental

[source_changes at macosforge.org]

Revision: 1273
          http://trac.macosforge.org/projects/ruby/changeset/1273
Author:   lsansonetti at apple.com
Date:     2009-03-30 15:46:41 -0700 (Mon, 30 Mar 2009)
Log Message:
-----------
ported to rb_objc_define_method()

Modified Paths:
--------------
    MacRuby/branches/experimental/file.c
    MacRuby/branches/experimental/gc.c
    MacRuby/branches/experimental/proc.c
    MacRuby/branches/experimental/transcode.c

Modified: MacRuby/branches/experimental/file.c
===================================================================
--- MacRuby/branches/experimental/file.c	2009-03-30 22:23:43 UTC (rev 1272)
+++ MacRuby/branches/experimental/file.c	2009-03-30 22:46:41 UTC (rev 1273)
@@ -4163,7 +4163,7 @@
     rb_objc_define_method(rb_cStat, "blockdev?",  rb_stat_b, 0);
     rb_objc_define_method(rb_cStat, "chardev?",  rb_stat_c, 0);
 
-    rb_define_method(rb_cStat, "setuid?",  rb_stat_suid, 0);
-    rb_define_method(rb_cStat, "setgid?",  rb_stat_sgid, 0);
-    rb_define_method(rb_cStat, "sticky?",  rb_stat_sticky, 0);
+    rb_objc_define_method(rb_cStat, "setuid?",  rb_stat_suid, 0);
+    rb_objc_define_method(rb_cStat, "setgid?",  rb_stat_sgid, 0);
+    rb_objc_define_method(rb_cStat, "sticky?",  rb_stat_sticky, 0);
 }

Modified: MacRuby/branches/experimental/gc.c
===================================================================
--- MacRuby/branches/experimental/gc.c	2009-03-30 22:23:43 UTC (rev 1272)
+++ MacRuby/branches/experimental/gc.c	2009-03-30 22:46:41 UTC (rev 1273)
@@ -1105,7 +1105,7 @@
     rb_global_variable(&nomem_error);
     nomem_error = rb_exc_new2(rb_eNoMemError, "failed to allocate memory");
 
-    //rb_define_method(rb_mKernel, "hash", rb_obj_id, 0);
+    rb_objc_define_method(rb_mKernel, "hash", rb_obj_id, 0);
     rb_objc_define_method(rb_mKernel, "__id__", rb_obj_id, 0);
     rb_objc_define_method(rb_mKernel, "object_id", rb_obj_id, 0);
 

Modified: MacRuby/branches/experimental/proc.c
===================================================================
--- MacRuby/branches/experimental/proc.c	2009-03-30 22:23:43 UTC (rev 1272)
+++ MacRuby/branches/experimental/proc.c	2009-03-30 22:46:41 UTC (rev 1273)
@@ -209,7 +209,7 @@
 }
 
 static VALUE
-binding_dup(VALUE self)
+binding_dup(VALUE self, SEL sel)
 {
     VALUE bindval = binding_alloc(rb_cBinding);
 #if 0 // TODO
@@ -222,9 +222,9 @@
 }
 
 static VALUE
-binding_clone(VALUE self)
+binding_clone(VALUE self, SEL sel)
 {
-    VALUE bindval = binding_dup(self);
+    VALUE bindval = binding_dup(self, 0);
     CLONESETUP(bindval, self);
     return bindval;
 }
@@ -262,7 +262,7 @@
  */
 
 static VALUE
-rb_f_binding(VALUE self)
+rb_f_binding(VALUE self, SEL sel)
 {
     return rb_binding_new();
 }
@@ -286,7 +286,7 @@
 VALUE rb_f_eval(VALUE self, SEL sel, int argc, VALUE *argv);
 
 static VALUE
-bind_eval(int argc, VALUE *argv, VALUE bindval)
+bind_eval(VALUE bindval, SEL sel, int argc, VALUE *argv)
 {
     VALUE args[4];
 
@@ -1762,9 +1762,9 @@
     rb_cBinding = rb_define_class("Binding", rb_cObject);
     rb_undef_alloc_func(rb_cBinding);
     rb_undef_method(CLASS_OF(rb_cBinding), "new");
-    rb_define_method(rb_cBinding, "clone", binding_clone, 0);
-    rb_define_method(rb_cBinding, "dup", binding_dup, 0);
-    rb_define_method(rb_cBinding, "eval", bind_eval, -1);
-    rb_define_global_function("binding", rb_f_binding, 0);
+    rb_objc_define_method(rb_cBinding, "clone", binding_clone, 0);
+    rb_objc_define_method(rb_cBinding, "dup", binding_dup, 0);
+    rb_objc_define_method(rb_cBinding, "eval", bind_eval, -1);
+    rb_objc_define_method(rb_mKernel, "binding", rb_f_binding, 0);
 }
 

Modified: MacRuby/branches/experimental/transcode.c
===================================================================
--- MacRuby/branches/experimental/transcode.c	2009-03-30 22:23:43 UTC (rev 1272)
+++ MacRuby/branches/experimental/transcode.c	2009-03-30 22:46:41 UTC (rev 1273)
@@ -400,7 +400,7 @@
  */
 
 static VALUE
-str_encode_bang(int argc, VALUE *argv, VALUE str)
+str_encode_bang(VALUE str, SEL sel, int argc, VALUE *argv)
 {
     VALUE newstr = str;
     int encidx = str_transcode(argc, argv, &newstr);
@@ -437,7 +437,7 @@
 #else // WITH_OBJC
 
 static VALUE
-str_encode_bang(int argc, VALUE *argv, VALUE self)
+str_encode_bang(VALUE str, SEL sel, int argc, VALUE *argv)
 {
     /* TODO */
     return self;
@@ -446,7 +446,7 @@
 #endif
 
 static VALUE
-str_encode(int argc, VALUE *argv, VALUE str)
+str_encode(VALUE str, SEL sel, int argc, VALUE *argv)
 {
     str = rb_str_dup(str);
     return str_encode_bang(argc, argv, str);
@@ -469,6 +469,6 @@
     sym_ignore = ID2SYM(rb_intern("ignore"));
 #endif
 
-    rb_define_method(rb_cString, "encode", str_encode, -1);
-    rb_define_method(rb_cString, "encode!", str_encode_bang, -1);
+    rb_objc_define_method(rb_cString, "encode", str_encode, -1);
+    rb_objc_define_method(rb_cString, "encode!", str_encode_bang, -1);
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090330/bcf8d42a/attachment-0001.html>