From 2c64283b7cce90823911e01803e6dc49c47ff98e Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 21 Jun 2009 10:36:04 +0000 Subject: merges r23744 from trunk into ruby_1_9_1. -- * complex.c: constant COMPLEX_NAME has been removed. * rational.c: constant RATIONAL_NAME has been removed. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23804 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ complex.c | 8 ++------ rational.c | 8 ++------ version.h | 2 +- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 17d61c513..d79322a51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Jun 19 20:44:45 2009 Tadayoshi Funaba + + * complex.c: constant COMPLEX_NAME has been removed. + + * rational.c: constant RATIONAL_NAME has been removed. + Fri Jun 19 17:04:59 2009 Yukihiro Matsumoto * numeric.c (flo_cmp): should always return nil for NaN. diff --git a/complex.c b/complex.c index 62bc7a6f3..3ae12207d 100644 --- a/complex.c +++ b/complex.c @@ -11,10 +11,6 @@ #define NDEBUG #include -#ifndef COMPLEX_NAME -#define COMPLEX_NAME "Complex" -#endif - #define ZERO INT2FIX(0) #define ONE INT2FIX(1) #define TWO INT2FIX(2) @@ -1399,7 +1395,7 @@ Init_Complex(void) id_to_r = rb_intern("to_r"); id_to_s = rb_intern("to_s"); - rb_cComplex = rb_define_class(COMPLEX_NAME, rb_cNumeric); + rb_cComplex = rb_define_class("Complex", rb_cNumeric); rb_define_alloc_func(rb_cComplex, nucomp_s_alloc); rb_undef_method(CLASS_OF(rb_cComplex), "allocate"); @@ -1415,7 +1411,7 @@ Init_Complex(void) rb_define_singleton_method(rb_cComplex, "rect", nucomp_s_new, -1); rb_define_singleton_method(rb_cComplex, "polar", nucomp_s_polar, 2); - rb_define_global_function(COMPLEX_NAME, nucomp_f_complex, -1); + rb_define_global_function("Complex", nucomp_f_complex, -1); rb_undef_method(rb_cComplex, "<"); rb_undef_method(rb_cComplex, "<="); diff --git a/rational.c b/rational.c index c3938adf1..70f7f1628 100644 --- a/rational.c +++ b/rational.c @@ -16,10 +16,6 @@ #define NDEBUG #include -#ifndef RATIONAL_NAME -#define RATIONAL_NAME "Rational" -#endif - #define ZERO INT2FIX(0) #define ONE INT2FIX(1) #define TWO INT2FIX(2) @@ -1568,7 +1564,7 @@ Init_Rational(void) ml = (long)(log(DBL_MAX) / log(2.0) - 1); - rb_cRational = rb_define_class(RATIONAL_NAME, rb_cNumeric); + rb_cRational = rb_define_class("Rational", rb_cNumeric); rb_define_alloc_func(rb_cRational, nurat_s_alloc); rb_undef_method(CLASS_OF(rb_cRational), "allocate"); @@ -1580,7 +1576,7 @@ Init_Rational(void) rb_undef_method(CLASS_OF(rb_cRational), "new"); #endif - rb_define_global_function(RATIONAL_NAME, nurat_f_rational, -1); + rb_define_global_function("Rational", nurat_f_rational, -1); rb_define_method(rb_cRational, "numerator", nurat_numerator, 0); rb_define_method(rb_cRational, "denominator", nurat_denominator, 0); diff --git a/version.h b/version.h index c64416011..1220222aa 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "1.9.1" #define RUBY_RELEASE_DATE "2009-05-22" -#define RUBY_PATCHLEVEL 194 +#define RUBY_PATCHLEVEL 195 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit