diff options
| -rw-r--r-- | lib/version.pm | 45 | ||||
| -rw-r--r-- | lib/version.t | 452 | ||||
| -rw-r--r-- | universal.c | 50 | ||||
| -rw-r--r-- | util.c | 10 |
4 files changed, 351 insertions, 206 deletions
diff --git a/lib/version.pm b/lib/version.pm index 998180b2f5..9201a02157 100644 --- a/lib/version.pm +++ b/lib/version.pm @@ -4,22 +4,53 @@ package version; use 5.005_04; use strict; -use vars qw(@ISA $VERSION $CLASS *qv); +use vars qw(@ISA $VERSION $CLASS *declare *qv); -$VERSION = 0.76; +$VERSION = 0.77; $CLASS = 'version'; # Preloaded methods go here. sub import { - my ($class) = @_; - my $callpkg = caller(); no strict 'refs'; + my ($class) = shift; + + # Set up any derived class + unless ($class eq 'version') { + local $^W; + *{$class.'::declare'} = \&version::declare; + *{$class.'::qv'} = \&version::qv; + } + + my %args; + if (@_) { # any remaining terms are arguments + map { $args{$_} = 1 } @_ + } + else { # no parameters at all on use line + %args = + ( + qv => 1, + 'UNIVERSAL::VERSION' => 1, + ); + } - *{$callpkg."::qv"} = - sub {return bless version::qv(shift), $class } - unless defined (&{"$callpkg\::qv"}); + my $callpkg = caller(); + + if (exists($args{declare})) { + *{$callpkg."::declare"} = + sub {return $class->declare(shift) } + unless defined(&{$callpkg.'::declare'}); + } + + if (exists($args{qv})) { + *{$callpkg."::qv"} = + sub {return $class->qv(shift) } + unless defined(&{"$callpkg\::qv"}); + } + if (exists($args{'VERSION'})) { + *{$callpkg."::VERSION"} = \&version::_VERSION; + } } 1; diff --git a/lib/version.t b/lib/version.t index 47989e3394..580ad1eecb 100644 --- a/lib/version.t +++ b/lib/version.t @@ -9,40 +9,79 @@ use Data::Dumper; require Test::Harness; no warnings 'once'; *Verbose = \$Test::Harness::Verbose; - -diag "Tests with base class" unless $ENV{PERL_CORE}; +use POSIX qw/locale_h/; +use File::Temp qw/tempfile/; +use File::Basename; BEGIN { - use_ok("version", 0.50); # If we made it this far, we are ok. + use_ok("version", 0.77); + # If we made it this far, we are ok. } -BaseTests("version"); +my $Verbose; + +diag "Tests with base class" unless $ENV{PERL_CORE}; -diag "Tests with empty derived class" unless $ENV{PERL_CORE}; +BaseTests("version","new","qv"); +BaseTests("version","new","declare"); +BaseTests("version","parse", "qv"); +BaseTests("version","parse", "declare"); -package version::Empty; -use base version; -$VERSION = 0.01; -no warnings 'redefine'; -*::qv = sub { return bless version::qv(shift), __PACKAGE__; }; +# dummy up a redundant call to satify David Wheeler +local $SIG{__WARN__} = sub { die $_[0] }; +eval 'use version;'; +unlike ($@, qr/^Subroutine main::declare redefined/, + "Only export declare once per package (to prevent redefined warnings)."); package version::Bad; -use base version; +use base 'version'; sub new { my($self,$n)=@_; bless \$n, $self } package main; -my $testobj = version::Empty->new(1.002_003); -isa_ok( $testobj, "version::Empty" ); + +my $warning; +local $SIG{__WARN__} = sub { $warning = $_[0] }; +my ($fh, $filename) = tempfile('tXXXXXXX', SUFFIX => '.pm', UNLINK => 1); +(my $package = basename($filename)) =~ s/\.pm$//; +print $fh <<"EOF"; +# This is an empty subclass +package $package; +use base 'version'; +use vars '\$VERSION'; +\$VERSION=0.001; +EOF +close $fh; + +sub main_reset { + delete $main::INC{'$package'}; + undef &qv; undef *::qv; # avoid 'used once' warning + undef &declare; undef *::declare; # avoid 'used once' warning +} + +diag "Tests with empty derived class" unless $ENV{PERL_CORE}; + +use_ok($package, 0.001); +my $testobj = $package->new(1.002_003); +isa_ok( $testobj, $package ); ok( $testobj->numify == 1.002003, "Numified correctly" ); ok( $testobj->stringify eq "1.002003", "Stringified correctly" ); ok( $testobj->normal eq "v1.2.3", "Normalified correctly" ); -my $verobj = version->new("1.2.4"); +my $verobj = version::->new("1.2.4"); ok( $verobj > $testobj, "Comparison vs parent class" ); -ok( $verobj gt $testobj, "Comparison vs parent class" ); -BaseTests("version::Empty"); -diag "tests with bad subclass" unless $ENV{PERL_CORE}; +BaseTests($package, "new", "qv"); +main_reset; +use_ok($package, 0.001, "declare"); +BaseTests($package, "new", "declare"); +main_reset; +use_ok($package, 0.001); +BaseTests($package, "parse", "qv"); +main_reset; +use_ok($package, 0.001, "declare"); +BaseTests($package, "parse", "declare"); + +diag "tests with bad subclass" unless $ENV{PERL_CORE}; $testobj = version::Bad->new(1.002_003); isa_ok( $testobj, "version::Bad" ); eval { my $string = $testobj->numify }; @@ -54,64 +93,58 @@ like($@, qr/Invalid version object/, eval { my $string = $testobj->stringify }; like($@, qr/Invalid version object/, "Bad subclass stringify"); -eval { my $test = $testobj > 1.0 }; +eval { my $test = ($testobj > 1.0) }; like($@, qr/Invalid version object/, "Bad subclass vcmp"); -# dummy up a redundant call to satify David Wheeler -local $SIG{__WARN__} = sub { die $_[0] }; -eval 'use version;'; -unlike ($@, qr/^Subroutine main::qv redefined/, - "Only export qv once per package (to prevent redefined warnings)."); - sub BaseTests { - my ($CLASS, $no_qv) = @_; + my ($CLASS, $method, $qv_declare) = @_; # Insert your test code below, the Test module is use()ed here so read # its man page ( perldoc Test ) for help writing this test script. # Test bare number processing - diag "tests with bare numbers" if $Verbose; - $version = $CLASS->new(5.005_03); + diag "tests with bare numbers" unless $ENV{PERL_CORE}; + $version = $CLASS->$method(5.005_03); is ( "$version" , "5.00503" , '5.005_03 eq 5.00503' ); - $version = $CLASS->new(1.23); + $version = $CLASS->$method(1.23); is ( "$version" , "1.23" , '1.23 eq "1.23"' ); # Test quoted number processing - diag "tests with quoted numbers" if $Verbose; - $version = $CLASS->new("5.005_03"); + diag "tests with quoted numbers" unless $ENV{PERL_CORE}; + $version = $CLASS->$method("5.005_03"); is ( "$version" , "5.005_03" , '"5.005_03" eq "5.005_03"' ); - $version = $CLASS->new("v1.23"); + $version = $CLASS->$method("v1.23"); is ( "$version" , "v1.23" , '"v1.23" eq "v1.23"' ); # Test stringify operator - diag "tests with stringify" if $Verbose; - $version = $CLASS->new("5.005"); + diag "tests with stringify" unless $ENV{PERL_CORE}; + $version = $CLASS->$method("5.005"); is ( "$version" , "5.005" , '5.005 eq "5.005"' ); - $version = $CLASS->new("5.006.001"); + $version = $CLASS->$method("5.006.001"); is ( "$version" , "5.006.001" , '5.006.001 eq v5.6.1' ); - $version = $CLASS->new("1.2.3_4"); + $version = $CLASS->$method("1.2.3_4"); is ( "$version" , "1.2.3_4" , 'alpha version 1.2.3_4 eq v1.2.3_4' ); # test illegal formats - diag "test illegal formats" if $Verbose; - eval {my $version = $CLASS->new("1.2_3_4")}; + diag "test illegal formats" unless $ENV{PERL_CORE}; + eval {my $version = $CLASS->$method("1.2_3_4")}; like($@, qr/multiple underscores/, "Invalid version format (multiple underscores)"); - eval {my $version = $CLASS->new("1.2_3.4")}; + eval {my $version = $CLASS->$method("1.2_3.4")}; like($@, qr/underscores before decimal/, "Invalid version format (underscores before decimal)"); - eval {my $version = $CLASS->new("1_2")}; + eval {my $version = $CLASS->$method("1_2")}; like($@, qr/alpha without decimal/, "Invalid version format (alpha without decimal)"); # for this first test, just upgrade the warn() to die() eval { local $SIG{__WARN__} = sub { die $_[0] }; - $version = $CLASS->new("1.2b3"); + $version = $CLASS->$method("1.2b3"); }; my $warnregex = "Version string '.+' contains invalid data; ". "ignoring: '.+'"; @@ -123,7 +156,7 @@ sub BaseTests { { my $warning; local $SIG{__WARN__} = sub { $warning = $_[0] }; - $version = $CLASS->new("99 and 44/100 pure"); + $version = $CLASS->$method("99 and 44/100 pure"); like($warning, qr/$warnregex/, "Version string contains invalid data; ignoring"); @@ -131,13 +164,13 @@ sub BaseTests { ok ($version->numify == 99.0, '$version->numify == 99.0'); ok ($version->normal eq "v99.0.0", '$version->normal eq v99.0.0'); - $version = $CLASS->new("something"); + $version = $CLASS->$method("something"); like($warning, qr/$warnregex/, "Version string contains invalid data; ignoring"); ok (defined $version, 'defined $version'); # reset the test object to something reasonable - $version = $CLASS->new("1.2.3"); + $version = $CLASS->$method("1.2.3"); # Test boolean operator ok ($version, 'boolean'); @@ -146,53 +179,53 @@ sub BaseTests { isa_ok ( $version, $CLASS ); # Test comparison operators with self - diag "tests with self" if $Verbose; + diag "tests with self" unless $ENV{PERL_CORE}; is ( $version <=> $version, 0, '$version <=> $version == 0' ); ok ( $version == $version, '$version == $version' ); # Test Numeric Comparison operators # test first with non-object - $version = $CLASS->new("5.006.001"); + $version = $CLASS->$method("5.006.001"); $new_version = "5.8.0"; - diag "numeric tests with non-objects" if $Verbose; + diag "numeric tests with non-objects" unless $ENV{PERL_CORE}; ok ( $version == $version, '$version == $version' ); ok ( $version < $new_version, '$version < $new_version' ); ok ( $new_version > $version, '$new_version > $version' ); ok ( $version != $new_version, '$version != $new_version' ); # now test with existing object - $new_version = $CLASS->new($new_version); - diag "numeric tests with objects" if $Verbose; + $new_version = $CLASS->$method($new_version); + diag "numeric tests with objects" unless $ENV{PERL_CORE}; ok ( $version < $new_version, '$version < $new_version' ); ok ( $new_version > $version, '$new_version > $version' ); ok ( $version != $new_version, '$version != $new_version' ); # now test with actual numbers - diag "numeric tests with numbers" if $Verbose; + diag "numeric tests with numbers" unless $ENV{PERL_CORE}; ok ( $version->numify() == 5.006001, '$version->numify() == 5.006001' ); ok ( $version->numify() <= 5.006001, '$version->numify() <= 5.006001' ); ok ( $version->numify() < 5.008, '$version->numify() < 5.008' ); #ok ( $version->numify() > v5.005_02, '$version->numify() > 5.005_02' ); # test with long decimals - diag "Tests with extended decimal versions" if $Verbose; - $version = $CLASS->new(1.002003); + diag "Tests with extended decimal versions" unless $ENV{PERL_CORE}; + $version = $CLASS->$method(1.002003); ok ( $version == "1.2.3", '$version == "1.2.3"'); ok ( $version->numify == 1.002003, '$version->numify == 1.002003'); - $version = $CLASS->new("2002.09.30.1"); + $version = $CLASS->$method("2002.09.30.1"); ok ( $version == "2002.9.30.1",'$version == 2002.9.30.1'); ok ( $version->numify == 2002.009030001, '$version->numify == 2002.009030001'); # now test with alpha version form with string - $version = $CLASS->new("1.2.3"); + $version = $CLASS->$method("1.2.3"); $new_version = "1.2.3_4"; - diag "numeric tests with alpha-style non-objects" if $Verbose; + diag "numeric tests with alpha-style non-objects" unless $ENV{PERL_CORE}; ok ( $version < $new_version, '$version < $new_version' ); ok ( $new_version > $version, '$new_version > $version' ); ok ( $version != $new_version, '$version != $new_version' ); - $version = $CLASS->new("1.2.4"); + $version = $CLASS->$method("1.2.4"); diag "numeric tests with alpha-style non-objects" if $Verbose; ok ( $version > $new_version, '$version > $new_version' ); @@ -200,44 +233,44 @@ sub BaseTests { ok ( $version != $new_version, '$version != $new_version' ); # now test with alpha version form with object - $version = $CLASS->new("1.2.3"); - $new_version = $CLASS->new("1.2.3_4"); - diag "tests with alpha-style objects" if $Verbose; + $version = $CLASS->$method("1.2.3"); + $new_version = $CLASS->$method("1.2.3_4"); + diag "tests with alpha-style objects" unless $ENV{PERL_CORE}; ok ( $version < $new_version, '$version < $new_version' ); ok ( $new_version > $version, '$new_version > $version' ); ok ( $version != $new_version, '$version != $new_version' ); ok ( !$version->is_alpha, '!$version->is_alpha'); ok ( $new_version->is_alpha, '$new_version->is_alpha'); - $version = $CLASS->new("1.2.4"); - diag "tests with alpha-style objects" if $Verbose; + $version = $CLASS->$method("1.2.4"); + diag "tests with alpha-style objects" unless $ENV{PERL_CORE}; ok ( $version > $new_version, '$version > $new_version' ); ok ( $new_version < $version, '$new_version < $version' ); ok ( $version != $new_version, '$version != $new_version' ); - $version = $CLASS->new("1.2.3.4"); - $new_version = $CLASS->new("1.2.3_4"); + $version = $CLASS->$method("1.2.3.4"); + $new_version = $CLASS->$method("1.2.3_4"); diag "tests with alpha-style objects with same subversion" if $Verbose; ok ( $version > $new_version, '$version > $new_version' ); ok ( $new_version < $version, '$new_version < $version' ); ok ( $version != $new_version, '$version != $new_version' ); - diag "test implicit [in]equality" if $Verbose; - $version = $CLASS->new("v1.2.3"); - $new_version = $CLASS->new("1.2.3.0"); + diag "test implicit [in]equality" unless $ENV{PERL_CORE}; + $version = $CLASS->$method("v1.2.3"); + $new_version = $CLASS->$method("1.2.3.0"); ok ( $version == $new_version, '$version == $new_version' ); - $new_version = $CLASS->new("1.2.3_0"); + $new_version = $CLASS->$method("1.2.3_0"); ok ( $version == $new_version, '$version == $new_version' ); - $new_version = $CLASS->new("1.2.3.1"); + $new_version = $CLASS->$method("1.2.3.1"); ok ( $version < $new_version, '$version < $new_version' ); - $new_version = $CLASS->new("1.2.3_1"); + $new_version = $CLASS->$method("1.2.3_1"); ok ( $version < $new_version, '$version < $new_version' ); - $new_version = $CLASS->new("1.1.999"); + $new_version = $CLASS->$method("1.1.999"); ok ( $version > $new_version, '$version > $new_version' ); # that which is not expressly permitted is forbidden - diag "forbidden operations" if $Verbose; + diag "forbidden operations" unless $ENV{PERL_CORE}; ok ( !eval { ++$version }, "noop ++" ); ok ( !eval { --$version }, "noop --" ); ok ( !eval { $version/1 }, "noop /" ); @@ -245,61 +278,62 @@ sub BaseTests { ok ( !eval { abs($version) }, "noop abs" ); SKIP: { - skip "version require'd instead of use'd, cannot test qv", 3 - if defined $no_qv; - # test the qv() sub - diag "testing qv" if $Verbose; - $version = qv("1.2"); - is ( "$version", "v1.2", 'qv("1.2") == "1.2.0"' ); - $version = qv(1.2); - is ( "$version", "v1.2", 'qv(1.2) == "1.2.0"' ); - isa_ok( qv('5.008'), $CLASS ); + skip "version require'd instead of use'd, cannot test $qv_declare", 3 + unless defined $qv_declare; + # test the $qv_declare() sub + diag "testing $qv_declare" unless $ENV{PERL_CORE}; + $version = $CLASS->$qv_declare("1.2"); + is ( "$version", "v1.2", $qv_declare.'("1.2") == "1.2.0"' ); + $version = $CLASS->$qv_declare(1.2); + is ( "$version", "v1.2", $qv_declare.'(1.2) == "1.2.0"' ); + isa_ok( $CLASS->$qv_declare('5.008'), $CLASS ); } # test creation from existing version object - diag "create new from existing version" if $Verbose; - ok (eval {$new_version = $CLASS->new($version)}, + diag "create new from existing version" unless $ENV{PERL_CORE}; + ok (eval {$new_version = $CLASS->$method($version)}, "new from existing object"); - ok ($new_version == $version, "class->new($version) identical"); - $new_version = $version->new(); + ok ($new_version == $version, "class->$method($version) identical"); + $new_version = $version->$method(); isa_ok ($new_version, $CLASS ); - is ($new_version, "0", "version->new() doesn't clone"); - $new_version = $version->new("1.2.3"); - is ($new_version, "1.2.3" , '$version->new("1.2.3") works too'); + is ($new_version, "0", "version->$method() doesn't clone"); + $new_version = $version->$method("1.2.3"); + is ($new_version, "1.2.3" , '$version->$method("1.2.3") works too'); # test the CVS revision mode - diag "testing CVS Revision" if $Verbose; + diag "testing CVS Revision" unless $ENV{PERL_CORE}; $version = new $CLASS qw$Revision: 1.2$; ok ( $version == "1.2.0", 'qw$Revision: 1.2$ == 1.2.0' ); $version = new $CLASS qw$Revision: 1.2.3.4$; ok ( $version == "1.2.3.4", 'qw$Revision: 1.2.3.4$ == 1.2.3.4' ); # test the CPAN style reduced significant digit form - diag "testing CPAN-style versions" if $Verbose; - $version = $CLASS->new("1.23_01"); + diag "testing CPAN-style versions" unless $ENV{PERL_CORE}; + $version = $CLASS->$method("1.23_01"); is ( "$version" , "1.23_01", "CPAN-style alpha version" ); ok ( $version > 1.23, "1.23_01 > 1.23"); ok ( $version < 1.24, "1.23_01 < 1.24"); # test reformed UNIVERSAL::VERSION - diag "Replacement UNIVERSAL::VERSION tests" if $Verbose; + diag "Replacement UNIVERSAL::VERSION tests" unless $ENV{PERL_CORE}; my $error_regex = $] < 5.006 ? 'version \d required' - : 'does not define \$...::VERSION'; + : 'does not define \$t.{7}::VERSION'; { - open F, ">aaa.pm" or die "Cannot open aaa.pm: $!\n"; - print F "package aaa;\n\$aaa::VERSION=0.58;\n1;\n"; - close F; + my ($fh, $filename) = tempfile('tXXXXXXX', SUFFIX => '.pm', UNLINK => 1); + (my $package = basename($filename)) =~ s/\.pm$//; + print $fh "package $package;\n\$$package\::VERSION=0.58;\n1;\n"; + close $fh; $version = 0.58; - eval "use lib '.'; use aaa $version"; - unlike($@, qr/aaa version $version/, + eval "use lib '.'; use $package $version"; + unlike($@, qr/$package version $version/, 'Replacement eval works with exact version'); # test as class method - $new_version = "aaa"->VERSION; + $new_version = $package->VERSION; cmp_ok($new_version,'==',$version, "Called as class method"); eval "print Completely::Unknown::Module->VERSION"; @@ -314,30 +348,31 @@ SKIP: { # this should fail even with old UNIVERSAL::VERSION $version += 0.01; - eval "use lib '.'; use aaa $version"; - like($@, qr/aaa version $version/, + eval "use lib '.'; use $package $version"; + like($@, qr/$package version $version/, 'Replacement eval works with incremented version'); $version =~ s/0+$//; #convert to string and remove trailing 0's chop($version); # shorten by 1 digit, should still succeed - eval "use lib '.'; use aaa $version"; - unlike($@, qr/aaa version $version/, + eval "use lib '.'; use $package $version"; + unlike($@, qr/$package version $version/, 'Replacement eval works with single digit'); # this would fail with old UNIVERSAL::VERSION $version += 0.1; - eval "use lib '.'; use aaa $version"; - like($@, qr/aaa version $version/, + eval "use lib '.'; use $package $version"; + like($@, qr/$package version $version/, 'Replacement eval works with incremented digit'); - unlink 'aaa.pm'; + unlink $filename; } { # dummy up some variously broken modules for testing - open F, ">xxx.pm" or die "Cannot open xxx.pm: $!\n"; - print F "1;\n"; - close F; + my ($fh, $filename) = tempfile('tXXXXXXX', SUFFIX => '.pm', UNLINK => 1); + (my $package = basename($filename)) =~ s/\.pm$//; + print $fh "1;\n"; + close $fh; - eval "use lib '.'; use xxx 3;"; + eval "use lib '.'; use $package 3;"; if ( $] < 5.008 ) { like($@, qr/$error_regex/, 'Replacement handles modules without package or VERSION'); @@ -346,207 +381,246 @@ SKIP: { like($@, qr/defines neither package nor VERSION/, 'Replacement handles modules without package or VERSION'); } - eval "use lib '.'; use xxx; \$version = xxx->VERSION"; + eval "use lib '.'; use $package; \$version = $package->VERSION"; unlike ($@, qr/$error_regex/, 'Replacement handles modules without package or VERSION'); ok (!defined($version), "Called as class method"); - unlink 'xxx.pm'; + unlink $filename; } { # dummy up some variously broken modules for testing - open F, ">yyy.pm" or die "Cannot open yyy.pm: $!\n"; - print F "package yyy;\n#look ma no VERSION\n1;\n"; - close F; - eval "use lib '.'; use yyy 3;"; + my ($fh, $filename) = tempfile('tXXXXXXX', SUFFIX => '.pm', UNLINK => 1); + (my $package = basename($filename)) =~ s/\.pm$//; + print $fh "package $package;\n#look ma no VERSION\n1;\n"; + close $fh; + eval "use lib '.'; use $package 3;"; like ($@, qr/$error_regex/, 'Replacement handles modules without VERSION'); - eval "use lib '.'; use yyy; print yyy->VERSION"; + eval "use lib '.'; use $package; print $package->VERSION"; unlike ($@, qr/$error_regex/, 'Replacement handles modules without VERSION'); - unlink 'yyy.pm'; + unlink $filename; } { # dummy up some variously broken modules for testing - open F, ">zzz.pm" or die "Cannot open zzz.pm: $!\n"; - print F "package zzz;\n\@VERSION = ();\n1;\n"; - close F; - eval "use lib '.'; use zzz 3;"; + my ($fh, $filename) = tempfile('tXXXXXXX', SUFFIX => '.pm', UNLINK => 1); + (my $package = basename($filename)) =~ s/\.pm$//; + print $fh "package $package;\n\@VERSION = ();\n1;\n"; + close $fh; + eval "use lib '.'; use $package 3;"; like ($@, qr/$error_regex/, 'Replacement handles modules without VERSION'); - eval "use lib '.'; use zzz; print zzz->VERSION"; + eval "use lib '.'; use $package; print $package->VERSION"; unlike ($@, qr/$error_regex/, 'Replacement handles modules without VERSION'); - unlink 'zzz.pm'; + unlink $filename; } SKIP: { skip 'Cannot test bare v-strings with Perl < 5.6.0', 4 if $] < 5.006_000; - diag "Tests with v-strings" if $Verbose; - $version = $CLASS->new(1.2.3); + diag "Tests with v-strings" unless $ENV{PERL_CORE}; + $version = $CLASS->$method(1.2.3); ok("$version" == "v1.2.3", '"$version" == 1.2.3'); - $version = $CLASS->new(1.0.0); - $new_version = $CLASS->new(1); + $version = $CLASS->$method(1.0.0); + $new_version = $CLASS->$method(1); ok($version == $new_version, '$version == $new_version'); - skip "version require'd instead of use'd, cannot test qv", 1 - if defined $no_qv; - $version = qv(1.2.3); - ok("$version" == "v1.2.3", 'v-string initialized qv()'); + skip "version require'd instead of use'd, cannot test declare", 1 + unless defined $qv_declare; + $version = &$qv_declare(1.2.3); + ok("$version" == "v1.2.3", 'v-string initialized $qv_declare()'); } - diag "Tests with real-world (malformed) data" if $Verbose; + diag "Tests with real-world (malformed) data" unless $ENV{PERL_CORE}; # trailing zero testing (reported by Andreas Koenig). - $version = $CLASS->new("1"); + $version = $CLASS->$method("1"); ok($version->numify eq "1.000", "trailing zeros preserved"); - $version = $CLASS->new("1.0"); + $version = $CLASS->$method("1.0"); ok($version->numify eq "1.000", "trailing zeros preserved"); - $version = $CLASS->new("1.0.0"); + $version = $CLASS->$method("1.0.0"); ok($version->numify eq "1.000000", "trailing zeros preserved"); - $version = $CLASS->new("1.0.0.0"); + $version = $CLASS->$method("1.0.0.0"); ok($version->numify eq "1.000000000", "trailing zeros preserved"); # leading zero testing (reported by Andreas Koenig). - $version = $CLASS->new(".7"); + $version = $CLASS->$method(".7"); ok($version->numify eq "0.700", "leading zero inferred"); # leading space testing (reported by Andreas Koenig). - $version = $CLASS->new(" 1.7"); + $version = $CLASS->$method(" 1.7"); ok($version->numify eq "1.700", "leading space ignored"); # RT 19517 - deal with undef and 'undef' initialization ok("$version" ne 'undef', "Undef version comparison #1"); ok("$version" ne undef, "Undef version comparison #2"); - $version = $CLASS->new('undef'); + $version = $CLASS->$method('undef'); unlike($warning, qr/^Version string 'undef' contains invalid data/, "Version string 'undef'"); - $version = $CLASS->new(undef); + $version = $CLASS->$method(undef); like($warning, qr/^Use of uninitialized value/, "Version string 'undef'"); ok($version == 'undef', "Undef version comparison #3"); ok($version == undef, "Undef version comparison #4"); - eval "\$version = \$CLASS->new()"; # no parameter at all + eval "\$version = \$CLASS->$method()"; # no parameter at all unlike($@, qr/^Bizarre copy of CODE/, "No initializer at all"); ok($version == 'undef', "Undef version comparison #5"); ok($version == undef, "Undef version comparison #6"); - $version = $CLASS->new(0.000001); + $version = $CLASS->$method(0.000001); unlike($warning, qr/^Version string '1e-06' contains invalid data/, "Very small version objects"); } SKIP: { + my $warning; + local $SIG{__WARN__} = sub { $warning = $_[0] }; # dummy up a legal module for testing RT#19017 - open F, ">www.pm" or die "Cannot open www.pm: $!\n"; - print F <<"EOF"; -package www; -use version; \$VERSION = qv('0.0.4'); + my ($fh, $filename) = tempfile('tXXXXXXX', SUFFIX => '.pm', UNLINK => 1); + (my $package = basename($filename)) =~ s/\.pm$//; + print $fh <<"EOF"; +package $package; +use $CLASS; \$VERSION = ${CLASS}->new('0.0.4'); 1; EOF - close F; + close $fh; - eval "use lib '.'; use www 0.000008;"; - like ($@, qr/^www version 0.000008 required/, + eval "use lib '.'; use $package 0.000008;"; + like ($@, qr/^$package version 0.000008 required/, "Make sure very small versions don't freak"); - eval "use lib '.'; use www 1;"; - like ($@, qr/^www version 1 required/, + eval "use lib '.'; use $package 1;"; + like ($@, qr/^$package version 1 required/, "Comparing vs. version with no decimal"); - eval "use lib '.'; use www 1.;"; - like ($@, qr/^www version 1 required/, + eval "use lib '.'; use $package 1.;"; + like ($@, qr/^$package version 1 required/, "Comparing vs. version with decimal only"); - if ( $] < 5.006_000 ) { - unlink 'www.pm'; skip 'Cannot "use" extended versions with Perl < 5.6.0', 3; } - eval "use lib '.'; use www v0.0.8;"; - my $regex = "^www version v0.0.8 required"; + eval "use lib '.'; use $package v0.0.8;"; + my $regex = "^$package version v0.0.8 required"; like ($@, qr/$regex/, "Make sure very small versions don't freak"); $regex =~ s/8/4/; # set for second test - eval "use lib '.'; use www v0.0.4;"; + eval "use lib '.'; use $package v0.0.4;"; unlike($@, qr/$regex/, 'Succeed - required == VERSION'); - cmp_ok ( "www"->VERSION, 'eq', '0.0.4', 'No undef warnings' ); - - unlink 'www.pm'; + cmp_ok ( $package->VERSION, 'eq', '0.0.4', 'No undef warnings' ); + unlink $filename; } - open F, ">vvv.pm" or die "Cannot open vvv.pm: $!\n"; - print F <<"EOF"; -package vvv; +SKIP: { + skip 'Cannot test "use base qw(version)" when require is used', 3 + unless defined $qv_declare; + my ($fh, $filename) = tempfile('tXXXXXXX', SUFFIX => '.pm', UNLINK => 1); + (my $package = basename($filename)) =~ s/\.pm$//; + print $fh <<"EOF"; +package $package; use base qw(version); 1; EOF - close F; - # need to eliminate any other qv()'s - undef *main::qv; - ok(!defined(&{"main\::qv"}), "make sure we cleared qv() properly"); - eval "use lib '.'; use vvv;"; - ok(defined(&{"main\::qv"}), "make sure we exported qv() properly"); - isa_ok( qv(1.2), "vvv"); - unlink 'vvv.pm'; + close $fh; + # need to eliminate any other $qv_declare()'s + undef *{"main\::$qv_declare"}; + ok(!defined(&{"main\::$qv_declare"}), "make sure we cleared $qv_declare() properly"); + eval "use lib '.'; use $package qw/declare qv/;"; + ok(defined(&{"main\::$qv_declare"}), "make sure we exported $qv_declare() properly"); + isa_ok( &$qv_declare(1.2), $package); + unlink $filename; +} SKIP: { if ( $] < 5.006_000 ) { skip 'Cannot "use" extended versions with Perl < 5.6.0', 3; } - open F, ">uuu.pm" or die "Cannot open uuu.pm: $!\n"; - print F <<"EOF"; -package uuu; + my ($fh, $filename) = tempfile('tXXXXXXX', SUFFIX => '.pm', UNLINK => 1); + (my $package = basename($filename)) =~ s/\.pm$//; + print $fh <<"EOF"; +package $package; \$VERSION = 1.0; 1; EOF - close F; - eval "use lib '.'; use uuu 1.001;"; - like ($@, qr/^uuu version 1.001 required/, + close $fh; + eval "use lib '.'; use $package 1.001;"; + like ($@, qr/^$package version 1.001 required/, "User typed numeric so we error with numeric"); - eval "use lib '.'; use uuu v1.1.0;"; - like ($@, qr/^uuu version v1.1.0 required/, + eval "use lib '.'; use $package v1.1.0;"; + like ($@, qr/^$package version v1.1.0 required/, "User typed extended so we error with extended"); - unlink 'uuu.pm'; + unlink $filename; } SKIP: { # test locale handling my $warning; local $SIG{__WARN__} = sub { $warning = $_[0] }; + +$DB::single = 1; + my $v = $CLASS->$method('1,7'); + unlike($warning, qr"Version string '1,7' contains invalid data", + 'Directly test comma as decimal compliance'); + my $ver = 1.23; # has to be floating point number + my $orig_loc = setlocale( LC_ALL ); my $loc; while (<DATA>) { chomp; - $loc = POSIX::setlocale( &POSIX::LC_ALL, $_); - last if POSIX::localeconv()->{decimal_point} eq ','; + $loc = setlocale( LC_ALL, $_); + last if localeconv()->{decimal_point} eq ','; } skip 'Cannot test locale handling without a comma locale', 4 unless ( $loc and ($ver eq '1,23') ); - diag ("Testing locale handling with $loc") if $Verbose; + diag ("Testing locale handling with $loc") unless $ENV{PERL_CORE}; - my $v = $CLASS->new($ver); - unlike($warning,qr/Version string '1,23' contains invalid data/, + $v = $CLASS->$method($ver); + unlike($warning, qr/Version string '1,23' contains invalid data/, "Process locale-dependent floating point"); is ($v, "1.23", "Locale doesn't apply to version objects"); ok ($v == $ver, "Comparison to locale floating point"); + + setlocale( LC_ALL, $orig_loc); # reset this before possible skip + skip 'Cannot test RT#46921 with Perl < 5.008', 1 + if ($] < 5.008); + skip 'Cannot test RT#46921 with pure Perl module', 1 + if exists $INC{'version/vpp.pm'}; + my ($fh, $filename) = tempfile('tXXXXXXX', SUFFIX => '.pm', UNLINK => 1); + (my $package = basename($filename)) =~ s/\.pm$//; + print $fh <<"EOF"; +package $package; +use POSIX qw(locale_h); +\$^W = 1; +use $CLASS; +setlocale (LC_ALL, '$loc'); +use $CLASS ; +eval "use Socket 1.7"; +setlocale( LC_ALL, '$orig_loc'); +1; +EOF + close $fh; + + eval "use lib '.'; use $package;"; + unlike($warning, qr"Version string '1,7' contains invalid data", + 'Handle locale action-at-a-distance'); } - eval 'my $v = $CLASS->new("1._1");'; + eval 'my $v = $CLASS->$method("1._1");'; unlike($@, qr/^Invalid version format \(alpha with zero width\)/, "Invalid version format 1._1"); { my $warning; local $SIG{__WARN__} = sub { $warning = $_[0] }; - eval 'my $v = $CLASS->new(~0);'; + eval 'my $v = $CLASS->$method(~0);'; unlike($@, qr/Integer overflow in version/, "Too large version"); like($warning, qr/Integer overflow in version/, "Too large version"); } { # http://rt.cpan.org/Public/Bug/Display.html?id=30004 - my $v1 = $CLASS->new("v0.1_1"); + my $v1 = $CLASS->$method("v0.1_1"); (my $alpha1 = Dumper($v1)) =~ s/.+'alpha' => ([^,]+),.+/$1/ms; - my $v2 = $CLASS->new($v1); + my $v2 = $CLASS->$method($v1); (my $alpha2 = Dumper($v2)) =~ s/.+'alpha' => ([^,]+),.+/$1/ms; is $alpha2, $alpha1, "Don't fall for Data::Dumper's tricks"; } diff --git a/universal.c b/universal.c index 1a76cfd884..d2c9e77760 100644 --- a/universal.c +++ b/universal.c @@ -221,6 +221,7 @@ XS(XS_version_noop); #endif XS(XS_version_is_alpha); XS(XS_version_qv); +XS(XS_version_is_qv); XS(XS_utf8_is_utf8); XS(XS_utf8_valid); XS(XS_utf8_encode); @@ -267,6 +268,7 @@ Perl_boot_core_UNIVERSAL(pTHX) /* Make it findable via fetchmethod */ newXS("version::()", XS_version_noop, file); newXS("version::new", XS_version_new, file); + newXS("version::parse", XS_version_new, file); newXS("version::(\"\"", XS_version_stringify, file); newXS("version::stringify", XS_version_stringify, file); newXS("version::(0+", XS_version_numify, file); @@ -281,6 +283,8 @@ Perl_boot_core_UNIVERSAL(pTHX) newXS("version::noop", XS_version_noop, file); newXS("version::is_alpha", XS_version_is_alpha, file); newXS("version::qv", XS_version_qv, file); + newXS("version::declare", XS_version_qv, file); + newXS("version::is_qv", XS_version_is_qv, file); } newXS("utf8::is_utf8", XS_utf8_is_utf8, file); newXS("utf8::valid", XS_utf8_valid, file); @@ -729,25 +733,53 @@ XS(XS_version_qv) { dVAR; dXSARGS; - if (items != 1) - croak_xs_usage(cv, "ver"); SP -= items; { - SV * ver = ST(0); - if ( !SvVOK(ver) ) { /* only need to do with if not already v-string */ - SV * const rv = sv_newmortal(); + SV * ver = ST(0); + SV * rv; + const char * classname = ""; + if ( items == 2 && (ST(1)) != &PL_sv_undef ) { + /* getting called as object or class method */ + ver = ST(1); + classname = + sv_isobject(ST(0)) /* class called as an object method */ + ? HvNAME_get(SvSTASH(SvRV(ST(0)))) + : (char *)SvPV_nolen(ST(0)); + } + if ( !SvVOK(ver) ) { /* not already a v-string */ + rv = sv_newmortal(); sv_setsv(rv,ver); /* make a duplicate */ upg_version(rv, TRUE); - PUSHs(rv); + } else { + rv = sv_2mortal(new_version(ver)); } - else - { - mPUSHs(new_version(ver)); + if ( items == 2 && strcmp(classname,"version") ) { /* inherited new() */ + sv_bless(rv, gv_stashpv(classname, GV_ADD)); } + PUSHs(rv); + } + PUTBACK; + return; +} +XS(XS_version_is_qv) +{ + dVAR; + dXSARGS; + if (items != 1) + croak_xs_usage(cv, "lobj"); + SP -= items; + if (sv_derived_from(ST(0), "version")) { + SV * const lobj = ST(0); + if ( hv_exists(MUTABLE_HV(SvRV(lobj)), "qv", 2 ) ) + XSRETURN_YES; + else + XSRETURN_NO; PUTBACK; return; } + else + Perl_croak(aTHX_ "lobj is not of type version"); } XS(XS_utf8_is_utf8) @@ -4229,7 +4229,7 @@ Perl_scan_version(pTHX_ const char *s, SV *rv, bool qv) pos = s; /* pre-scan the input string to check for decimals/underbars */ - while ( *pos == '.' || *pos == '_' || isDIGIT(*pos) ) + while ( *pos == '.' || *pos == '_' || *pos == ',' || isDIGIT(*pos) ) { if ( *pos == '.' ) { @@ -4245,6 +4245,12 @@ Perl_scan_version(pTHX_ const char *s, SV *rv, bool qv) alpha = 1; width = pos - last - 1; /* natural width of sub-version */ } + else if ( *pos == ',' && isDIGIT(pos[1]) ) + { + saw_period++ ; + last = pos; + } + pos++; } @@ -4332,6 +4338,8 @@ Perl_scan_version(pTHX_ const char *s, SV *rv, bool qv) s = ++pos; else if ( *pos == '_' && isDIGIT(pos[1]) ) s = ++pos; + else if ( *pos == ',' && isDIGIT(pos[1]) ) + s = ++pos; else if ( isDIGIT(*pos) ) s = pos; else { |