From: Tels Date: Sat, 3 Feb 2007 13:42:20 +0000 (+0100) Subject: integrate bignum 0.19 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=95a2d02cdf2a29fa62cf928c06bf47a38a6c680d;p=p5sagit%2Fp5-mst-13.2.git integrate bignum 0.19 Message-Id: <200702031342.21634@bloodgate.com> p4raw-id: //depot/perl@30360 --- diff --git a/lib/bigint.pm b/lib/bigint.pm index 831819b..3af1294 100644 --- a/lib/bigint.pm +++ b/lib/bigint.pm @@ -1,7 +1,7 @@ package bigint; -require 5.005; +use 5.006002; -$VERSION = '0.07'; +$VERSION = '0.09'; use Exporter; @ISA = qw( Exporter ); @EXPORT_OK = qw( ); @@ -54,10 +54,23 @@ sub upgrade # { # $Math::BigInt::upgrade = $_[0]; # } - return $Math::BigInt::upgrade; + $Math::BigInt::upgrade; } -sub _constant +sub _binary_constant + { + # this takes a binary/hexadecimal/octal constant string and returns it + # as string suitable for new. Basically it converts octal to decimal, and + # passes every thing else unmodified back. + my $string = shift; + + return Math::BigInt->new($string) if $string =~ /^0[bx]/; + + # so it must be an octal constant + Math::BigInt->from_oct($string); + } + +sub _float_constant { # this takes a floating point constant string and returns it truncated to # integer. For instance, '4.5' => '4', '1.234e2' => '123' etc @@ -94,7 +107,7 @@ sub _constant return $sign.$$miv.$$mfv.'E'.$ec; # 123.45e+3 => 12345e1 } $mfv = substr($$mfv,0,$ec); - return $sign.$$miv.$mfv; # 123.45e+1 => 1234 + $sign.$$miv.$mfv; # 123.45e+1 => 1234 } sub import @@ -163,7 +176,7 @@ sub import require Math::BigInt if $_lite == 0; # not already loaded? $class = 'Math::BigInt'; # regardless of MBIL or not } - push @import, 'lib' => $lib if $lib ne ''; + push @import, 'try' => $lib if $lib ne ''; # Math::BigInt::Trace or plain Math::BigInt $class->import(@import); @@ -180,7 +193,9 @@ sub import } # we take care of floating point constants, since BigFloat isn't available # and BigInt doesn't like them: - overload::constant float => sub { Math::BigInt->new( _constant(shift) ); }; + overload::constant float => sub { Math::BigInt->new( _float_constant(shift) ); }; + # Take care of octal/hexadecimal constants + overload::constant binary => sub { _binary_constant(shift) }; $self->export_to_level(1,$self,@a); # export inf and NaN } @@ -228,6 +243,8 @@ than or equal to zero. See Math::BigInt's bround() function for details. perl -Mbigint=a,2 -le 'print 12345+1' +Note that setting precision and accurary at the same time is not possible. + =item p or precision This sets the precision for all math operations. The argument can be any @@ -240,6 +257,8 @@ See Math::BigInt's bfround() function for details. perl -Mbignum=p,5 -le 'print 123456789+123' +Note that setting precision and accurary at the same time is not possible. + =item t or trace This enables a trace mode and is primarily for debugging bigint or @@ -252,7 +271,11 @@ Load a different math lib, see L. perl -Mbigint=l,GMP -e 'print 2 ** 512' Currently there is no way to specify more than one library on the command -line. This will be hopefully fixed soon ;) +line. This means the following does not work: + + perl -Mbignum=l,GMP,Pari -e 'print 2 ** 512' + +This will be hopefully fixed soon ;) =item v or version @@ -260,6 +283,8 @@ This prints out the name and version of all modules used and then exits. perl -Mbigint=v +=back + =head2 Math Library Math with the numbers is done (by default) by a module called @@ -306,6 +331,29 @@ Since all numbers are now objects, you can use all functions that are part of the BigInt API. You can only use the bxxx() notation, and not the fxxx() notation, though. +=over 2 + +=item inf() + +A shortcut to return Math::BigInt->binf(). Useful because Perl does not always +handle bareword C properly. + +=item NaN() + +A shortcut to return Math::BigInt->bnan(). Useful because Perl does not always +handle bareword C properly. + +=item upgrade() + +Return the class that numbers are upgraded to, is in fact returning +C<$Math::BigInt::upgrade>. + +=back + +=head2 MATH LIBRARY + +Math with the numbers is done (by default) by a module called + =head2 Caveat But a warning is in order. When using the following to make a copy of a number, @@ -364,6 +412,7 @@ to compare them to the results under -Mbignum or -Mbigrat: perl -Mbigint -le 'print log(2)' perl -Mbigint -le 'print 2 ** 0.5' perl -Mbigint=a,65 -le 'print 2 ** 0.2' + perl -Mbignum=a,65,l,GMP -le 'print 7 ** 7777' =head1 LICENSE @@ -380,6 +429,6 @@ as L, L and L. =head1 AUTHORS -(C) by Tels L in early 2002 - 2005. +(C) by Tels L in early 2002 - 2007. =cut diff --git a/lib/bignum.pm b/lib/bignum.pm index 79fb685..7796d47 100644 --- a/lib/bignum.pm +++ b/lib/bignum.pm @@ -1,13 +1,14 @@ package bignum; -require 5.005; +use 5.006002; -$VERSION = '0.17'; +$VERSION = '0.19'; use Exporter; @EXPORT_OK = qw( ); @EXPORT = qw( inf NaN ); @ISA = qw( Exporter ); use strict; +use overload; ############################################################################## @@ -55,7 +56,20 @@ sub upgrade # $Math::BigInt::upgrade = $_[0]; # $Math::BigFloat::upgrade = $_[0]; # } - return $Math::BigInt::upgrade; + $Math::BigInt::upgrade; + } + +sub _binary_constant + { + # this takes a binary/hexadecimal/octal constant string and returns it + # as string suitable for new. Basically it converts octal to decimal, and + # passes every thing else unmodified back. + my $string = shift; + + return Math::BigInt->new($string) if $string =~ /^0[bx]/; + + # so it must be an octal constant + Math::BigInt->from_oct($string); } sub import @@ -141,7 +155,7 @@ sub import require Math::BigInt if $_lite == 0; # not already loaded? $class = 'Math::BigInt'; # regardless of MBIL or not } - push @import, 'lib' => $lib if $lib ne ''; + push @import, 'try' => $lib if $lib ne ''; # Math::BigInt::Trace or plain Math::BigInt $class->import(@import, upgrade => $upgrade); @@ -168,6 +182,10 @@ sub import print "Math::BigFloat\t\t v$Math::BigFloat::VERSION\n"; exit; } + + # Take care of octal/hexadecimal constants + overload::constant 'binary' => sub { _binary_constant(shift) }; + $self->export_to_level(1,$self,@a); # export inf and NaN } @@ -307,6 +325,8 @@ than or equal to zero. See Math::BigInt's bround() function for details. perl -Mbignum=a,50 -le 'print sqrt(20)' +Note that setting precision and accurary at the same time is not possible. + =item p or precision This sets the precision for all math operations. The argument can be any @@ -316,6 +336,8 @@ integer. See Math::BigInt's bfround() function for details. perl -Mbignum=p,-50 -le 'print sqrt(20)' +Note that setting precision and accurary at the same time is not possible. + =item t or trace This enables a trace mode and is primarily for debugging bignum or @@ -328,7 +350,11 @@ Load a different math lib, see L. perl -Mbignum=l,GMP -e 'print 2 ** 512' Currently there is no way to specify more than one library on the command -line. This will be hopefully fixed soon ;) +line. This means the following does not work: + + perl -Mbignum=l,GMP,Pari -e 'print 2 ** 512' + +This will be hopefully fixed soon ;) =item v or version @@ -336,6 +362,8 @@ This prints out the name and version of all modules used and then exits. perl -Mbignum=v +=back + =head2 Methods Beside import() and AUTOLOAD() there are only a few other methods. @@ -466,6 +494,7 @@ Some cool command line examples to impress the Python crowd ;) perl -Mbignum -le 'print log(2)' perl -Mbignum -le 'print 2 ** 0.5' perl -Mbignum=a,65 -le 'print 2 ** 0.2' + perl -Mbignum=a,65,l,GMP -le 'print 7 ** 7777' =head1 LICENSE @@ -481,6 +510,6 @@ as L, L and L. =head1 AUTHORS -(C) by Tels L in early 2002, 2003. +(C) by Tels L in early 2002 - 2007. =cut diff --git a/lib/bignum/t/bigint.t b/lib/bignum/t/bigint.t index b0c8f39..03fb11b 100755 --- a/lib/bignum/t/bigint.t +++ b/lib/bignum/t/bigint.t @@ -10,7 +10,7 @@ BEGIN $| = 1; chdir 't' if -d 't'; unshift @INC, '../lib'; - plan tests => 32; + plan tests => 36; } use bigint; @@ -40,7 +40,19 @@ foreach (qw/ { my ($x,$y) = split /:/; print "# Try $x\n"; - ok (bigint::_constant("$x"),"$y"); + ok (bigint::_float_constant("$x"),"$y"); + } + +foreach (qw/ + 0100:64 + 0200:128 + 0x100:256 + 0b1001:9 + /) + { + my ($x,$y) = split /:/; + print "# Try $x\n"; + ok (bigint::_binary_constant("$x"),"$y"); } ############################################################################### diff --git a/lib/bigrat.pm b/lib/bigrat.pm index 6b33b71..f326e23 100644 --- a/lib/bigrat.pm +++ b/lib/bigrat.pm @@ -1,13 +1,14 @@ package bigrat; -require 5.005; +use 5.006002; -$VERSION = '0.08'; +$VERSION = '0.09'; require Exporter; @ISA = qw( Exporter ); @EXPORT_OK = qw( ); @EXPORT = qw( inf NaN ); use strict; +use overload; ############################################################################## @@ -56,7 +57,20 @@ sub upgrade # $Math::BigInt::upgrade = $_[0]; # $Math::BigFloat::upgrade = $_[0]; # } - return $Math::BigInt::upgrade; + $Math::BigInt::upgrade; + } + +sub _binary_constant + { + # this takes a binary/hexadecimal/octal constant string and returns it + # as string suitable for new. Basically it converts octal to decimal, and + # passes every thing else unmodified back. + my $string = shift; + + return Math::BigInt->new($string) if $string =~ /^0[bx]/; + + # so it must be an octal constant + Math::BigInt->from_oct($string); } sub import @@ -159,6 +173,10 @@ sub import print "Math::BigRat\t\t v$Math::BigRat::VERSION\n"; exit; } + + # Take care of octal/hexadecimal constants + overload::constant binary => sub { _binary_constant(shift) }; + $self->export_to_level(1,$self,@a); # export inf and NaN } @@ -236,7 +254,30 @@ the BigInt or BigFloat API. It is wise to use only the bxxx() notation, and not the fxxx() notation, though. This makes you independed on the fact that the underlying object might morph into a different class than BigFloat. -=head2 Caveat +=over 2 + +=item inf() + +A shortcut to return Math::BigInt->binf(). Useful because Perl does not always +handle bareword C properly. + +=item NaN() + +A shortcut to return Math::BigInt->bnan(). Useful because Perl does not always +handle bareword C properly. + +=item upgrade() + +Return the class that numbers are upgraded to, is in fact returning +C<$Math::BigInt::upgrade>. + +=back + +=head2 MATH LIBRARY + +Math with the numbers is done (by default) by a module called + +=head2 Cavaet But a warning is in order. When using the following to make a copy of a number, only a shallow copy will be made. @@ -289,6 +330,8 @@ than or equal to zero. See Math::BigInt's bround() function for details. perl -Mbigrat=a,50 -le 'print sqrt(20)' +Note that setting precision and accurary at the same time is not possible. + =item p or precision This sets the precision for all math operations. The argument can be any @@ -298,6 +341,8 @@ integer. See Math::BigInt's bfround() function for details. perl -Mbigrat=p,-50 -le 'print sqrt(20)' +Note that setting precision and accurary at the same time is not possible. + =item t or trace This enables a trace mode and is primarily for debugging bignum or @@ -310,7 +355,11 @@ Load a different math lib, see L. perl -Mbigrat=l,GMP -e 'print 2 ** 512' Currently there is no way to specify more than one library on the command -line. This will be hopefully fixed soon ;) +line. This means the following does not work: + + perl -Mbignum=l,GMP,Pari -e 'print 2 ** 512' + +This will be hopefully fixed soon ;) =item v or version @@ -318,6 +367,8 @@ This prints out the name and version of all modules used and then exits. perl -Mbigrat=v +=back + =head1 EXAMPLES perl -Mbigrat -le 'print sqrt(33)' @@ -325,6 +376,7 @@ This prints out the name and version of all modules used and then exits. perl -Mbigrat -le 'print 4.5+2*255' perl -Mbigrat -le 'print 3/7 + 5/7 + 8/3' perl -Mbigrat -le 'print 12->is_odd()'; + perl -Mbignum=l,GMP -le 'print 7 ** 7777' =head1 LICENSE @@ -340,6 +392,6 @@ as L, L and L. =head1 AUTHORS -(C) by Tels L in early 2002 - 2005. +(C) by Tels L in early 2002 - 2007. =cut