From 7b3ac07781be812468674911825e86cd82dfb5b8 Mon Sep 17 00:00:00 2001 From: hsbt Date: Thu, 20 Apr 2017 08:21:24 +0000 Subject: [PATCH] Removed deprecated extensions of mathn. * ext/mathn/{complex,rational}: Removed from ruby core. [fix GH-1542][Feature #13334][ruby-core:80247] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58413 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- doc/maintainers.rdoc | 4 ---- ext/Setup | 2 -- ext/Setup.nacl | 2 -- ext/mathn/complex/complex.c | 7 ------- ext/mathn/complex/extconf.rb | 4 ---- ext/mathn/rational/extconf.rb | 4 ---- ext/mathn/rational/rational.c | 7 ------- lib/mathn.rb | 3 --- test/test_extlibs.rb | 2 -- test/test_mathn.rb | 2 -- 10 files changed, 37 deletions(-) delete mode 100644 ext/mathn/complex/complex.c delete mode 100644 ext/mathn/complex/extconf.rb delete mode 100644 ext/mathn/rational/extconf.rb delete mode 100644 ext/mathn/rational/rational.c diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc index f3f79e207b..0fe9e84520 100644 --- a/doc/maintainers.rdoc +++ b/doc/maintainers.rdoc @@ -181,10 +181,6 @@ Zachary Scott (zzak) Nobuyuki Nakada (nobu) [ext/io/wait] Nobuyuki Nakada (nobu) -[ext/mathn/complex] - Keiju ISHITSUKA (keiju) -[ext/mathn/rational] - Keiju ISHITSUKA (keiju) [ext/nkf] NARUSE, Yui (narse) [ext/objspace] diff --git a/ext/Setup b/ext/Setup index 0929d647ae..ac79c86f84 100644 --- a/ext/Setup +++ b/ext/Setup @@ -23,8 +23,6 @@ #json #json/generator #json/parser -#mathn/complex -#mathn/rational #nkf #objspace #openssl diff --git a/ext/Setup.nacl b/ext/Setup.nacl index eb8a1a70cd..79ca53da4b 100644 --- a/ext/Setup.nacl +++ b/ext/Setup.nacl @@ -25,8 +25,6 @@ # #json # json/generator # json/parser -# mathn/complex -# mathn/rational # nkf # objspace # #openssl diff --git a/ext/mathn/complex/complex.c b/ext/mathn/complex/complex.c deleted file mode 100644 index dce494959f..0000000000 --- a/ext/mathn/complex/complex.c +++ /dev/null @@ -1,7 +0,0 @@ -extern void nucomp_canonicalization(int); - -void -Init_complex(void) -{ - nucomp_canonicalization(1); -} diff --git a/ext/mathn/complex/extconf.rb b/ext/mathn/complex/extconf.rb deleted file mode 100644 index a3f45ac4fc..0000000000 --- a/ext/mathn/complex/extconf.rb +++ /dev/null @@ -1,4 +0,0 @@ -# frozen_string_literal: false -require "mkmf" - -create_makefile "mathn/complex" diff --git a/ext/mathn/rational/extconf.rb b/ext/mathn/rational/extconf.rb deleted file mode 100644 index 4e4cc5f621..0000000000 --- a/ext/mathn/rational/extconf.rb +++ /dev/null @@ -1,4 +0,0 @@ -# frozen_string_literal: false -require "mkmf" - -create_makefile "mathn/rational" diff --git a/ext/mathn/rational/rational.c b/ext/mathn/rational/rational.c deleted file mode 100644 index 2ac5999946..0000000000 --- a/ext/mathn/rational/rational.c +++ /dev/null @@ -1,7 +0,0 @@ -extern void nurat_canonicalization(int); - -void -Init_rational(void) -{ - nurat_canonicalization(1); -} diff --git a/lib/mathn.rb b/lib/mathn.rb index f122a98eae..877559d269 100644 --- a/lib/mathn.rb +++ b/lib/mathn.rb @@ -46,9 +46,6 @@ require "cmath.rb" require "matrix.rb" require "prime.rb" -require "mathn/rational" -require "mathn/complex" - unless defined?(Math.exp!) Object.instance_eval{remove_const :Math} Math = CMath # :nodoc: diff --git a/test/test_extlibs.rb b/test/test_extlibs.rb index 9b82b4f8cd..7dc22ee8a3 100644 --- a/test/test_extlibs.rb +++ b/test/test_extlibs.rb @@ -61,8 +61,6 @@ class TestExtLibs < Test::Unit::TestCase check_existence "io/nonblock" check_existence "io/wait" check_existence "json" - check_existence "mathn/complex" - check_existence "mathn/rational" check_existence "nkf" check_existence "objspace" check_existence "openssl", "this may be false positive, but should assert because rubygems requires this" diff --git a/test/test_mathn.rb b/test/test_mathn.rb index b50a09e4df..eb93895010 100644 --- a/test/test_mathn.rb +++ b/test/test_mathn.rb @@ -7,8 +7,6 @@ class TestMathn < Test::Unit::TestCase stderr = $VERBOSE ? ["lib/mathn.rb is deprecated"] : [] assert_in_out_err ['-r', 'mathn', '-e', 'a=1**2;!a'], "", [], stderr, '[ruby-core:25740]' assert_in_out_err ['-r', 'mathn', '-e', 'a=(1 << 126)**2;!a'], "", [], stderr, '[ruby-core:25740]' - assert_in_out_err ['-r', 'mathn/complex', '-e', 'a=Complex(0,1)**4;!a'], "", [], [], '[ruby-core:44170]' - assert_in_out_err ['-r', 'mathn/complex', '-e', 'a=Complex(0,1)**5;!a'], "", [], [], '[ruby-core:44170]' end def test_quo