[macruby-changes] [4832] MacRuby/trunk

source_changes at macosforge.org source_changes at macosforge.org
Tue Oct 26 15:51:03 PDT 2010


Revision: 4832
          http://trac.macosforge.org/projects/ruby/changeset/4832
Author:   watson1978 at gmail.com
Date:     2010-10-26 15:51:01 -0700 (Tue, 26 Oct 2010)
Log Message:
-----------
Fixed the build error within rubygems. Fixed a #973.

Modified Paths:
--------------
    MacRuby/trunk/NSArray.m
    MacRuby/trunk/include/ruby/intern.h
    MacRuby/trunk/include/ruby/macruby.h
    MacRuby/trunk/include/ruby/ruby.h
    MacRuby/trunk/re.c

Modified: MacRuby/trunk/NSArray.m
===================================================================
--- MacRuby/trunk/NSArray.m	2010-10-26 22:40:35 UTC (rev 4831)
+++ MacRuby/trunk/NSArray.m	2010-10-26 22:51:01 UTC (rev 4832)
@@ -1313,7 +1313,7 @@
 }
 
 VALUE
-rb_ary_aref(VALUE ary, SEL sel, int argc, VALUE *argv)
+rb_ary_aref(int argc, VALUE *argv, VALUE ary)
 {
     if (IS_RARY(ary)) {
 	return rary_aref(ary, 0, argc, argv);

Modified: MacRuby/trunk/include/ruby/intern.h
===================================================================
--- MacRuby/trunk/include/ruby/intern.h	2010-10-26 22:40:35 UTC (rev 4831)
+++ MacRuby/trunk/include/ruby/intern.h	2010-10-26 22:51:01 UTC (rev 4832)
@@ -49,6 +49,7 @@
 VALUE rb_ary_new4(long, const VALUE *);
 void rb_ary_free(VALUE);
 VALUE rb_ary_freeze(VALUE);
+VALUE rb_ary_aref(int, VALUE *, VALUE);
 VALUE rb_ary_subseq(VALUE, long, long);
 void rb_ary_store(VALUE, long, VALUE);
 VALUE rb_ary_dup(VALUE);

Modified: MacRuby/trunk/include/ruby/macruby.h
===================================================================
--- MacRuby/trunk/include/ruby/macruby.h	2010-10-26 22:40:35 UTC (rev 4831)
+++ MacRuby/trunk/include/ruby/macruby.h	2010-10-26 22:51:01 UTC (rev 4832)
@@ -77,9 +77,6 @@
 bool rb_objc_hash_is_pure(VALUE);
 bool rb_objc_str_is_pure(VALUE);
 bool rb_objc_ary_is_pure(VALUE);
-long rb_ary_len(VALUE);
-VALUE rb_ary_elt(VALUE, long);
-VALUE rb_ary_aref(VALUE ary, SEL sel, int argc, VALUE *argv);
 
 VALUE rb_objc_create_class(const char *name, VALUE super);
 void rb_objc_class_sync_version(Class klass, Class super_class);

Modified: MacRuby/trunk/include/ruby/ruby.h
===================================================================
--- MacRuby/trunk/include/ruby/ruby.h	2010-10-26 22:40:35 UTC (rev 4831)
+++ MacRuby/trunk/include/ruby/ruby.h	2010-10-26 22:51:01 UTC (rev 4832)
@@ -527,6 +527,8 @@
 #define RSTRING_LEN(str) (rb_str_clen((VALUE)str))
 #define RSTRING_END(str) (RSTRING_PTR(str)+RSTRING_LEN(str))
 
+long rb_ary_len(VALUE);
+VALUE rb_ary_elt(VALUE, long);
 #define RARRAY_LEN(a) (rb_ary_len((VALUE)a))
 #define RARRAY_AT(a,i) (rb_ary_elt((VALUE)a, (long)i))
 /* IMPORTANT: try to avoid using RARRAY_PTR if necessary, because it's

Modified: MacRuby/trunk/re.c
===================================================================
--- MacRuby/trunk/re.c	2010-10-26 22:40:35 UTC (rev 4831)
+++ MacRuby/trunk/re.c	2010-10-26 22:51:01 UTC (rev 4832)
@@ -1707,7 +1707,7 @@
 		}
 	}
     }
-    return rb_ary_aref(match_to_a(rcv, 0), 0, argc, argv);
+    return rb_ary_aref(argc, argv, match_to_a(rcv, 0));
 }
 
 /*
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20101026/b7c0ec4f/attachment-0001.html>


More information about the macruby-changes mailing list