From 0ca24570bb9bee8460cd14afd00fbef8b7493498 Mon Sep 17 00:00:00 2001 From: yugui Date: Tue, 16 Dec 2008 10:25:34 +0000 Subject: merges r20715 from trunk into ruby_1_9_1. * complex.c: use rb_usascii_str_new2 instead of rb_str_new2. * rational.c: ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20787 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ complex.c | 16 ++++++++-------- rational.c | 6 +++--- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 94f9c0ddd..43e7ee172 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Dec 13 13:03:20 2008 Tadayoshi Funaba + + * complex.c: use rb_usascii_str_new2 instead of rb_str_new2. + + * rational.c: ditto. + Fri Dec 12 22:12:46 2008 Tadayoshi Funaba * complex.c, rational.c: do not use RUBY_VERSION_CODE. diff --git a/complex.c b/complex.c index 0549bab87..31b3c4825 100644 --- a/complex.c +++ b/complex.c @@ -941,7 +941,7 @@ nucomp_inspect(VALUE self) { VALUE s; - s = rb_str_new2("("); + s = rb_usascii_str_new2("("); rb_str_concat(s, nucomp_format(self, f_inspect)); rb_str_cat2(s, ")"); @@ -1083,20 +1083,20 @@ make_patterns(void) comp_pat2 = rb_reg_new(comp_pat2_source, sizeof comp_pat2_source - 1, 0); rb_gc_register_mark_object(comp_pat2); - a_slash = rb_str_new2("/"); + a_slash = rb_usascii_str_new2("/"); rb_gc_register_mark_object(a_slash); - a_dot_and_an_e = rb_str_new2(".eE"); + a_dot_and_an_e = rb_usascii_str_new2(".eE"); rb_gc_register_mark_object(a_dot_and_an_e); - null_string = rb_str_new2(""); + null_string = rb_usascii_str_new2(""); rb_gc_register_mark_object(null_string); underscores_pat = rb_reg_new(underscores_pat_source, sizeof underscores_pat_source - 1, 0); rb_gc_register_mark_object(underscores_pat); - an_underscore = rb_str_new2("_"); + an_underscore = rb_usascii_str_new2("_"); rb_gc_register_mark_object(an_underscore); } @@ -1148,13 +1148,13 @@ string_to_c_internal(VALUE self) sr = Qnil; si = f_aref(m, INT2FIX(1)); if (NIL_P(si)) - si = rb_str_new2(""); + si = rb_usascii_str_new2(""); { VALUE t; t = f_aref(m, INT2FIX(2)); if (NIL_P(t)) - t = rb_str_new2("1"); + t = rb_usascii_str_new2("1"); rb_str_concat(si, t); } re = f_post_match(m); @@ -1174,7 +1174,7 @@ string_to_c_internal(VALUE self) si = f_aref(m, INT2FIX(3)); t = f_aref(m, INT2FIX(4)); if (NIL_P(t)) - t = rb_str_new2("1"); + t = rb_usascii_str_new2("1"); rb_str_concat(si, t); } re = f_post_match(m); diff --git a/rational.c b/rational.c index 4b6e2ea0c..ba41413cb 100644 --- a/rational.c +++ b/rational.c @@ -1135,7 +1135,7 @@ nurat_inspect(VALUE self) { VALUE s; - s = rb_str_new2("("); + s = rb_usascii_str_new2("("); rb_str_concat(s, nurat_format(self, f_inspect)); rb_str_cat2(s, ")"); @@ -1289,7 +1289,7 @@ make_patterns(void) sizeof underscores_pat_source - 1, 0); rb_gc_register_mark_object(underscores_pat); - an_underscore = rb_str_new2("_"); + an_underscore = rb_usascii_str_new2("_"); rb_gc_register_mark_object(an_underscore); } @@ -1368,7 +1368,7 @@ string_to_r_internal(VALUE self) v = f_mul(v, f_expt(INT2FIX(10), f_to_i(exp))); #if 0 if (!NIL_P(de) && (!NIL_P(fp) || !NIL_P(exp))) - return rb_assoc_new(v, rb_str_new2("dummy")); + return rb_assoc_new(v, rb_usascii_str_new2("dummy")); #endif if (!NIL_P(de)) v = f_div(v, f_to_i(de)); -- cgit