[macruby-changes] [3486] MacRuby/trunk

[source_changes at macosforge.org]

Revision: 3486
          http://trac.macosforge.org/projects/ruby/changeset/3486
Author:   lsansonetti at apple.com
Date:     2010-02-10 18:16:52 -0800 (Wed, 10 Feb 2010)
Log Message:
-----------
expose rb_str_plus()

Modified Paths:
--------------
    MacRuby/trunk/include/ruby/intern.h
    MacRuby/trunk/string.c

Modified: MacRuby/trunk/include/ruby/intern.h
===================================================================
--- MacRuby/trunk/include/ruby/intern.h	2010-02-11 00:37:06 UTC (rev 3485)
+++ MacRuby/trunk/include/ruby/intern.h	2010-02-11 02:16:52 UTC (rev 3486)
@@ -578,6 +578,7 @@
 VALUE rb_str_cat2(VALUE, const char*);
 VALUE rb_str_append(VALUE, VALUE);
 VALUE rb_str_concat(VALUE, VALUE);
+VALUE rb_str_plus(VALUE str1, VALUE str2);
 int rb_memhash(const void *ptr, long len);
 int rb_str_hash(VALUE);
 int rb_str_hash_cmp(VALUE,VALUE);

Modified: MacRuby/trunk/string.c
===================================================================
--- MacRuby/trunk/string.c	2010-02-11 00:37:06 UTC (rev 3485)
+++ MacRuby/trunk/string.c	2010-02-11 02:16:52 UTC (rev 3486)
@@ -459,7 +459,7 @@
  */
 
 static VALUE
-rb_str_plus(VALUE str1, SEL sel, VALUE str2)
+rb_str_plus_imp(VALUE str1, SEL sel, VALUE str2)
 {
     StringValue(str2);
     VALUE str3 = rb_str_new(0, 0);
@@ -471,6 +471,13 @@
     return str3;
 }
 
+VALUE
+rb_str_plus(VALUE str1, VALUE str2)
+{
+    return rb_str_plus_imp(str1, 0, str2);
+}
+
+
 /*
  *  call-seq:
  *     str * integer   => new_str
@@ -5652,7 +5659,7 @@
     rb_objc_define_method(rb_cString, "==", rb_str_equal_imp, 1);
     rb_objc_define_method(rb_cString, "eql?", rb_str_eql, 1);
     rb_objc_define_method(rb_cString, "casecmp", rb_str_casecmp, 1);
-    rb_objc_define_method(rb_cString, "+", rb_str_plus, 1);
+    rb_objc_define_method(rb_cString, "+", rb_str_plus_imp, 1);
     rb_objc_define_method(rb_cString, "*", rb_str_times, 1);
     rb_objc_define_method(rb_cString, "%", rb_str_format_m, 1);
     rb_objc_define_method(rb_cString, "[]", rb_str_aref_m, -1);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20100210/e036728b/attachment-0001.html>