From 3c6c7ac4eb2e0c85c0c2d13ed4e65b8e277e15b6 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 24 Sep 2008 08:02:17 +0000 Subject: * complex.c (Init_Complex), rational.c (Init_Rational): ID_ALLOCATOR differs from :allocate, and invisible in ruby level. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19519 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ complex.c | 15 +++------------ rational.c | 15 +++------------ 3 files changed, 11 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6aff7f59..ebaf06afa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Sep 24 17:02:14 2008 Nobuyoshi Nakada + + * complex.c (Init_Complex), rational.c (Init_Rational): ID_ALLOCATOR + differs from :allocate, and invisible in ruby level. + Wed Sep 24 15:58:52 2008 Yukihiro Matsumoto * string.c (rb_str_rstrip_bang): removing mixed spaces and nuls at diff --git a/complex.c b/complex.c index 23940dc27..dba87d498 100644 --- a/complex.c +++ b/complex.c @@ -1371,17 +1371,10 @@ Init_Complex(void) rb_cComplex = rb_define_class(COMPLEX_NAME, rb_cNumeric); rb_define_alloc_func(rb_cComplex, nucomp_s_alloc); - rb_funcall(rb_cComplex, rb_intern("private_class_method"), 1, - ID2SYM(rb_intern("allocate"))); #if 0 - rb_define_singleton_method(rb_cComplex, "new!", nucomp_s_new_bang, -1); - rb_funcall(rb_cComplex, rb_intern("private_class_method"), 1, - ID2SYM(rb_intern("new!"))); - - rb_define_singleton_method(rb_cComplex, "new", nucomp_s_new, -1); - rb_funcall(rb_cComplex, rb_intern("private_class_method"), 1, - ID2SYM(rb_intern("new"))); + rb_define_private_method(CLASS_OF(rb_cComplex), "new!", nucomp_s_new_bang, -1); + rb_define_private_method(CLASS_OF(rb_cComplex), "new", nucomp_s_new, -1); #else rb_undef_method(CLASS_OF(rb_cComplex), "new"); #endif @@ -1472,9 +1465,7 @@ Init_Complex(void) rb_define_method(rb_cString, "to_c", string_to_c, 0); - rb_define_singleton_method(rb_cComplex, "convert", nucomp_s_convert, -1); - rb_funcall(rb_cComplex, rb_intern("private_class_method"), 1, - ID2SYM(rb_intern("convert"))); + rb_define_private_method(CLASS_OF(rb_cComplex), "convert", nucomp_s_convert, -1); /* --- */ diff --git a/rational.c b/rational.c index 8e77c8aa0..ad235498b 100644 --- a/rational.c +++ b/rational.c @@ -1488,17 +1488,10 @@ Init_Rational(void) rb_cRational = rb_define_class(RATIONAL_NAME, rb_cNumeric); rb_define_alloc_func(rb_cRational, nurat_s_alloc); - rb_funcall(rb_cRational, rb_intern("private_class_method"), 1, - ID2SYM(rb_intern("allocate"))); #if 0 - rb_define_singleton_method(rb_cRational, "new!", nurat_s_new_bang, -1); - rb_funcall(rb_cRational, rb_intern("private_class_method"), 1, - ID2SYM(rb_intern("new!"))); - - rb_define_singleton_method(rb_cRational, "new", nurat_s_new, -1); - rb_funcall(rb_cRational, rb_intern("private_class_method"), 1, - ID2SYM(rb_intern("new"))); + rb_define_private_method(CLASS_OF(rb_cRational), "new!", nurat_s_new_bang, -1); + rb_define_private_method(CLASS_OF(rb_cRational), "new", nurat_s_new, -1); #else rb_undef_method(CLASS_OF(rb_cRational), "new"); #endif @@ -1574,9 +1567,7 @@ Init_Rational(void) rb_define_method(rb_cString, "to_r", string_to_r, 0); - rb_define_singleton_method(rb_cRational, "convert", nurat_s_convert, -1); - rb_funcall(rb_cRational, rb_intern("private_class_method"), 1, - ID2SYM(rb_intern("convert"))); + rb_define_private_method(CLASS_OF(rb_cRational), "convert", nurat_s_convert, -1); } /* -- cgit