r2487 - in packages/libversion-perl/branches/upstream/current: .
lib lib/version t vperl vutil
Krzysztof Krzyzaniak
eloy at costa.debian.org
Thu Mar 30 12:20:57 UTC 2006
Author: eloy
Date: 2006-03-30 12:20:09 +0000 (Thu, 30 Mar 2006)
New Revision: 2487
Modified:
packages/libversion-perl/branches/upstream/current/Build.PL
packages/libversion-perl/branches/upstream/current/Changes
packages/libversion-perl/branches/upstream/current/META.yml
packages/libversion-perl/branches/upstream/current/README
packages/libversion-perl/branches/upstream/current/lib/version.pm
packages/libversion-perl/branches/upstream/current/lib/version.pod
packages/libversion-perl/branches/upstream/current/lib/version/typemap
packages/libversion-perl/branches/upstream/current/t/01base.t
packages/libversion-perl/branches/upstream/current/t/02derived.t
packages/libversion-perl/branches/upstream/current/t/coretests.pm
packages/libversion-perl/branches/upstream/current/vperl/vpp.pm
packages/libversion-perl/branches/upstream/current/vutil/ppport.h
packages/libversion-perl/branches/upstream/current/vutil/vutil.c
packages/libversion-perl/branches/upstream/current/vutil/vutil.h
packages/libversion-perl/branches/upstream/current/vutil/vxs.pm
Log:
Load /tmp/tmp.M9DkLp/libversion-perl-0.59 into
packages/libversion-perl/branches/upstream/current.
Modified: packages/libversion-perl/branches/upstream/current/Build.PL
===================================================================
--- packages/libversion-perl/branches/upstream/current/Build.PL 2006-03-29 20:57:18 UTC (rev 2486)
+++ packages/libversion-perl/branches/upstream/current/Build.PL 2006-03-30 12:20:09 UTC (rev 2487)
@@ -38,7 +38,7 @@
dynamic_config => 1,
);
-mkdir $t->config_dir();
+mkdir($t->config_dir(),0777);
if ( $perl_only or not $t->have_c_compiler() ) {
$build_arguments{module_name} = 'version::vpp';
Modified: packages/libversion-perl/branches/upstream/current/Changes
===================================================================
--- packages/libversion-perl/branches/upstream/current/Changes 2006-03-29 20:57:18 UTC (rev 2486)
+++ packages/libversion-perl/branches/upstream/current/Changes 2006-03-30 12:20:09 UTC (rev 2487)
@@ -1,8 +1,33 @@
-2006-02-26 John Peacock <jpeacock at cpan.org>
+john_peacock r233):
+ Complete compatibility with Perl 5.005_0x as well as 5.6.2.
+ Remove the compatibility warnings.pm (since it was a bad idea).
+ Release to CPAN.
+
+john_peacock r231):
+
+ Fix the pure Perl release for 5.005_0x (thanks to Nick Ing-Simmons).
+ Ready for release to CPAN.
+
+john_peacock r230):
+
+ Restore compatibility with Perl 5.6.x (though not with 5.005_x yet).
+
+john_peacock r228):
+
+ * lib/version.pod
+ Minor POD fixup (revealed by pod2html).
+
+ * t/coretests.pm
+ t/01base.t
+ t/02derived.t
+ Suppress status messages except when --verbose is used.
+
+jpeacock r226):
+
Release 0.57 to CPAN. Only bumps $VERSION and slightly improve Build.PL.
-2006-02-20 John Peacock <jpeacock at cpan.org>
+jpeacock r224):
Next beta release to CPAN.
@@ -16,7 +41,7 @@
vutil/vxs.pm
$VERSION++.
-2006-02-20 John Peacock <jpeacock at cpan.org>
+jpeacock r222):
Beta release to CPAN.
@@ -36,31 +61,31 @@
* t/coretests.pm
Additional tests (based on bleadperl t/op/use.t).
-2006-02-19 John Peacock <jpeacock at cpan.org>
+jpeacock r220):
Another workaround for incomplete testing
-2006-02-17 John Peacock <jpeacock at cpan.org>
+jpeacock r218):
Emergency release to fix up M::B 0.2611 problem
-2006-02-16 John Peacock <jpeacock at cpan.org>
+jpeacock r216):
Neglected to clean up after XS code (since we are playing games).
-2006-02-16 John Peacock <jpeacock at cpan.org>
+jpeacock r215):
No, really, the final changes before releasing to CPAN. :(
-2006-02-16 John Peacock <jpeacock at cpan.org>
+jpeacock r214):
Final updates for 0.54 release to CPAN.
-2006-02-14 John Peacock <jpeacock at cpan.org>
+jpeacock r213):
Merge from version-combined branch. Equivalent to RELEASE_0_53_03.
-2006-02-09 John Peacock <jpeacock at cpan.org>
+jpeacock r206):
Commit changes prior to push to implement pure Perl alternative.
@@ -73,7 +98,7 @@
* vutil/vutil.c
Sync with bleadperl. Only warn if 'use warnings' is set.
-2006-01-10 John Peacock <jpeacock at cpan.org>
+jpeacock r204):
Release 0.53 to CPAN.
@@ -91,7 +116,7 @@
lib/version/vxs.pm
Bump $VERSION.
-2006-01-06 John Peacock <jpeacock at cpan.org>
+jpeacock r202):
New version to deal with malformed input data that came up
in bleadperl:
@@ -114,7 +139,7 @@
* t/coretests.pm
Check for malformed input.
-2006-01-05 John Peacock <jpeacock at cpan.org>
+jpeacock r200):
Ready for new release to CPAN with minor changes.
@@ -128,18 +153,18 @@
* vutil/vutil.c
Eliminate code I'm never going to use.
-2005-12-03 John Peacock <jpeacock at cpan.org>
+jpeacock r193):
* lib/version.pod
PAUSE does so support version objects. Elaborate on support
for Module::Build and lack thereof for ExtUtils::MakeMaker.
-2005-12-02 John Peacock <jpeacock at cpan.org>
+jpeacock r185):
* version/vxs.pm
Forgot to bump this. When am I going to have inherited props?
-2005-12-02 John Peacock <jpeacock at cpan.org>
+jpeacock r184):
* Build.PL
Explicit minimum version of Module::Build. Fixes
@@ -155,7 +180,7 @@
* lib/version.pod
Complete rewrite that is hopefully easier to understand.
-2005-11-01 John Peacock <jpeacock at cpan.org>
+jpeacock r183):
* vutil/vutil.c
Use trinary operator to choose power of 10, rather than pow(),
@@ -166,16 +191,16 @@
* t/02derived.t
Suppress unnecessary warning when overriding qv() sub.
-2005-10-10 John Peacock <jpeacock at cpan.org>
+jpeacock r182):
* version/README
Remember to update this for 0.49 release.
-2005-10-08 John Peacock <jpeacock at cpan.org>
+jpeacock r181):
Fix Build.PL so Win32 will compile properly
-2005-10-06 John Peacock <jpeacock at cpan.org>
+jpeacock r180):
* version/Build.PL
Explicit call to dist_name to help Windows DTRT. Resolves
@@ -197,11 +222,11 @@
<https://rt.cpan.org/Ticket/Display.html?id=14958>
-2005-09-26 John Peacock <jpeacock at cpan.org>
+jpeacock r177):
Start POD rewrite.
-2005-09-14 John Peacock <jpeacock at cpan.org>
+jpeacock r176):
Significant archectectural change (object hash has to contain
reference to array not the array itself); see
@@ -216,7 +241,7 @@
for more details. All POD moved to seperate file. Tests
abstracted out for reuse by different classes.
-2005-09-07 John Peacock <jpeacock at cpan.org>
+jpeacock r165):
"version" element of hash must be a reference, see:
<https://rt.cpan.org/Ticket/Display.html?id=14439>
@@ -224,7 +249,7 @@
Also, function name changes backported from bleadperl version.
-2005-08-23 John Peacock <jpeacock at cpan.org>
+jpeacock r164):
Badly written subclasses could SEGV (reported by Andreas Koenig).
Now all version objects are validated before use.
@@ -236,30 +261,30 @@
Apply const'ifying from bleadperl and reformat calls to
sv_[cat|set]pvf to be consistent with bleadperl source.
-2005-08-22 John Peacock <jpeacock at cpan.org>
+jpeacock r163):
Leading whitespace or lack of leading zero caused the the object
to be initialized incorrectly (reported by Andreas Koenig).
Added POD for subclassing. Removed cruft from README file.
-2005-08-03 John Peacock <jpeacock at cpan.org>
+jpeacock r162):
Don't strip trailing zeros unneccesarily
-2005-08-02 John Peacock <jpeacock at cpan.org>
+jpeacock r161):
Spelling fixes from "Piotr Fusik" <pfusik at op.pl>
-2005-07-23 John Peacock <jpeacock at cpan.org>
+jpeacock r160):
Complete rename of files to prevent GCC 4.0 bug
-2005-07-23 John Peacock <jpeacock at cpan.org>
+jpeacock r159):
Preliminary commit for rename of util.[ch]
-2005-06-06 John Peacock <jpeacock at cpan.org>
+jpeacock r158):
Final changes to release 0.43 to CPAN
@@ -277,7 +302,7 @@
* util/util.h
const'ify Perl_scan_version().
-2005-05-23 John Peacock <jpeacock at cpan.org>
+jpeacock r157):
Complete rewrite of parser to handle CPAN-style (two significant
decimal) versions, as well as finish documenting the changes.
@@ -294,7 +319,7 @@
Add additional tests for CPAN-style alphas as well as
object->new().
-2005-05-20 John Peacock <jpeacock at cpan.org>
+jpeacock r156):
* lib/version.pm
Revised POD to correspond to new behavior with regards to both
@@ -305,7 +330,7 @@
Copy existing object if called as object method with no
parameter.
-2005-05-17 John Peacock <jpeacock at cpan.org>
+jpeacock r155):
Working towards a release to CPAN.
@@ -320,7 +345,7 @@
* util/util.c
Finish up handling for vcmp to deal with alpha versions.
-2005-05-17 John Peacock <jpeacock at cpan.org>
+jpeacock r154):
Almost completely working; only the comparison tests with
non-objects is still failing.
@@ -334,7 +359,7 @@
Forgot to make sure to display all subversion from short
numeric versions.
-2005-05-15 John Peacock <jpeacock at cpan.org>
+jpeacock r153):
Completed (?) to move to Module::Build
@@ -352,7 +377,7 @@
Add additional files that were originally left out of file
Alphabetize this listing (for compulsiveness)
-2005-05-15 John Peacock <jpeacock at cpan.org>
+jpeacock r152):
Intermediate commit to facilitate move to Module::Build as well as
work on new hash-based object (all tests do not suceed)
@@ -372,7 +397,7 @@
* t/01base.t
Changed to prevent core dump (temporarily)
-2005-05-08 John Peacock <jpeacock at cpan.org>
+jpeacock r151):
Implement alpha versions using secret array zero slot to
differentiate between two place alphas (1.02_03) and three place
@@ -386,7 +411,7 @@
(Perl_vnumify): use the new zero'th array element to distinguish
between 2 and 3 significant decimal places for printing.
-2005-04-21 John Peacock <jpeacock at cpan.org>
+jpeacock r150):
* util.c
Handle two digit alpha versions
@@ -395,7 +420,7 @@
* t/01base.t
Altered tests to match new expectations
-2005-02-06 John Peacock <jpeacock at cpan.org>
+jpeacock r148):
* Makefile.PL
Windows doesn't understand the braces for shell expansion
@@ -415,7 +440,7 @@
* version.xs
new() returns void since it actual returns on the stack
-2004-07-12 John Peacock <jpeacock at cpan.org>
+jpeacock r146):
* util.c
Fix infinite loop for CVS-style versions of more than 3
@@ -431,7 +456,7 @@
* README
Remember to update this before releasing (for a change).
-2004-07-11 John Peacock <jpeacock at cpan.org>
+jpeacock r144):
* lib/version.pm
Increment $VERSION number; have to quote to get the tgz file
@@ -443,11 +468,11 @@
Thanks to Marcus Holland-Moritz <mhx-perl at gmx.net> for finding
this.
-2004-04-14 John Peacock <jpeacock at cpan.org>
+jpeacock r136):
Merge changes from version-0.39 back to trunk
-2004-01-06 John Peacock <jpeacock at cpan.org>
+jpeacock r121):
* t/02AlphaBeta.t
* t/01base.t
@@ -469,19 +494,19 @@
for internal representation; trigger CPAN-style only for
second term.
-2004-01-03 John Peacock <jpeacock at cpan.org>
+jpeacock r120):
Ignore MakeMaker-generated files in svn status
-2004-01-03 John Peacock <jpeacock at cpan.org>
+jpeacock r119):
Ignore MakeMaker-generated files in svn status
-2004-01-03 John Peacock <jpeacock at cpan.org>
+jpeacock r118):
Ignore MakeMaker-generated files in svn status
-2004-01-01 John Peacock <jpeacock at cpan.org>
+jpeacock r117):
* lib/version.pm
(POD): Initial documentation of CPAN-Style versions.
@@ -491,7 +516,7 @@
decimal places) differently from Perl-style (three or more
decimal places).
-2003-12-29 John Peacock <jpeacock at cpan.org>
+jpeacock r116):
* typemap
Stop automatically dereferencing input variable
@@ -506,7 +531,7 @@
Stop dereferencing input variables
Stop assuming that the PV has a value
-2003-12-28 John Peacock <jpeacock at cpan.org>
+jpeacock r115):
* t/01base.t
Replace postfix increment with prefix increment to prevent erroneous
@@ -520,32 +545,32 @@
Rewrite version->new() to eliminate temp string for CVS $Revision: $
Rewrite version->qv() to use scan_version instead of new_version
-2003-12-21 John Peacock <jpeacock at cpan.org>
+jpeacock r112):
M version.xs
Go through code to ensure that there are no leaking scalars
Sadly, there are still leaks from version::VERSION of unknown origins
-2003-12-20 John Peacock <jpeacock at cpan.org>
+jpeacock r111):
M t/02AlphaBeta.t
M lib/version/AlphaBeta.pm
Implement an alternate object representation
Overload stringify() with custom function
-2003-10-25 John Peacock <jpeacock at cpan.org>
+jpeacock r110):
M t/02AlphaBeta.t
Add empty derived class and modify tests to run
M t/01base.t
Work around bug with postfix increment under all Perl < bleadperl
-2003-09-10 John Peacock <jpeacock at cpan.org>
+jpeacock r109):
Fix for Ticket #3764 - need to strip final term before chop()
Implement qv() function and document/test
-2003-09-10 John Peacock <jpeacock at cpan.org>
+jpeacock r107):
Remove the changes file from the repository.
Generate it before release:
@@ -554,30 +579,30 @@
and eventually by 'release.pl --changes'
-2003-09-10 John Peacock <jpeacock at cpan.org>
+jpeacock r106):
Finish backporting bleadperl changes
Special case test for 5.005_03
Patch ppport.h to support IVSIZE for 5.005_03
-2003-09-10 John Peacock <jpeacock at cpan.org>
+jpeacock r105):
No, really delete the lines from MANIFEST
Last bit of clean up in the POD
-2003-09-10 John Peacock <jpeacock at cpan.org>
+jpeacock r104):
Delete version::Empty module and include in t/01base.t instead
Correct MANIFEST (delete missing files and add ppport.h)
Make version::stringify() return at least three subversions
-2003-09-09 John Peacock <jpeacock at cpan.org>
+jpeacock r103):
Integrate changes from bleadperl
Combine emptyclass.t test into 01base.t
Use ppport.h instead of homebrewed #define's
-2003-09-07 John Peacock <jpeacock at cpan.org>
+jpeacock r102):
Extend version::new() to handle derived classes
Abstract t/01base.t into external file
@@ -585,35 +610,35 @@
FIX: "attempt to free unreferenced scalar" during testing
-2003-07-09 John Peacock <jpeacock at cpan.org>
+jpeacock r92):
Merge changes made accidently on branch back to head
-2003-06-13 John Peacock <jpeacock at cpan.org>
+jpeacock r82):
Forgot to commit this before releasing.
-2003-06-13 John Peacock <jpeacock at cpan.org>
+jpeacock r78):
Correct the example code (again) to correct for CVS update problems
-2003-06-13 John Peacock <jpeacock at cpan.org>
+jpeacock r77):
Reformatted POD's from <Matthew.Persico at Lazard.com>
-2003-06-13 John Peacock <jpeacock at cpan.org>
+jpeacock r76):
Change reference from "beta" to "alpha" to follow PAUSE convention
Add new function ->is_alpha() to test for alpha versions
Add docs for all logical operations on version objects
Fix example to have matching versions (old CVS issue)
-2003-06-13 John Peacock <jpeacock at cpan.org>
+jpeacock r75):
Implement version::AlphaBeta module
Copy repository history from CVS into subversion
-2003-06-13 John Peacock <jpeacock at cpan.org>
+jpeacock r74):
To prepare to load /home/jpeacock/tmp/version-0.28 into version/trunk,
perform 2 renames.
@@ -621,170 +646,170 @@
* version/trunk/t/1.t: Renamed from version/trunk/t/version.t.
* version/trunk/lib/version.pm: Renamed from version/trunk/version.pm.
-2003-01-05 John Peacock <jpeacock at cpan.org>
+jpeacock r49):
Extract most recent log messages for main file
-2003-01-05 John Peacock <jpeacock at cpan.org>
+jpeacock r48):
Rewrite POD to call a v-string a v-string
Reformat POD to look nicer
-2003-01-05 John Peacock <jpeacock at cpan.org>
+jpeacock r47):
Make vnumify return an actual NV (instead of an SV which looks like one)
-2003-01-05 John Peacock <jpeacock at cpan.org>
+jpeacock r46):
Make warnings even more dire
-2003-01-05 John Peacock <jpeacock at cpan.org>
+jpeacock r45):
change comment message to more accurately reflect the test
-2002-12-27 John Peacock <jpeacock at cpan.org>
+jpeacock r44):
Rewrite to support new model of "Numeric Versions" and "String Versions"
-2002-12-17 John Peacock <jpeacock at cpan.org>
+jpeacock r43):
New version to cope with GSAR's vision of bare number versions
-2002-12-05 John Peacock <jpeacock at cpan.org>
+jpeacock r42):
Make -w clean tests
-2002-12-05 John Peacock <jpeacock at cpan.org>
+jpeacock r41):
Bring into sync with perl-current
-2002-11-18 John Peacock <jpeacock at cpan.org>
+jpeacock r40):
Bring current with repository version
-2002-11-18 John Peacock <jpeacock at cpan.org>
+jpeacock r39):
Fix compile errors under threaded Perl's
Supress {Unquoted string version} warnings
-2002-11-18 John Peacock <jpeacock at cpan.org>
+jpeacock r38):
Fix compile errors under threaded Perls
-2002-11-18 John Peacock <jpeacock at cpan.org>
+jpeacock r37):
Fix compile errors under threaded Perl's
Supress {Unquoted string "version"} warnings
-2002-10-14 John Peacock <jpeacock at cpan.org>
+jpeacock r36):
Fix typos
Fix handling of null versions
-2002-10-10 John Peacock <jpeacock at cpan.org>
+jpeacock r35):
use Perl_croak from C code
-2002-10-08 John Peacock <jpeacock at cpan.org>
+jpeacock r34):
Recover gracefully to null versions (rather than core)
-2002-10-08 John Peacock <jpeacock at cpan.org>
+jpeacock r33):
Recover gracefully to null versions (rather than core)
-2002-10-04 John Peacock <jpeacock at cpan.org>
+jpeacock r32):
Document extended decimal version parsing
-2002-10-04 John Peacock <jpeacock at cpan.org>
+jpeacock r31):
Force all files to next major revision (so the version works)
-2002-10-04 John Peacock <jpeacock at cpan.org>
+jpeacock r30):
Add tests for 1.002003 => 1.2.3
-2002-10-04 John Peacock <jpeacock at cpan.org>
+jpeacock r29):
Add support for 1.002003 => 1.2.3
-2002-10-04 John Peacock <jpeacock at cpan.org>
+jpeacock r28):
Remove dependency on Exporter.pm
-2002-09-29 John Peacock <jpeacock at cpan.org>
+jpeacock r27):
Update with version from perl-current
-2002-09-29 John Peacock <jpeacock at cpan.org>
+jpeacock r26):
Change vstringify and vnumify
Reword main POD slightly
-2002-09-28 John Peacock <jpeacock at cpan.org>
+jpeacock r25):
Final changes to release to CPAN
Merged code into perl-current
-2002-09-28 John Peacock <jpeacock at cpan.org>
+jpeacock r24):
Ready to release to CPAN
-2002-09-28 John Peacock <jpeacock at cpan.org>
+jpeacock r23):
POD changes
-2002-09-28 John Peacock <jpeacock at cpan.org>
+jpeacock r22):
Cannot use SvPV_nolen in 5.005_03
-2002-09-22 John Peacock <jpeacock at cpan.org>
+jpeacock r21):
Document the UNIVERSAL::VERSION replacement
-2002-09-22 John Peacock <jpeacock at cpan.org>
+jpeacock r20):
Successfully create and test my own UNIVERSAL::VERSION replacement
-2002-09-16 John Peacock <jpeacock at cpan.org>
+jpeacock r19):
Improve the testing of beta versions
-2002-09-16 John Peacock <jpeacock at cpan.org>
+jpeacock r18):
More POD changes
-2002-09-16 John Peacock <jpeacock at cpan.org>
+jpeacock r17):
Add additional testing
Add POD
-2002-09-16 John Peacock <jpeacock at cpan.org>
+jpeacock r16):
Finally works in 5.005_03, 5.6.1, and 5.8.0
-2002-09-15 John Peacock <jpeacock at cpan.org>
+jpeacock r15):
Doesn't work any more?
-2002-09-14 John Peacock <jpeacock at cpan.org>
+jpeacock r14):
working AV objects in 5.6.x only
-2002-09-14 John Peacock <jpeacock at cpan.org>
+jpeacock r13):
*** empty log message ***
-2002-09-13 John Peacock <jpeacock at cpan.org>
+jpeacock r12):
Finished for the night
-2002-09-13 John Peacock <jpeacock at cpan.org>
+jpeacock r11):
almost working AV style version objects
-2002-09-13 John Peacock <jpeacock at cpan.org>
+jpeacock r10):
Initial revision
Modified: packages/libversion-perl/branches/upstream/current/META.yml
===================================================================
--- packages/libversion-perl/branches/upstream/current/META.yml 2006-03-29 20:57:18 UTC (rev 2486)
+++ packages/libversion-perl/branches/upstream/current/META.yml 2006-03-30 12:20:09 UTC (rev 2487)
@@ -1,6 +1,6 @@
---
name: version
-version: 0.57
+version: 0.59
author: ~
abstract: ~
license: perl
@@ -10,8 +10,8 @@
provides:
version:
file: lib/version.pm
- version: 0.57
+ version: 0.59
version::vxs:
file: vutil/vxs.pm
- version: 0.57
+ version: 0.59
generated_by: Module::Build version 0.2611
Modified: packages/libversion-perl/branches/upstream/current/README
===================================================================
--- packages/libversion-perl/branches/upstream/current/README 2006-03-29 20:57:18 UTC (rev 2486)
+++ packages/libversion-perl/branches/upstream/current/README 2006-03-30 12:20:09 UTC (rev 2487)
@@ -1,4 +1,4 @@
-version 0.57
+version 0.59
==================================
Provides the same version objects as included in Perl v5.9.x (and hopefully in
@@ -7,23 +7,13 @@
exists in the Perl core. Note that the CPAN release cannot be installed
with the interim 5.9.0, 5.9.1, and 5.9.2 releases (since it duplicates code
in the core). If you are testing bleadperl, you will need to check out the
-latest release of 5.9.x to get the changes included in 0.50.
+latest release of 5.9.x to get the changes included in 0.58.
-Major changes in 0.57
+Major changes in 0.59
==================================
-Fully implemented UNIVERSAL::VERSION in the pure Perl module. Revert
-change to implementation modules so that the $VERSION testing in the main
-module loads the correct underlying module during testing. Subclass
-Module::Build so lack of compiler is not fatal.
+Fix mainline code to work on Perl 5.6.x and 5.005_0x again (a few
+5.8.x'isms had crept in to the C code and tests).
-This release includes an optional pure Perl implementation (in case
-you don't have a C-compiler or if some reason you want your code to be
-much slower). You can test it by calling the build script as
-
- $ perl Build.PL --perl_only
-
-and it will install the Perl only version.
-
Please read the POD documentation for usage/details. See the CHANGES file
for full details of all changes to the module behavior.
@@ -36,10 +26,24 @@
$ ./Build test
# ./Build install
+This release includes an optional pure Perl implementation (in case
+you don't have a C-compiler or if some reason you want your code to be
+much slower). You can test it by calling the build script as
+
+ $ perl Build.PL --perl_only
+
+and it will install the Perl only version.
+
DEPENDENCIES
-The same C compiler used to build Perl (or not).
+The same C compiler used to build Perl (or not). Module::Build 0.2611
+or better.
+Module::Build installs fine under 5.005_03 or better, though the optional
+dependency Archive::Tar doesn't. If you install Module::Build without any
+of the optional dependencies, you can safely install version.pm.
+
+
COPYRIGHT AND LICENCE
This module can be distributed under the same terms as Perl.
Modified: packages/libversion-perl/branches/upstream/current/lib/version/typemap
===================================================================
--- packages/libversion-perl/branches/upstream/current/lib/version/typemap 2006-03-29 20:57:18 UTC (rev 2486)
+++ packages/libversion-perl/branches/upstream/current/lib/version/typemap 2006-03-30 12:20:09 UTC (rev 2487)
@@ -22,7 +22,7 @@
INPUT
T_PTROBJ_SPECIAL
- if (sv_derived_from($arg, \"${(my $ntt=$ntype)=~s/_/::/g;\$ntt}\")) {
+ if (sv_derived_from($arg, \"version\")) {
$var = $arg;
}
else
Modified: packages/libversion-perl/branches/upstream/current/lib/version.pm
===================================================================
--- packages/libversion-perl/branches/upstream/current/lib/version.pm 2006-03-29 20:57:18 UTC (rev 2486)
+++ packages/libversion-perl/branches/upstream/current/lib/version.pm 2006-03-30 12:20:09 UTC (rev 2487)
@@ -11,7 +11,7 @@
@EXPORT = qw(qv);
-$VERSION = 0.57;
+$VERSION = 0.59;
$CLASS = 'version';
Modified: packages/libversion-perl/branches/upstream/current/lib/version.pod
===================================================================
--- packages/libversion-perl/branches/upstream/current/lib/version.pod 2006-03-29 20:57:18 UTC (rev 2486)
+++ packages/libversion-perl/branches/upstream/current/lib/version.pod 2006-03-30 12:20:09 UTC (rev 2487)
@@ -74,6 +74,8 @@
include full support for version objects; there are no current plans
to patch ExtUtils::MakeMaker to support version objects.
+=back
+
=head2 What IS a version
For the purposes of this module, a version "number" is a sequence of
@@ -516,6 +518,8 @@
$newver = version->new("12.3.1_1");
print $newver; # v12.3.1_1
+=back
+
=head2 Replacement UNIVERSAL::VERSION
In addition to the version objects, this modules also replaces the core
Modified: packages/libversion-perl/branches/upstream/current/t/01base.t
===================================================================
--- packages/libversion-perl/branches/upstream/current/t/01base.t 2006-03-29 20:57:18 UTC (rev 2486)
+++ packages/libversion-perl/branches/upstream/current/t/01base.t 2006-03-30 12:20:09 UTC (rev 2487)
@@ -5,12 +5,14 @@
#########################
use Test::More qw/no_plan/;
-require "t/coretests.pm";
-diag "Tests with base class" unless $ENV{PERL_CORE};
-
BEGIN {
- use_ok("version", 0.49); # If we made it this far, we are ok.
+ use_ok("version", 0.58); # If we made it this far, we are ok.
}
+my $Verbose;
+require "t/coretests.pm";
+
+diag "Tests with base class" if $Verbose;
+
BaseTests("version");
Modified: packages/libversion-perl/branches/upstream/current/t/02derived.t
===================================================================
--- packages/libversion-perl/branches/upstream/current/t/02derived.t 2006-03-29 20:57:18 UTC (rev 2486)
+++ packages/libversion-perl/branches/upstream/current/t/02derived.t 2006-03-30 12:20:09 UTC (rev 2487)
@@ -5,21 +5,25 @@
#########################
use Test::More qw/no_plan/;
+
BEGIN {
- use_ok("version", 0.49); # If we made it this far, we are ok.
+ use_ok("version", 0.58); # If we made it this far, we are ok.
}
+
+my $Verbose;
require "t/coretests.pm";
-diag "Tests with empty derived class" unless $ENV{PERL_CORE};
+diag "Tests with empty derived class" if $Verbose;
package version::Empty;
-use base version;
-$VERSION = 0.01;
-no warnings 'redefine';
-*::qv = sub { return bless version::qv(shift), __PACKAGE__; };
+use base 'version';
+{ # localize this so it doesn't leak to the rest of the file
+ local $^W;
+ *::qv = sub { return bless version::qv(shift), __PACKAGE__; };
+}
package version::Bad;
-use base version;
+use base 'version';
sub new { my($self,$n)=@_; bless \$n, $self }
package main;
@@ -29,12 +33,12 @@
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};
+diag "tests with bad subclass" if $Verbose;
$testobj = version::Bad->new(1.002_003);
isa_ok( $testobj, "version::Bad" );
eval { my $string = $testobj->numify };
Modified: packages/libversion-perl/branches/upstream/current/t/coretests.pm
===================================================================
--- packages/libversion-perl/branches/upstream/current/t/coretests.pm 2006-03-29 20:57:18 UTC (rev 2486)
+++ packages/libversion-perl/branches/upstream/current/t/coretests.pm 2006-03-30 12:20:09 UTC (rev 2487)
@@ -1,316 +1,328 @@
#! /usr/local/perl -w
package main;
+require Test::Harness;
+*Verbose = \$Test::Harness::Verbose;
sub BaseTests {
- my $CLASS = shift;
-
- # 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" unless $ENV{PERL_CORE};
- $version = $CLASS->new(5.005_03);
- is ( "$version" , "5.005030" , '5.005_03 eq 5.5.30' );
- $version = $CLASS->new(1.23);
- is ( "$version" , "1.230" , '1.23 eq "1.230"' );
-
- # Test quoted number processing
- diag "tests with quoted numbers" unless $ENV{PERL_CORE};
- $version = $CLASS->new("5.005_03");
- is ( "$version" , "5.005_030" , '"5.005_03" eq "5.005_030"' );
- $version = $CLASS->new("v1.23");
- is ( "$version" , "v1.23.0" , '"v1.23" eq "v1.23.0"' );
-
- # Test stringify operator
- diag "tests with stringify" unless $ENV{PERL_CORE};
- $version = $CLASS->new("5.005");
- is ( "$version" , "5.005" , '5.005 eq "5.005"' );
- $version = $CLASS->new("5.006.001");
- is ( "$version" , "v5.6.1" , '5.006.001 eq v5.6.1' );
- $version = $CLASS->new("1.2.3_4");
- is ( "$version" , "v1.2.3_4" , 'alpha version 1.2.3_4 eq v1.2.3_4' );
-
- # test illegal formats
- diag "test illegal formats" unless $ENV{PERL_CORE};
- eval {my $version = $CLASS->new("1.2_3_4")};
- like($@, qr/multiple underscores/,
- "Invalid version format (multiple underscores)");
-
- eval {my $version = $CLASS->new("1.2_3.4")};
- like($@, qr/underscores before decimal/,
- "Invalid version format (underscores before decimal)");
-
- eval {my $version = $CLASS->new("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");
- };
- my $warnregex = "Version string '.+' contains invalid data; ".
- "ignoring: '.+'";
+ my $CLASS = shift;
+
+ # 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);
+ is ( "$version" , "5.005030" , '5.005_03 eq 5.5.30' );
+ $version = $CLASS->new(1.23);
+ is ( "$version" , "1.230" , '1.23 eq "1.230"' );
+
+ # Test quoted number processing
+ diag "tests with quoted numbers" if $Verbose;
+ $version = $CLASS->new("5.005_03");
+ is ( "$version" , "5.005_030" , '"5.005_03" eq "5.005_030"' );
+ $version = $CLASS->new("v1.23");
+ is ( "$version" , "v1.23.0" , '"v1.23" eq "v1.23.0"' );
+
+ # Test stringify operator
+ diag "tests with stringify" if $Verbose;
+ $version = $CLASS->new("5.005");
+ is ( "$version" , "5.005" , '5.005 eq "5.005"' );
+ $version = $CLASS->new("5.006.001");
+ is ( "$version" , "v5.6.1" , '5.006.001 eq v5.6.1' );
+ $version = $CLASS->new("1.2.3_4");
+ is ( "$version" , "v1.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")};
+ like($@, qr/multiple underscores/,
+ "Invalid version format (multiple underscores)");
+
+ eval {my $version = $CLASS->new("1.2_3.4")};
+ like($@, qr/underscores before decimal/,
+ "Invalid version format (underscores before decimal)");
+
+ eval {my $version = $CLASS->new("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");
+ };
+ my $warnregex = "Version string '.+' contains invalid data; ".
+ "ignoring: '.+'";
- like($@, qr/$warnregex/,
- "Version string contains invalid data; ignoring");
+ like($@, qr/$warnregex/,
+ "Version string contains invalid data; ignoring");
- # from here on out capture the warning and test independently
- my $warning;
- local $SIG{__WARN__} = sub { $warning = $_[0] };
- $version = $CLASS->new("99 and 44/100 pure");
+ # from here on out capture the warning and test independently
+ my $warning;
+ local $SIG{__WARN__} = sub { $warning = $_[0] };
+ $version = $CLASS->new("99 and 44/100 pure");
- like($warning, qr/$warnregex/,
- "Version string contains invalid data; ignoring");
- ok ("$version" eq "99.000", '$version eq "99.000"');
- 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");
- 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");
-
- # Test boolean operator
- ok ($version, 'boolean');
-
- # Test class membership
- isa_ok ( $version, $CLASS );
-
- # Test comparison operators with self
- diag "tests with self" unless $ENV{PERL_CORE};
- ok ( $version eq $version, '$version eq $version' );
- is ( $version cmp $version, 0, '$version cmp $version == 0' );
- ok ( $version == $version, '$version == $version' );
-
- # test first with non-object
- $version = $CLASS->new("5.006.001");
- $new_version = "5.8.0";
- diag "tests with non-objects" unless $ENV{PERL_CORE};
- ok ( $version ne $new_version, '$version ne $new_version' );
- ok ( $version lt $new_version, '$version lt $new_version' );
- ok ( $new_version gt $version, '$new_version gt $version' );
- ok ( ref(\$new_version) eq 'SCALAR', 'no auto-upgrade');
- $new_version = "$version";
- ok ( $version eq $new_version, '$version eq $new_version' );
- ok ( $new_version eq $version, '$new_version eq $version' );
-
- # now test with existing object
- $new_version = $CLASS->new("5.8.0");
- diag "tests with objects" unless $ENV{PERL_CORE};
- ok ( $version ne $new_version, '$version ne $new_version' );
- ok ( $version lt $new_version, '$version lt $new_version' );
- ok ( $new_version gt $version, '$new_version gt $version' );
- $new_version = $CLASS->new("$version");
- ok ( $version eq $new_version, '$version eq $new_version' );
-
- # Test Numeric Comparison operators
- # test first with non-object
- $new_version = "5.8.0";
- 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" 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" 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" unless $ENV{PERL_CORE};
- $version = $CLASS->new(1.002003);
- ok ( $version eq "1.2.3", '$version eq "1.2.3"');
- ok ( $version->numify == 1.002003, '$version->numify == 1.002003');
- $version = $CLASS->new("2002.09.30.1");
- ok ( $version eq "2002.9.30.1",'$version eq 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");
- $new_version = "1.2.3_4";
- diag "tests with alpha-style non-objects" unless $ENV{PERL_CORE};
- ok ( $version lt $new_version, '$version lt $new_version' );
- ok ( $new_version gt $version, '$new_version gt $version' );
- ok ( $version ne $new_version, '$version ne $new_version' );
-
- $version = $CLASS->new("1.2.4");
- 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' );
-
- # 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" 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" 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");
- diag "tests with alpha-style objects with same subversion" 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' );
-
- diag "test implicit [in]equality" unless $ENV{PERL_CORE};
- $version = $CLASS->new("v1.2.3");
- $new_version = $CLASS->new("1.2.3.0");
- ok ( $version == $new_version, '$version == $new_version' );
- $new_version = $CLASS->new("1.2.3_0");
- ok ( $version == $new_version, '$version == $new_version' );
- $new_version = $CLASS->new("1.2.3.1");
- ok ( $version < $new_version, '$version < $new_version' );
- $new_version = $CLASS->new("1.2.3_1");
- ok ( $version < $new_version, '$version < $new_version' );
- $new_version = $CLASS->new("1.1.999");
- ok ( $version > $new_version, '$version > $new_version' );
-
- # that which is not expressly permitted is forbidden
- diag "forbidden operations" unless $ENV{PERL_CORE};
- ok ( !eval { ++$version }, "noop ++" );
- ok ( !eval { --$version }, "noop --" );
- ok ( !eval { $version/1 }, "noop /" );
- ok ( !eval { $version*3 }, "noop *" );
- ok ( !eval { abs($version) }, "noop abs" );
+ like($warning, qr/$warnregex/,
+ "Version string contains invalid data; ignoring");
+ ok ("$version" eq "99.000", '$version eq "99.000"');
+ 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");
+ 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");
+
+ # Test boolean operator
+ ok ($version, 'boolean');
+
+ # Test class membership
+ isa_ok ( $version, $CLASS );
+
+ # Test comparison operators with self
+ diag "tests with self" if $Verbose;
+ ok ( $version eq $version, '$version eq $version' );
+ is ( $version cmp $version, 0, '$version cmp $version == 0' );
+ ok ( $version == $version, '$version == $version' );
+
+ # test first with non-object
+ $version = $CLASS->new("5.006.001");
+ $new_version = "5.8.0";
+ diag "tests with non-objects" if $Verbose;
+ ok ( $version ne $new_version, '$version ne $new_version' );
+ ok ( $version lt $new_version, '$version lt $new_version' );
+ ok ( $new_version gt $version, '$new_version gt $version' );
+ ok ( ref(\$new_version) eq 'SCALAR', 'no auto-upgrade');
+ $new_version = "$version";
+ ok ( $version eq $new_version, '$version eq $new_version' );
+ ok ( $new_version eq $version, '$new_version eq $version' );
+
+ # now test with existing object
+ $new_version = $CLASS->new("5.8.0");
+ diag "tests with objects" if $Verbose;
+ ok ( $version ne $new_version, '$version ne $new_version' );
+ ok ( $version lt $new_version, '$version lt $new_version' );
+ ok ( $new_version gt $version, '$new_version gt $version' );
+ $new_version = $CLASS->new("$version");
+ ok ( $version eq $new_version, '$version eq $new_version' );
+
+ # Test Numeric Comparison operators
+ # test first with non-object
+ $new_version = "5.8.0";
+ diag "numeric tests with non-objects" if $Verbose;
+ 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;
+ 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;
+ 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);
+ ok ( $version eq "1.2.3", '$version eq "1.2.3"');
+ ok ( $version->numify == 1.002003, '$version->numify == 1.002003');
+ $version = $CLASS->new("2002.09.30.1");
+ ok ( $version eq "2002.9.30.1",'$version eq 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");
+ $new_version = "1.2.3_4";
+ diag "tests with alpha-style non-objects" if $Verbose;
+ ok ( $version lt $new_version, '$version lt $new_version' );
+ ok ( $new_version gt $version, '$new_version gt $version' );
+ ok ( $version ne $new_version, '$version ne $new_version' );
+
+ $version = $CLASS->new("1.2.4");
+ diag "numeric tests with alpha-style non-objects"
+ if $Verbose;
+ ok ( $version > $new_version, '$version > $new_version' );
+ ok ( $new_version < $version, '$new_version < $version' );
+ 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;
+ 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;
+ 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");
+ 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");
+ ok ( $version == $new_version, '$version == $new_version' );
+ $new_version = $CLASS->new("1.2.3_0");
+ ok ( $version == $new_version, '$version == $new_version' );
+ $new_version = $CLASS->new("1.2.3.1");
+ ok ( $version < $new_version, '$version < $new_version' );
+ $new_version = $CLASS->new("1.2.3_1");
+ ok ( $version < $new_version, '$version < $new_version' );
+ $new_version = $CLASS->new("1.1.999");
+ ok ( $version > $new_version, '$version > $new_version' );
+
+ # that which is not expressly permitted is forbidden
+ diag "forbidden operations" if $Verbose;
+ ok ( !eval { ++$version }, "noop ++" );
+ ok ( !eval { --$version }, "noop --" );
+ ok ( !eval { $version/1 }, "noop /" );
+ ok ( !eval { $version*3 }, "noop *" );
+ ok ( !eval { abs($version) }, "noop abs" );
- # test the qv() sub
- diag "testing qv" unless $ENV{PERL_CORE};
- $version = qv("1.2");
- ok ( $version eq "1.2.0", 'qv("1.2") eq "1.2.0"' );
- $version = qv(1.2);
- ok ( $version eq "1.2.0", 'qv(1.2) eq "1.2.0"' );
- isa_ok( qv('5.008'), $CLASS );
+ # test the qv() sub
+ diag "testing qv" if $Verbose;
+ $version = qv("1.2");
+ ok ( $version eq "1.2.0", 'qv("1.2") eq "1.2.0"' );
+ $version = qv(1.2);
+ ok ( $version eq "1.2.0", 'qv(1.2) eq "1.2.0"' );
+ isa_ok( qv('5.008'), $CLASS );
- # test creation from existing version object
- diag "create new from existing version" unless $ENV{PERL_CORE};
- ok (eval {$new_version = $CLASS->new($version)},
- "new from existing object");
- ok ($new_version == $version, "class->new($version) identical");
- $new_version = $version->new();
- isa_ok ($new_version, $CLASS );
- is ($new_version, "0.000", "version->new() doesn't clone");
- $new_version = $version->new("1.2.3");
- is ($new_version, "v1.2.3" , '$version->new("1.2.3") works too');
+ # test creation from existing version object
+ diag "create new from existing version" if $Verbose;
+ ok (eval {$new_version = $CLASS->new($version)},
+ "new from existing object");
+ ok ($new_version == $version, "class->new($version) identical");
+ $new_version = $version->new();
+ isa_ok ($new_version, $CLASS );
+ is ($new_version, "0.000", "version->new() doesn't clone");
+ $new_version = $version->new("1.2.3");
+ is ($new_version, "v1.2.3" , '$version->new("1.2.3") works too');
- # test the CVS revision mode
- diag "testing CVS Revision" unless $ENV{PERL_CORE};
- $version = new $CLASS qw$Revision: 1.2$;
- ok ( $version eq "1.2.0", 'qw$Revision: 1.2$ eq 1.2.0' );
- $version = new $CLASS qw$Revision: 1.2.3.4$;
- ok ( $version eq "1.2.3.4", 'qw$Revision: 1.2.3.4$ eq 1.2.3.4' );
-
- # test the CPAN style reduced significant digit form
- diag "testing CPAN-style versions" unless $ENV{PERL_CORE};
- $version = $CLASS->new("1.23_01");
- is ( "$version" , "1.23_0100", "CPAN-style alpha version" );
- ok ( $version > 1.23, "1.23_01 > 1.23");
- ok ( $version < 1.24, "1.23_01 < 1.24");
+ # test the CVS revision mode
+ diag "testing CVS Revision" if $Verbose;
+ $version = new $CLASS qw$Revision: 1.2$;
+ ok ( $version eq "1.2.0", 'qw$Revision: 1.2$ eq 1.2.0' );
+ $version = new $CLASS qw$Revision: 1.2.3.4$;
+ ok ( $version eq "1.2.3.4", 'qw$Revision: 1.2.3.4$ eq 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");
+ is ( "$version" , "1.23_0100", "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" unless $ENV{PERL_CORE};
-
- # we know this file is here since we require it ourselves
- $version = $Test::More::VERSION;
- eval "use Test::More $version";
- unlike($@, qr/Test::More version $version/,
- 'Replacement eval works with exact version');
-
- # this should fail even with old UNIVERSAL::VERSION
- $version = $Test::More::VERSION+0.01;
- eval "use Test::More $version";
- like($@, qr/Test::More version $version/,
- 'Replacement eval works with incremented version');
-
- $version =~ s/\.0$//; #convert to string and remove trailing '.0'
- chop($version); # shorten by 1 digit, should still succeed
- eval "use Test::More $version";
- unlike($@, qr/Test::More version $version/,
- 'Replacement eval works with single digit');
-
- $version += 0.1; # this would fail with old UNIVERSAL::VERSION
- eval "use Test::More $version";
- like($@, qr/Test::More version $version/,
- 'Replacement eval works with incremented digit');
+ # test reformed UNIVERSAL::VERSION
+ diag "Replacement UNIVERSAL::VERSION tests" if $Verbose;
+
+ # we know this file is here since we require it ourselves
+ $version = $Test::More::VERSION;
+ eval "use Test::More $version";
+ unlike($@, qr/Test::More version $version/,
+ 'Replacement eval works with exact version');
+
+ # this should fail even with old UNIVERSAL::VERSION
+ $version = $Test::More::VERSION+0.01;
+ eval "use Test::More $version";
+ like($@, qr/Test::More version $version/,
+ 'Replacement eval works with incremented version');
+
+ $version =~ s/\.0$//; #convert to string and remove trailing '.0'
+ chop($version); # shorten by 1 digit, should still succeed
+ eval "use Test::More $version";
+ unlike($@, qr/Test::More version $version/,
+ 'Replacement eval works with single digit');
+
+ $version += 0.1; # this would fail with old UNIVERSAL::VERSION
+ eval "use Test::More $version";
+ like($@, qr/Test::More version $version/,
+ 'Replacement eval works with incremented digit');
- { # 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;
- eval "use lib '.'; use xxx 3;";
- like ($@, qr/^xxx defines neither package nor VERSION/,
- 'Replacement handles modules without package or VERSION');
- unlink 'xxx.pm';
+ { # 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 $error_regex;
+ if ( $] < 5.008 ) {
+ $error_regex = 'xxx does not define \$xxx::VERSION';
}
-
- { # 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;";
- like ($@, qr/^yyy does not define \$yyy::VERSION/,
- 'Replacement handles modules without VERSION');
- unlink 'yyy.pm';
+ else {
+ $error_regex = 'xxx defines neither package nor VERSION';
}
+ eval "use lib '.'; use xxx 3;";
+ like ($@, qr/$error_regex/,
+ 'Replacement handles modules without package or VERSION');
+ unlink 'xxx.pm';
+ }
+
+ { # 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;";
+ like ($@, qr/^yyy does not define \$yyy::VERSION/,
+ 'Replacement handles modules without VERSION');
+ unlink 'yyy.pm';
+ }
+
SKIP: {
- skip 'Cannot test v-strings with Perl < 5.8.1', 4
- if $] < 5.008_001;
- diag "Tests with v-strings" unless $ENV{PERL_CORE};
- $version = $CLASS->new(1.2.3);
- ok("$version" eq "v1.2.3", '"$version" eq 1.2.3');
- $version = $CLASS->new(1.0.0);
- $new_version = $CLASS->new(1);
- ok($version == $new_version, '$version == $new_version');
- ok($version eq $new_version, '$version eq $new_version');
- $version = qv(1.2.3);
- ok("$version" eq "v1.2.3", 'v-string initialized qv()');
- }
+ skip 'Cannot test v-strings with Perl < 5.8.1', 4
+ if $] < 5.008_001;
+ diag "Tests with v-strings" if $Verbose;
+ $version = $CLASS->new(1.2.3);
+ ok("$version" eq "v1.2.3", '"$version" eq 1.2.3');
+ $version = $CLASS->new(1.0.0);
+ $new_version = $CLASS->new(1);
+ ok($version == $new_version, '$version == $new_version');
+ ok($version eq $new_version, '$version eq $new_version');
+ $version = qv(1.2.3);
+ ok("$version" eq "v1.2.3", 'v-string initialized qv()');
+ }
- diag "Tests with real-world (malformed) data" unless $ENV{PERL_CORE};
+ diag "Tests with real-world (malformed) data" if $Verbose;
- # trailing zero testing (reported by Andreas Koenig).
- $version = $CLASS->new("1");
- ok($version->numify eq "1.000", "trailing zeros preserved");
- $version = $CLASS->new("1.0");
- ok($version->numify eq "1.000", "trailing zeros preserved");
- $version = $CLASS->new("1.0.0");
- ok($version->numify eq "1.000000", "trailing zeros preserved");
- $version = $CLASS->new("1.0.0.0");
- ok($version->numify eq "1.000000000", "trailing zeros preserved");
-
- # leading zero testing (reported by Andreas Koenig).
- $version = $CLASS->new(".7");
- ok($version->numify eq "0.700", "leading zero inferred");
+ # trailing zero testing (reported by Andreas Koenig).
+ $version = $CLASS->new("1");
+ ok($version->numify eq "1.000", "trailing zeros preserved");
+ $version = $CLASS->new("1.0");
+ ok($version->numify eq "1.000", "trailing zeros preserved");
+ $version = $CLASS->new("1.0.0");
+ ok($version->numify eq "1.000000", "trailing zeros preserved");
+ $version = $CLASS->new("1.0.0.0");
+ ok($version->numify eq "1.000000000", "trailing zeros preserved");
+
+ # leading zero testing (reported by Andreas Koenig).
+ $version = $CLASS->new(".7");
+ ok($version->numify eq "0.700", "leading zero inferred");
- # leading space testing (reported by Andreas Koenig).
- $version = $CLASS->new(" 1.7");
- ok($version->numify eq "1.700", "leading space ignored");
+ # leading space testing (reported by Andreas Koenig).
+ $version = $CLASS->new(" 1.7");
+ ok($version->numify eq "1.700", "leading space ignored");
}
Modified: packages/libversion-perl/branches/upstream/current/vperl/vpp.pm
===================================================================
--- packages/libversion-perl/branches/upstream/current/vperl/vpp.pm 2006-03-29 20:57:18 UTC (rev 2486)
+++ packages/libversion-perl/branches/upstream/current/vperl/vpp.pm 2006-03-30 12:20:09 UTC (rev 2487)
@@ -3,9 +3,9 @@
use strict;
use Exporter ();
-use Scalar::Util qw(isvstring reftype);
+use Scalar::Util;
use vars qw ($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS @REGEXS);
-$VERSION = 0.57;
+$VERSION = 0.59;
@ISA = qw (Exporter);
#Give a hoot don't pollute, do not export more than needed by default
@EXPORT = qw (qv);
@@ -35,7 +35,8 @@
$value = 'v'.$_[2];
}
- if ( isvstring($value) ) {
+ my $eval = eval 'Scalar::Util::isvstring($value)';
+ if ( !$@ and $eval ) {
$value = sprintf("v%vd",$value);
}
@@ -363,7 +364,8 @@
sub qv {
my ($value) = @_;
- if ( isvstring($value) ) {
+ my $eval = eval 'Scalar::Util::isvstring($value)';
+ if ( !$@ and $eval ) {
$value = sprintf("v%vd",$value);
}
else {
@@ -374,7 +376,7 @@
sub _verify {
my ($self) = @_;
- if ( reftype($self) eq 'HASH'
+ if ( Scalar::Util::reftype($self) eq 'HASH'
&& exists $self->{version}
&& ref($self->{version}) eq 'ARRAY'
) {
@@ -385,37 +387,35 @@
}
}
-local $^W; # shut up the 'redefined' warning for UNIVERSAL::VERSION
-no warnings 'redefine';
+# Thanks to Yitzchak Scott-Thoennes for this mode of operation
+{
+ local $^W;
+ *UNIVERSAL::VERSION = sub {
+ my ($obj, $req) = @_;
+ my $class = ref($obj) || $obj;
+ no strict 'refs';
+ eval "require $class" unless %{"$class\::"}; # already existing
+ die "$class defines neither package nor VERSION--version check failed"
+ if $@ or not %{"$class\::"};
+
+ my $version = eval "\$$class\::VERSION";
+ die "$class does not define \$$class\::VERSION--version check failed"
+ unless defined $version;
-package UNIVERSAL;
+ $version = version::vpp->new($version);
-sub VERSION {
- my ($obj, $req) = @_;
- my $class = ref($obj) || $obj;
- no strict 'refs';
- eval "require $class" unless %{"$class\::"}; # already existing
- die "$class defines neither package nor VERSION--version check failed"
- if $@ or not %{"$class\::"};
-
- my $version = eval "\$$class\::VERSION";
- die "$class does not define \$$class\::VERSION--version check failed"
- unless defined $version;
+ if ( defined $req ) {
+ $req = version::vpp->new($req);
- $version = version::vpp->new($version);
+ die sprintf ("%s version %s (%s) required--".
+ "this is only version %s (%s)", $class,
+ $req->numify, $req->normal,
+ $version->numify, $version->normal)
+ if ( $req > $version );
+ }
- if ( defined $req ) {
- $req = version::vpp->new($req);
-
- die sprintf ("%s version %s (%s) required--".
- "this is only version %s (%s)", $class,
- $req->numify, $req->normal,
- $version->numify, $version->normal)
- if ( $req > $version );
- }
-
- return $version->numify;
+ return $version->numify;
+ };
}
-
1; #this line is important and will help the module return a true value
Modified: packages/libversion-perl/branches/upstream/current/vutil/ppport.h
===================================================================
--- packages/libversion-perl/branches/upstream/current/vutil/ppport.h 2006-03-29 20:57:18 UTC (rev 2486)
+++ packages/libversion-perl/branches/upstream/current/vutil/ppport.h 2006-03-30 12:20:09 UTC (rev 2487)
@@ -1,379 +1,926 @@
-
-/* ppport.h -- Perl/Pollution/Portability Version 2.011_02
- *
- * Automatically Created by Devel::PPPort on Tue Mar 23 21:50:21 2004
- *
- * Do NOT edit this file directly! -- Edit PPPort.pm instead.
- *
- * Version 2.x, Copyright (C) 2001, Paul Marquess.
- * Version 1.x, Copyright (C) 1999, Kenneth Albanowski.
- * This code may be used and distributed under the same license as any
- * version of Perl.
- *
- * This version of ppport.h is designed to support operation with Perl
- * installations back to 5.004, and has been tested up to 5.8.1.
- *
- * If this version of ppport.h is failing during the compilation of this
- * module, please check if a newer version of Devel::PPPort is available
- * on CPAN before sending a bug report.
- *
- * If you are using the latest version of Devel::PPPort and it is failing
- * during compilation of this module, please send a report to perlbug at perl.com
- *
- * Include all following information:
- *
- * 1. The complete output from running "perl -V"
- *
- * 2. This file.
- *
- * 3. The name & version of the module you were trying to build.
- *
- * 4. A full log of the build that failed.
- *
- * 5. Any other information that you think could be relevant.
- *
- *
- * For the latest version of this code, please retreive the Devel::PPPort
- * module from CPAN.
- *
- */
-
+#if 0
+<<'SKIP';
+#endif
/*
- * In order for a Perl extension module to be as portable as possible
- * across differing versions of Perl itself, certain steps need to be taken.
- * Including this header is the first major one, then using dTHR is all the
- * appropriate places and using a PL_ prefix to refer to global Perl
- * variables is the second.
- *
- */
+----------------------------------------------------------------------
+ vutil/ppport.h -- Perl/Pollution/Portability Version 3.08
-/* If you use one of a few functions that were not present in earlier
- * versions of Perl, please add a define before the inclusion of ppport.h
- * for a static include, or use the GLOBAL request in a single module to
- * produce a global definition that can be referenced from the other
- * modules.
- *
- * Function: Static define: Extern define:
- * newCONSTSUB() NEED_newCONSTSUB NEED_newCONSTSUB_GLOBAL
- *
- */
-
+ Automatically created by Devel::PPPort running under
+ perl 5.008007 on Fri Mar 24 15:19:01 2006.
-/* To verify whether ppport.h is needed for your module, and whether any
- * special defines should be used, ppport.h can be run through Perl to check
- * your source code. Simply say:
- *
- * perl -x ppport.h *.c *.h *.xs foo/bar*.c [etc]
- *
- * The result will be a list of patches suggesting changes that should at
- * least be acceptable, if not necessarily the most efficient solution, or a
- * fix for all possible problems. It won't catch where dTHR is needed, and
- * doesn't attempt to account for global macro or function definitions,
- * nested includes, typemaps, etc.
- *
- * In order to test for the need of dTHR, please try your module under a
- * recent version of Perl that has threading compiled-in.
- *
- */
+----------------------------------------------------------------------
-
-/*
-#!/usr/bin/perl
- at ARGV = ("*.xs") if !@ARGV;
-%badmacros = %funcs = %macros = (); $replace = 0;
-foreach (<DATA>) {
- $funcs{$1} = 1 if /Provide:\s+(\S+)/;
- $macros{$1} = 1 if /^#\s*define\s+([a-zA-Z0-9_]+)/;
- $replace = $1 if /Replace:\s+(\d+)/;
- $badmacros{$2}=$1 if $replace and /^#\s*define\s+([a-zA-Z0-9_]+).*?\s+([a-zA-Z0-9_]+)/;
- $badmacros{$1}=$2 if /Replace (\S+) with (\S+)/;
+SKIP
+if (@ARGV && $ARGV[0] eq '--unstrip') {
+ eval { require Devel::PPPort };
+ $@ and die "Cannot require Devel::PPPort, please install.\n";
+ Devel::PPPort::WriteFile($0);
+ exit 0;
}
-foreach $filename (map(glob($_), at ARGV)) {
- unless (open(IN, "<$filename")) {
- warn "Unable to read from $file: $!\n";
- next;
- }
- print "Scanning $filename...\n";
- $c = ""; while (<IN>) { $c .= $_; } close(IN);
- $need_include = 0; %add_func = (); $changes = 0;
- $has_include = ($c =~ /#.*include.*ppport/m);
+print <<END;
- foreach $func (keys %funcs) {
- if ($c =~ /#.*define.*\bNEED_$func(_GLOBAL)?\b/m) {
- if ($c !~ /\b$func\b/m) {
- print "If $func isn't needed, you don't need to request it.\n" if
- $changes += ($c =~ s/^.*#.*define.*\bNEED_$func\b.*\n//m);
- } else {
- print "Uses $func\n";
- $need_include = 1;
- }
- } else {
- if ($c =~ /\b$func\b/m) {
- $add_func{$func} =1 ;
- print "Uses $func\n";
- $need_include = 1;
- }
- }
- }
+Sorry, but this is a stripped version of $0.
- if (not $need_include) {
- foreach $macro (keys %macros) {
- if ($c =~ /\b$macro\b/m) {
- print "Uses $macro\n";
- $need_include = 1;
- }
- }
- }
+To be able to use its original script and doc functionality,
+please try to regenerate this file using:
- foreach $badmacro (keys %badmacros) {
- if ($c =~ /\b$badmacro\b/m) {
- $changes += ($c =~ s/\b$badmacro\b/$badmacros{$badmacro}/gm);
- print "Uses $badmacros{$badmacro} (instead of $badmacro)\n";
- $need_include = 1;
- }
- }
-
- if (scalar(keys %add_func) or $need_include != $has_include) {
- if (!$has_include) {
- $inc = join('',map("#define NEED_$_\n", sort keys %add_func)).
- "#include \"ppport.h\"\n";
- $c = "$inc$c" unless $c =~ s/#.*include.*XSUB.*\n/$&$inc/m;
- } elsif (keys %add_func) {
- $inc = join('',map("#define NEED_$_\n", sort keys %add_func));
- $c = "$inc$c" unless $c =~ s/^.*#.*include.*ppport.*$/$inc$&/m;
- }
- if (!$need_include) {
- print "Doesn't seem to need ppport.h.\n";
- $c =~ s/^.*#.*include.*ppport.*\n//m;
- }
- $changes++;
- }
-
- if ($changes) {
- open(OUT,"ppport.h.$$");
- print OUT $c;
- close(OUT);
- open(DIFF, "diff -u $filename ppport.h.$$|");
- while (<DIFF>) { s!ppport\.h\.$$!$filename.patched!; print STDOUT; }
- close(DIFF);
- unlink("ppport.h.$$");
- } else {
- print "Looks OK\n";
- }
-}
+ $^X $0 --unstrip
+
+END
__DATA__
*/
#ifndef _P_P_PORTABILITY_H_
#define _P_P_PORTABILITY_H_
+#ifndef DPPP_NAMESPACE
+# define DPPP_NAMESPACE DPPP_
+#endif
+
+#define DPPP_CAT2(x,y) CAT2(x,y)
+#define DPPP_(name) DPPP_CAT2(DPPP_NAMESPACE, name)
+
#ifndef PERL_REVISION
-# ifndef __PATCHLEVEL_H_INCLUDED__
-# define PERL_PATCHLEVEL_H_IMPLICIT
-# include <patchlevel.h>
-# endif
-# if !(defined(PERL_VERSION) || (defined(SUBVERSION) && defined(PATCHLEVEL)))
-# include <could_not_find_Perl_patchlevel.h>
-# endif
-# ifndef PERL_REVISION
-# define PERL_REVISION (5)
- /* Replace: 1 */
-# define PERL_VERSION PATCHLEVEL
-# define PERL_SUBVERSION SUBVERSION
- /* Replace PERL_PATCHLEVEL with PERL_VERSION */
- /* Replace: 0 */
-# endif
+# if !defined(__PATCHLEVEL_H_INCLUDED__) && !(defined(PATCHLEVEL) && defined(SUBVERSION))
+# define PERL_PATCHLEVEL_H_IMPLICIT
+# include <patchlevel.h>
+# endif
+# if !(defined(PERL_VERSION) || (defined(SUBVERSION) && defined(PATCHLEVEL)))
+# include <could_not_find_Perl_patchlevel.h>
+# endif
+# ifndef PERL_REVISION
+# define PERL_REVISION (5)
+ /* Replace: 1 */
+# define PERL_VERSION PATCHLEVEL
+# define PERL_SUBVERSION SUBVERSION
+ /* Replace PERL_PATCHLEVEL with PERL_VERSION */
+ /* Replace: 0 */
+# endif
#endif
#define PERL_BCDVERSION ((PERL_REVISION * 0x1000000L) + (PERL_VERSION * 0x1000L) + PERL_SUBVERSION)
-/* It is very unlikely that anyone will try to use this with Perl 6
+/* It is very unlikely that anyone will try to use this with Perl 6
(or greater), but who knows.
*/
#if PERL_REVISION != 5
-# error ppport.h only works with Perl version 5
+# error vutil/ppport.h only works with Perl version 5
#endif /* PERL_REVISION != 5 */
-#ifndef ERRSV
-# define ERRSV perl_get_sv("@",FALSE)
+#ifdef I_LIMITS
+# include <limits.h>
#endif
-#if (PERL_VERSION < 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION <= 5))
-/* Replace: 1 */
-# define PL_Sv Sv
-# define PL_compiling compiling
-# define PL_copline copline
-# define PL_curcop curcop
-# define PL_curstash curstash
-# define PL_defgv defgv
-# define PL_dirty dirty
-# define PL_dowarn dowarn
-# define PL_hints hints
-# define PL_na na
-# define PL_perldb perldb
-# define PL_rsfp_filters rsfp_filters
-# define PL_rsfpv rsfp
-# define PL_stdingv stdingv
-# define PL_sv_no sv_no
-# define PL_sv_undef sv_undef
-# define PL_sv_yes sv_yes
-/* Replace: 0 */
+#ifndef PERL_UCHAR_MIN
+# define PERL_UCHAR_MIN ((unsigned char)0)
#endif
-#ifdef HASATTRIBUTE
-# if (defined(__GNUC__) && defined(__cplusplus)) || defined(__INTEL_COMPILER)
-# define PERL_UNUSED_DECL
+#ifndef PERL_UCHAR_MAX
+# ifdef UCHAR_MAX
+# define PERL_UCHAR_MAX ((unsigned char)UCHAR_MAX)
# else
-# define PERL_UNUSED_DECL __attribute__((unused))
+# ifdef MAXUCHAR
+# define PERL_UCHAR_MAX ((unsigned char)MAXUCHAR)
+# else
+# define PERL_UCHAR_MAX ((unsigned char)~(unsigned)0)
+# endif
# endif
-#else
-# define PERL_UNUSED_DECL
#endif
-#ifndef dNOOP
-# define NOOP (void)0
-# define dNOOP extern int Perl___notused PERL_UNUSED_DECL
+#ifndef PERL_USHORT_MIN
+# define PERL_USHORT_MIN ((unsigned short)0)
#endif
-#ifndef dTHR
-# define dTHR dNOOP
+#ifndef PERL_USHORT_MAX
+# ifdef USHORT_MAX
+# define PERL_USHORT_MAX ((unsigned short)USHORT_MAX)
+# else
+# ifdef MAXUSHORT
+# define PERL_USHORT_MAX ((unsigned short)MAXUSHORT)
+# else
+# ifdef USHRT_MAX
+# define PERL_USHORT_MAX ((unsigned short)USHRT_MAX)
+# else
+# define PERL_USHORT_MAX ((unsigned short)~(unsigned)0)
+# endif
+# endif
+# endif
#endif
-#ifndef dTHX
-# define dTHX dNOOP
-# define dTHXa(x) dNOOP
-# define dTHXoa(x) dNOOP
+#ifndef PERL_SHORT_MAX
+# ifdef SHORT_MAX
+# define PERL_SHORT_MAX ((short)SHORT_MAX)
+# else
+# ifdef MAXSHORT /* Often used in <values.h> */
+# define PERL_SHORT_MAX ((short)MAXSHORT)
+# else
+# ifdef SHRT_MAX
+# define PERL_SHORT_MAX ((short)SHRT_MAX)
+# else
+# define PERL_SHORT_MAX ((short) (PERL_USHORT_MAX >> 1))
+# endif
+# endif
+# endif
#endif
-#ifndef pTHX
-# define pTHX void
-# define pTHX_
-# define aTHX
-# define aTHX_
-#endif
+#ifndef PERL_SHORT_MIN
+# ifdef SHORT_MIN
+# define PERL_SHORT_MIN ((short)SHORT_MIN)
+# else
+# ifdef MINSHORT
+# define PERL_SHORT_MIN ((short)MINSHORT)
+# else
+# ifdef SHRT_MIN
+# define PERL_SHORT_MIN ((short)SHRT_MIN)
+# else
+# define PERL_SHORT_MIN (-PERL_SHORT_MAX - ((3 & -1) == 3))
+# endif
+# endif
+# endif
+#endif
-#ifndef dAX
-# define dAX I32 ax = MARK - PL_stack_base + 1
+#ifndef PERL_UINT_MAX
+# ifdef UINT_MAX
+# define PERL_UINT_MAX ((unsigned int)UINT_MAX)
+# else
+# ifdef MAXUINT
+# define PERL_UINT_MAX ((unsigned int)MAXUINT)
+# else
+# define PERL_UINT_MAX (~(unsigned int)0)
+# endif
+# endif
#endif
-#ifndef dITEMS
-# define dITEMS I32 items = SP - MARK
+
+#ifndef PERL_UINT_MIN
+# define PERL_UINT_MIN ((unsigned int)0)
#endif
-/* IV could also be a quad (say, a long long), but Perls
- * capable of those should have IVSIZE already. */
-#if !defined(IVSIZE) && defined(LONGSIZE)
-# define IVSIZE LONGSIZE
+#ifndef PERL_INT_MAX
+# ifdef INT_MAX
+# define PERL_INT_MAX ((int)INT_MAX)
+# else
+# ifdef MAXINT /* Often used in <values.h> */
+# define PERL_INT_MAX ((int)MAXINT)
+# else
+# define PERL_INT_MAX ((int)(PERL_UINT_MAX >> 1))
+# endif
+# endif
#endif
+
+#ifndef PERL_INT_MIN
+# ifdef INT_MIN
+# define PERL_INT_MIN ((int)INT_MIN)
+# else
+# ifdef MININT
+# define PERL_INT_MIN ((int)MININT)
+# else
+# define PERL_INT_MIN (-PERL_INT_MAX - ((3 & -1) == 3))
+# endif
+# endif
+#endif
+
+#ifndef PERL_ULONG_MAX
+# ifdef ULONG_MAX
+# define PERL_ULONG_MAX ((unsigned long)ULONG_MAX)
+# else
+# ifdef MAXULONG
+# define PERL_ULONG_MAX ((unsigned long)MAXULONG)
+# else
+# define PERL_ULONG_MAX (~(unsigned long)0)
+# endif
+# endif
+#endif
+
+#ifndef PERL_ULONG_MIN
+# define PERL_ULONG_MIN ((unsigned long)0L)
+#endif
+
+#ifndef PERL_LONG_MAX
+# ifdef LONG_MAX
+# define PERL_LONG_MAX ((long)LONG_MAX)
+# else
+# ifdef MAXLONG
+# define PERL_LONG_MAX ((long)MAXLONG)
+# else
+# define PERL_LONG_MAX ((long) (PERL_ULONG_MAX >> 1))
+# endif
+# endif
+#endif
+
+#ifndef PERL_LONG_MIN
+# ifdef LONG_MIN
+# define PERL_LONG_MIN ((long)LONG_MIN)
+# else
+# ifdef MINLONG
+# define PERL_LONG_MIN ((long)MINLONG)
+# else
+# define PERL_LONG_MIN (-PERL_LONG_MAX - ((3 & -1) == 3))
+# endif
+# endif
+#endif
+
+#if defined(HAS_QUAD) && (defined(convex) || defined(uts))
+# ifndef PERL_UQUAD_MAX
+# ifdef ULONGLONG_MAX
+# define PERL_UQUAD_MAX ((unsigned long long)ULONGLONG_MAX)
+# else
+# ifdef MAXULONGLONG
+# define PERL_UQUAD_MAX ((unsigned long long)MAXULONGLONG)
+# else
+# define PERL_UQUAD_MAX (~(unsigned long long)0)
+# endif
+# endif
+# endif
+
+# ifndef PERL_UQUAD_MIN
+# define PERL_UQUAD_MIN ((unsigned long long)0L)
+# endif
+
+# ifndef PERL_QUAD_MAX
+# ifdef LONGLONG_MAX
+# define PERL_QUAD_MAX ((long long)LONGLONG_MAX)
+# else
+# ifdef MAXLONGLONG
+# define PERL_QUAD_MAX ((long long)MAXLONGLONG)
+# else
+# define PERL_QUAD_MAX ((long long) (PERL_UQUAD_MAX >> 1))
+# endif
+# endif
+# endif
+
+# ifndef PERL_QUAD_MIN
+# ifdef LONGLONG_MIN
+# define PERL_QUAD_MIN ((long long)LONGLONG_MIN)
+# else
+# ifdef MINLONGLONG
+# define PERL_QUAD_MIN ((long long)MINLONGLONG)
+# else
+# define PERL_QUAD_MIN (-PERL_QUAD_MAX - ((3 & -1) == 3))
+# endif
+# endif
+# endif
+#endif
+
+/* This is based on code from 5.003 perl.h */
+#ifdef HAS_QUAD
+# ifdef cray
+#ifndef IVTYPE
+# define IVTYPE int
+#endif
+
+#ifndef IV_MIN
+# define IV_MIN PERL_INT_MIN
+#endif
+
+#ifndef IV_MAX
+# define IV_MAX PERL_INT_MAX
+#endif
+
+#ifndef UV_MIN
+# define UV_MIN PERL_UINT_MIN
+#endif
+
+#ifndef UV_MAX
+# define UV_MAX PERL_UINT_MAX
+#endif
+
+# ifdef INTSIZE
#ifndef IVSIZE
-# define IVSIZE 4 /* A bold guess, but the best we can make. */
+# define IVSIZE INTSIZE
#endif
+# endif
+# else
+# if defined(convex) || defined(uts)
+#ifndef IVTYPE
+# define IVTYPE long long
+#endif
+
+#ifndef IV_MIN
+# define IV_MIN PERL_QUAD_MIN
+#endif
+
+#ifndef IV_MAX
+# define IV_MAX PERL_QUAD_MAX
+#endif
+
+#ifndef UV_MIN
+# define UV_MIN PERL_UQUAD_MIN
+#endif
+
+#ifndef UV_MAX
+# define UV_MAX PERL_UQUAD_MAX
+#endif
+
+# ifdef LONGLONGSIZE
+#ifndef IVSIZE
+# define IVSIZE LONGLONGSIZE
+#endif
+
+# endif
+# else
+#ifndef IVTYPE
+# define IVTYPE long
+#endif
+
+#ifndef IV_MIN
+# define IV_MIN PERL_LONG_MIN
+#endif
+
+#ifndef IV_MAX
+# define IV_MAX PERL_LONG_MAX
+#endif
+
+#ifndef UV_MIN
+# define UV_MIN PERL_ULONG_MIN
+#endif
+
+#ifndef UV_MAX
+# define UV_MAX PERL_ULONG_MAX
+#endif
+
+# ifdef LONGSIZE
+#ifndef IVSIZE
+# define IVSIZE LONGSIZE
+#endif
+
+# endif
+# endif
+# endif
+#ifndef IVSIZE
+# define IVSIZE 8
+#endif
+
+#ifndef PERL_QUAD_MIN
+# define PERL_QUAD_MIN IV_MIN
+#endif
+
+#ifndef PERL_QUAD_MAX
+# define PERL_QUAD_MAX IV_MAX
+#endif
+
+#ifndef PERL_UQUAD_MIN
+# define PERL_UQUAD_MIN UV_MIN
+#endif
+
+#ifndef PERL_UQUAD_MAX
+# define PERL_UQUAD_MAX UV_MAX
+#endif
+
+#else
+#ifndef IVTYPE
+# define IVTYPE long
+#endif
+
+#ifndef IV_MIN
+# define IV_MIN PERL_LONG_MIN
+#endif
+
+#ifndef IV_MAX
+# define IV_MAX PERL_LONG_MAX
+#endif
+
+#ifndef UV_MIN
+# define UV_MIN PERL_ULONG_MIN
+#endif
+
+#ifndef UV_MAX
+# define UV_MAX PERL_ULONG_MAX
+#endif
+
+#endif
+
+#ifndef IVSIZE
+# ifdef LONGSIZE
+# define IVSIZE LONGSIZE
+# else
+# define IVSIZE 4 /* A bold guess, but the best we can make. */
+# endif
+#endif
+#ifndef UVTYPE
+# define UVTYPE unsigned IVTYPE
+#endif
+
#ifndef UVSIZE
-# define UVSIZE IVSIZE
+# define UVSIZE IVSIZE
#endif
+#ifndef sv_setuv
+# define sv_setuv(sv, uv) \
+ STMT_START { \
+ UV TeMpUv = uv; \
+ if (TeMpUv <= IV_MAX) \
+ sv_setiv(sv, TeMpUv); \
+ else \
+ sv_setnv(sv, (double)TeMpUv); \
+ } STMT_END
+#endif
+#ifndef newSVuv
+# define newSVuv(uv) ((uv) <= IV_MAX ? newSViv((IV)uv) : newSVnv((NV)uv))
+#endif
+#ifndef sv_2uv
+# define sv_2uv(sv) ((PL_Sv = (sv)), (UV) (SvNOK(PL_Sv) ? SvNV(PL_Sv) : sv_2nv(PL_Sv)))
+#endif
+#ifndef SvUVX
+# define SvUVX(sv) ((UV)SvIVX(sv))
+#endif
+
+#ifndef SvUVXx
+# define SvUVXx(sv) SvUVX(sv)
+#endif
+
+#ifndef SvUV
+# define SvUV(sv) (SvIOK(sv) ? SvUVX(sv) : sv_2uv(sv))
+#endif
+
+#ifndef SvUVx
+# define SvUVx(sv) ((PL_Sv = (sv)), SvUV(PL_Sv))
+#endif
+
+/* Hint: sv_uv
+ * Always use the SvUVx() macro instead of sv_uv().
+ */
+#ifndef sv_uv
+# define sv_uv(sv) SvUVx(sv)
+#endif
+#ifndef XST_mUV
+# define XST_mUV(i,v) (ST(i) = sv_2mortal(newSVuv(v)) )
+#endif
+
+#ifndef XSRETURN_UV
+# define XSRETURN_UV(v) STMT_START { XST_mUV(0,v); XSRETURN(1); } STMT_END
+#endif
+#ifndef PUSHu
+# define PUSHu(u) STMT_START { sv_setuv(TARG, (UV)(u)); PUSHTARG; } STMT_END
+#endif
+
+#ifndef XPUSHu
+# define XPUSHu(u) STMT_START { sv_setuv(TARG, (UV)(u)); XPUSHTARG; } STMT_END
+#endif
+
+#ifdef HAS_MEMCMP
+#ifndef memNE
+# define memNE(s1,s2,l) (memcmp(s1,s2,l))
+#endif
+
+#ifndef memEQ
+# define memEQ(s1,s2,l) (!memcmp(s1,s2,l))
+#endif
+
+#else
+#ifndef memNE
+# define memNE(s1,s2,l) (bcmp(s1,s2,l))
+#endif
+
+#ifndef memEQ
+# define memEQ(s1,s2,l) (!bcmp(s1,s2,l))
+#endif
+
+#endif
+#ifndef MoveD
+# define MoveD(s,d,n,t) memmove((char*)(d),(char*)(s), (n) * sizeof(t))
+#endif
+
+#ifndef CopyD
+# define CopyD(s,d,n,t) memcpy((char*)(d),(char*)(s), (n) * sizeof(t))
+#endif
+
+#ifdef HAS_MEMSET
+#ifndef ZeroD
+# define ZeroD(d,n,t) memzero((char*)(d), (n) * sizeof(t))
+#endif
+
+#else
+#ifndef ZeroD
+# define ZeroD(d,n,t) ((void)memzero((char*)(d), (n) * sizeof(t)), d)
+#endif
+
+#endif
+#ifndef Poison
+# define Poison(d,n,t) (void)memset((char*)(d), 0xAB, (n) * sizeof(t))
+#endif
+#ifndef Newx
+# define Newx(v,n,t) New(0,v,n,t)
+#endif
+
+#ifndef Newxc
+# define Newxc(v,n,t,c) Newc(0,v,n,t,c)
+#endif
+
+#ifndef Newxz
+# define Newxz(v,n,t) Newz(0,v,n,t)
+#endif
+
+#if ((PERL_VERSION < 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION <= 5)))
+/* Replace: 1 */
+# define PL_DBsingle DBsingle
+# define PL_DBsub DBsub
+# define PL_Sv Sv
+# define PL_compiling compiling
+# define PL_copline copline
+# define PL_curcop curcop
+# define PL_curstash curstash
+# define PL_debstash debstash
+# define PL_defgv defgv
+# define PL_diehook diehook
+# define PL_dirty dirty
+# define PL_dowarn dowarn
+# define PL_errgv errgv
+# define PL_hexdigit hexdigit
+# define PL_hints hints
+# define PL_na na
+# define PL_no_modify no_modify
+# define PL_perl_destruct_level perl_destruct_level
+# define PL_perldb perldb
+# define PL_ppaddr ppaddr
+# define PL_rsfp_filters rsfp_filters
+# define PL_rsfp rsfp
+# define PL_stack_base stack_base
+# define PL_stack_sp stack_sp
+# define PL_stdingv stdingv
+# define PL_sv_arenaroot sv_arenaroot
+# define PL_sv_no sv_no
+# define PL_sv_undef sv_undef
+# define PL_sv_yes sv_yes
+# define PL_tainted tainted
+# define PL_tainting tainting
+/* Replace: 0 */
+#endif
+
+#ifndef PERL_UNUSED_DECL
+# ifdef HASATTRIBUTE
+# if (defined(__GNUC__) && defined(__cplusplus)) || defined(__INTEL_COMPILER)
+# define PERL_UNUSED_DECL
+# else
+# define PERL_UNUSED_DECL __attribute__((unused))
+# endif
+# else
+# define PERL_UNUSED_DECL
+# endif
+#endif
+#ifndef NOOP
+# define NOOP (void)0
+#endif
+
+#ifndef dNOOP
+# define dNOOP extern int Perl___notused PERL_UNUSED_DECL
+#endif
+
#ifndef NVTYPE
-# if defined(USE_LONG_DOUBLE) && defined(HAS_LONG_DOUBLE)
-# define NVTYPE long double
-# else
-# define NVTYPE double
-# endif
+# if defined(USE_LONG_DOUBLE) && defined(HAS_LONG_DOUBLE)
+# define NVTYPE long double
+# else
+# define NVTYPE double
+# endif
typedef NVTYPE NV;
#endif
#ifndef INT2PTR
-#if (IVSIZE == PTRSIZE) && (UVSIZE == PTRSIZE)
-# define PTRV UV
-# define INT2PTR(any,d) (any)(d)
-#else
+# if (IVSIZE == PTRSIZE) && (UVSIZE == PTRSIZE)
+# define PTRV UV
+# define INT2PTR(any,d) (any)(d)
+# else
+# if PTRSIZE == LONGSIZE
+# define PTRV unsigned long
+# else
+# define PTRV unsigned
+# endif
+# define INT2PTR(any,d) (any)(PTRV)(d)
+# endif
+
+# define NUM2PTR(any,d) (any)(PTRV)(d)
+# define PTR2IV(p) INT2PTR(IV,p)
+# define PTR2UV(p) INT2PTR(UV,p)
+# define PTR2NV(p) NUM2PTR(NV,p)
+
# if PTRSIZE == LONGSIZE
-# define PTRV unsigned long
+# define PTR2ul(p) (unsigned long)(p)
# else
-# define PTRV unsigned
+# define PTR2ul(p) INT2PTR(unsigned long,p)
# endif
-# define INT2PTR(any,d) (any)(PTRV)(d)
-#endif
-#define NUM2PTR(any,d) (any)(PTRV)(d)
-#define PTR2IV(p) INT2PTR(IV,p)
-#define PTR2UV(p) INT2PTR(UV,p)
-#define PTR2NV(p) NUM2PTR(NV,p)
-#if PTRSIZE == LONGSIZE
-# define PTR2ul(p) (unsigned long)(p)
+
+#endif /* !INT2PTR */
+
+#undef START_EXTERN_C
+#undef END_EXTERN_C
+#undef EXTERN_C
+#ifdef __cplusplus
+# define START_EXTERN_C extern "C" {
+# define END_EXTERN_C }
+# define EXTERN_C extern "C"
#else
-# define PTR2ul(p) INT2PTR(unsigned long,p)
+# define START_EXTERN_C
+# define END_EXTERN_C
+# define EXTERN_C extern
#endif
-#endif /* !INT2PTR */
+#ifndef PERL_GCC_BRACE_GROUPS_FORBIDDEN
+# if defined(__STRICT_ANSI__) && defined(PERL_GCC_PEDANTIC)
+# define PERL_GCC_BRACE_GROUPS_FORBIDDEN
+# endif
+#endif
+#undef STMT_START
+#undef STMT_END
+#if defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN) && !defined(__cplusplus)
+# define STMT_START (void)( /* gcc supports ``({ STATEMENTS; })'' */
+# define STMT_END )
+#else
+# if defined(VOIDFLAGS) && (VOIDFLAGS) && (defined(sun) || defined(__sun__)) && !defined(__GNUC__)
+# define STMT_START if (1)
+# define STMT_END else (void)0
+# else
+# define STMT_START do
+# define STMT_END while (0)
+# endif
+#endif
#ifndef boolSV
-# define boolSV(b) ((b) ? &PL_sv_yes : &PL_sv_no)
+# define boolSV(b) ((b) ? &PL_sv_yes : &PL_sv_no)
#endif
-#ifndef gv_stashpvn
-# define gv_stashpvn(str,len,flags) gv_stashpv(str,flags)
+/* DEFSV appears first in 5.004_56 */
+#ifndef DEFSV
+# define DEFSV GvSV(PL_defgv)
#endif
+#ifndef SAVE_DEFSV
+# define SAVE_DEFSV SAVESPTR(GvSV(PL_defgv))
+#endif
+
+/* Older perls (<=5.003) lack AvFILLp */
+#ifndef AvFILLp
+# define AvFILLp AvFILL
+#endif
+#ifndef ERRSV
+# define ERRSV get_sv("@",FALSE)
+#endif
#ifndef newSVpvn
-# define newSVpvn(data,len) ((len) ? newSVpv ((data), (len)) : newSVpv ("", 0))
+# define newSVpvn(data,len) ((data) \
+ ? ((len) ? newSVpv((data), (len)) : newSVpv("", 0)) \
+ : newSV(0))
#endif
-#ifndef newRV_inc
+/* Hint: gv_stashpvn
+ * This function's backport doesn't support the length parameter, but
+ * rather ignores it. Portability can only be ensured if the length
+ * parameter is used for speed reasons, but the length can always be
+ * correctly computed from the string argument.
+ */
+#ifndef gv_stashpvn
+# define gv_stashpvn(str,len,create) gv_stashpv(str,create)
+#endif
+
/* Replace: 1 */
-# define newRV_inc(sv) newRV(sv)
+#ifndef get_cv
+# define get_cv perl_get_cv
+#endif
+
+#ifndef get_sv
+# define get_sv perl_get_sv
+#endif
+
+#ifndef get_av
+# define get_av perl_get_av
+#endif
+
+#ifndef get_hv
+# define get_hv perl_get_hv
+#endif
+
/* Replace: 0 */
+#ifndef dUNDERBAR
+# define dUNDERBAR dNOOP
#endif
-/* DEFSV appears first in 5.004_56 */
-#ifndef DEFSV
-# define DEFSV GvSV(PL_defgv)
+#ifndef UNDERBAR
+# define UNDERBAR DEFSV
#endif
+#ifndef dAX
+# define dAX I32 ax = MARK - PL_stack_base + 1
+#endif
-#ifndef SAVE_DEFSV
-# define SAVE_DEFSV SAVESPTR(GvSV(PL_defgv))
+#ifndef dITEMS
+# define dITEMS I32 items = SP - MARK
#endif
+#ifndef dXSTARG
+# define dXSTARG SV * targ = sv_newmortal()
+#endif
+#ifndef dAXMARK
+# define dAXMARK I32 ax = POPMARK; \
+ register SV ** const mark = PL_stack_base + ax++
+#endif
+#ifndef XSprePUSH
+# define XSprePUSH (sp = PL_stack_base + ax - 1)
+#endif
+#if ((PERL_VERSION < 5) || ((PERL_VERSION == 5) && (PERL_SUBVERSION < 0)))
+# undef XSRETURN
+# define XSRETURN(off) \
+ STMT_START { \
+ PL_stack_sp = PL_stack_base + ax + ((off) - 1); \
+ return; \
+ } STMT_END
+#endif
+
+#ifndef PERL_SIGNALS_UNSAFE_FLAG
+
+#define PERL_SIGNALS_UNSAFE_FLAG 0x0001
+
+#if defined(NEED_PL_signals)
+static U32 DPPP_(my_PL_signals) = PERL_SIGNALS_UNSAFE_FLAG;
+#elif defined(NEED_PL_signals_GLOBAL)
+U32 DPPP_(my_PL_signals) = PERL_SIGNALS_UNSAFE_FLAG;
+#else
+extern U32 DPPP_(my_PL_signals);
+#endif
+#define PL_signals DPPP_(my_PL_signals)
+
+#endif
+#ifndef dTHR
+# define dTHR dNOOP
+#endif
+#ifndef dTHX
+# define dTHX dNOOP
+#endif
+
+#ifndef dTHXa
+# define dTHXa(x) dNOOP
+#endif
+#ifndef pTHX
+# define pTHX void
+#endif
+
+#ifndef pTHX_
+# define pTHX_
+#endif
+
+#ifndef aTHX
+# define aTHX
+#endif
+
+#ifndef aTHX_
+# define aTHX_
+#endif
+#ifndef dTHXoa
+# define dTHXoa(x) dTHXa(x)
+#endif
+#ifndef PUSHmortal
+# define PUSHmortal PUSHs(sv_newmortal())
+#endif
+
+#ifndef mPUSHp
+# define mPUSHp(p,l) sv_setpvn_mg(PUSHmortal, (p), (l))
+#endif
+
+#ifndef mPUSHn
+# define mPUSHn(n) sv_setnv_mg(PUSHmortal, (NV)(n))
+#endif
+
+#ifndef mPUSHi
+# define mPUSHi(i) sv_setiv_mg(PUSHmortal, (IV)(i))
+#endif
+
+#ifndef mPUSHu
+# define mPUSHu(u) sv_setuv_mg(PUSHmortal, (UV)(u))
+#endif
+#ifndef XPUSHmortal
+# define XPUSHmortal XPUSHs(sv_newmortal())
+#endif
+
+#ifndef mXPUSHp
+# define mXPUSHp(p,l) STMT_START { EXTEND(sp,1); sv_setpvn_mg(PUSHmortal, (p), (l)); } STMT_END
+#endif
+
+#ifndef mXPUSHn
+# define mXPUSHn(n) STMT_START { EXTEND(sp,1); sv_setnv_mg(PUSHmortal, (NV)(n)); } STMT_END
+#endif
+
+#ifndef mXPUSHi
+# define mXPUSHi(i) STMT_START { EXTEND(sp,1); sv_setiv_mg(PUSHmortal, (IV)(i)); } STMT_END
+#endif
+
+#ifndef mXPUSHu
+# define mXPUSHu(u) STMT_START { EXTEND(sp,1); sv_setuv_mg(PUSHmortal, (UV)(u)); } STMT_END
+#endif
+
+/* Replace: 1 */
+#ifndef call_sv
+# define call_sv perl_call_sv
+#endif
+
+#ifndef call_pv
+# define call_pv perl_call_pv
+#endif
+
+#ifndef call_argv
+# define call_argv perl_call_argv
+#endif
+
+#ifndef call_method
+# define call_method perl_call_method
+#endif
+#ifndef eval_sv
+# define eval_sv perl_eval_sv
+#endif
+
+/* Replace: 0 */
+
+/* Replace perl_eval_pv with eval_pv */
+/* eval_pv depends on eval_sv */
+
+#ifndef eval_pv
+#if defined(NEED_eval_pv)
+static SV* DPPP_(my_eval_pv)(char *p, I32 croak_on_error);
+static
+#else
+extern SV* DPPP_(my_eval_pv)(char *p, I32 croak_on_error);
+#endif
+
+#ifdef eval_pv
+# undef eval_pv
+#endif
+#define eval_pv(a,b) DPPP_(my_eval_pv)(aTHX_ a,b)
+#define Perl_eval_pv DPPP_(my_eval_pv)
+
+#if defined(NEED_eval_pv) || defined(NEED_eval_pv_GLOBAL)
+
+SV*
+DPPP_(my_eval_pv)(char *p, I32 croak_on_error)
+{
+ dSP;
+ SV* sv = newSVpv(p, 0);
+
+ PUSHMARK(sp);
+ eval_sv(sv, G_SCALAR);
+ SvREFCNT_dec(sv);
+
+ SPAGAIN;
+ sv = POPs;
+ PUTBACK;
+
+ if (croak_on_error && SvTRUE(GvSV(errgv)))
+ croak(SvPVx(GvSV(errgv), na));
+
+ return sv;
+}
+
+#endif
+#endif
+#ifndef newRV_inc
+# define newRV_inc(sv) newRV(sv) /* Replace */
+#endif
+
#ifndef newRV_noinc
-# ifdef __GNUC__
-# define newRV_noinc(sv) \
- ({ \
- SV *nsv = (SV*)newRV(sv); \
- SvREFCNT_dec(sv); \
- nsv; \
- })
-# else
-# if defined(USE_THREADS)
-static SV * newRV_noinc (SV * sv)
+#if defined(NEED_newRV_noinc)
+static SV * DPPP_(my_newRV_noinc)(SV *sv);
+static
+#else
+extern SV * DPPP_(my_newRV_noinc)(SV *sv);
+#endif
+
+#ifdef newRV_noinc
+# undef newRV_noinc
+#endif
+#define newRV_noinc(a) DPPP_(my_newRV_noinc)(aTHX_ a)
+#define Perl_newRV_noinc DPPP_(my_newRV_noinc)
+
+#if defined(NEED_newRV_noinc) || defined(NEED_newRV_noinc_GLOBAL)
+SV *
+DPPP_(my_newRV_noinc)(SV *sv)
{
- SV *nsv = (SV*)newRV(sv);
- SvREFCNT_dec(sv);
- return nsv;
+ SV *rv = (SV *)newRV(sv);
+ SvREFCNT_dec(sv);
+ return rv;
}
-# else
-# define newRV_noinc(sv) \
- (PL_Sv=(SV*)newRV(sv), SvREFCNT_dec(sv), (SV*)PL_Sv)
-# endif
-# endif
#endif
+#endif
-/* Provide: newCONSTSUB */
+/* Hint: newCONSTSUB
+ * Returns a CV* as of perl-5.7.1. This return value is not supported
+ * by Devel::PPPort.
+ */
/* newCONSTSUB from IO.xs is in the core starting with 5.004_63 */
-#if (PERL_VERSION < 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION < 63))
-
+#if ((PERL_VERSION < 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION < 63))) && ((PERL_VERSION != 4) || (PERL_SUBVERSION != 5))
#if defined(NEED_newCONSTSUB)
+static void DPPP_(my_newCONSTSUB)(HV *stash, char *name, SV *sv);
static
#else
-extern void newCONSTSUB(HV * stash, char * name, SV *sv);
+extern void DPPP_(my_newCONSTSUB)(HV *stash, char *name, SV *sv);
#endif
+#ifdef newCONSTSUB
+# undef newCONSTSUB
+#endif
+#define newCONSTSUB(a,b,c) DPPP_(my_newCONSTSUB)(aTHX_ a,b,c)
+#define Perl_newCONSTSUB DPPP_(my_newCONSTSUB)
+
#if defined(NEED_newCONSTSUB) || defined(NEED_newCONSTSUB_GLOBAL)
+
void
-newCONSTSUB(stash,name,sv)
-HV *stash;
-char *name;
-SV *sv;
+DPPP_(my_newCONSTSUB)(HV *stash, char *name, SV *sv)
{
U32 oldhints = PL_hints;
HV *old_cop_stash = PL_curcop->cop_stash;
@@ -387,17 +934,12 @@
newSUB(
-#if (PERL_VERSION < 3) || ((PERL_VERSION == 3) && (PERL_SUBVERSION < 22))
- /* before 5.003_22 */
+#if ((PERL_VERSION < 3) || ((PERL_VERSION == 3) && (PERL_SUBVERSION < 22)))
start_subparse(),
-#else
-# if (PERL_VERSION == 3) && (PERL_SUBVERSION == 22)
- /* 5.003_22 */
+#elif ((PERL_VERSION == 3) && (PERL_SUBVERSION == 22))
start_subparse(0),
-# else
- /* 5.003_23 onwards */
+#else /* 5.003_23 onwards */
start_subparse(FALSE, 0),
-# endif
#endif
newSVOP(OP_CONST, 0, newSVpv(name,0)),
@@ -411,11 +953,8 @@
PL_curcop->cop_line = oldline;
}
#endif
+#endif
-#endif /* newCONSTSUB */
-
-#ifndef START_MY_CXT
-
/*
* Boilerplate macros for initializing and accessing interpreter-local
* data from C. All statics in extensions should be reworked to use
@@ -438,15 +977,17 @@
#if defined(MULTIPLICITY) || defined(PERL_OBJECT) || \
defined(PERL_CAPI) || defined(PERL_IMPLICIT_CONTEXT)
+#ifndef START_MY_CXT
+
/* This must appear in all extensions that define a my_cxt_t structure,
* right after the definition (i.e. at file scope). The non-threads
* case below uses it to declare the data as static. */
#define START_MY_CXT
-#if (PERL_VERSION < 4 || (PERL_VERSION == 4 && PERL_SUBVERSION < 68 ))
+#if ((PERL_VERSION < 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION < 68)))
/* Fetches the SV that keeps the per-interpreter data. */
#define dMY_CXT_SV \
- SV *my_cxt_sv = perl_get_sv(MY_CXT_KEY, FALSE)
+ SV *my_cxt_sv = get_sv(MY_CXT_KEY, FALSE)
#else /* >= perl5.004_68 */
#define dMY_CXT_SV \
SV *my_cxt_sv = *hv_fetch(PL_modglobal, MY_CXT_KEY, \
@@ -482,8 +1023,21 @@
#define aMY_CXT_ aMY_CXT,
#define _aMY_CXT ,aMY_CXT
+#endif /* START_MY_CXT */
+
+#ifndef MY_CXT_CLONE
+/* Clones the per-interpreter data. */
+#define MY_CXT_CLONE \
+ dMY_CXT_SV; \
+ my_cxt_t *my_cxtp = (my_cxt_t*)SvPVX(newSV(sizeof(my_cxt_t)-1));\
+ Copy(INT2PTR(my_cxt_t*, SvUV(my_cxt_sv)), my_cxtp, 1, my_cxt_t);\
+ sv_setuv(my_cxt_sv, PTR2UV(my_cxtp))
+#endif
+
#else /* single interpreter */
+#ifndef START_MY_CXT
+
#define START_MY_CXT static my_cxt_t my_cxt;
#define dMY_CXT_SV dNOOP
#define dMY_CXT dNOOP
@@ -497,238 +1051,866 @@
#define aMY_CXT_
#define _aMY_CXT
-#endif
-
#endif /* START_MY_CXT */
+#ifndef MY_CXT_CLONE
+#define MY_CXT_CLONE NOOP
+#endif
+
+#endif
+
#ifndef IVdf
# if IVSIZE == LONGSIZE
-# define IVdf "ld"
-# define UVuf "lu"
-# define UVof "lo"
-# define UVxf "lx"
-# define UVXf "lX"
-# else
-# if IVSIZE == INTSIZE
-# define IVdf "d"
-# define UVuf "u"
-# define UVof "o"
-# define UVxf "x"
-# define UVXf "X"
-# endif
-# endif
+# define IVdf "ld"
+# define UVuf "lu"
+# define UVof "lo"
+# define UVxf "lx"
+# define UVXf "lX"
+# else
+# if IVSIZE == INTSIZE
+# define IVdf "d"
+# define UVuf "u"
+# define UVof "o"
+# define UVxf "x"
+# define UVXf "X"
+# endif
+# endif
#endif
#ifndef NVef
-# if defined(USE_LONG_DOUBLE) && defined(HAS_LONG_DOUBLE) && \
- defined(PERL_PRIfldbl) /* Not very likely, but let's try anyway. */
-# define NVef PERL_PRIeldbl
-# define NVff PERL_PRIfldbl
-# define NVgf PERL_PRIgldbl
-# else
-# define NVef "e"
-# define NVff "f"
-# define NVgf "g"
-# endif
+# if defined(USE_LONG_DOUBLE) && defined(HAS_LONG_DOUBLE) && \
+ defined(PERL_PRIfldbl) /* Not very likely, but let's try anyway. */
+# define NVef PERL_PRIeldbl
+# define NVff PERL_PRIfldbl
+# define NVgf PERL_PRIgldbl
+# else
+# define NVef "e"
+# define NVff "f"
+# define NVgf "g"
+# endif
#endif
-#ifndef AvFILLp /* Older perls (<=5.003) lack AvFILLp */
-# define AvFILLp AvFILL
+#ifndef SvPV_nolen
+
+#if defined(NEED_sv_2pv_nolen)
+static char * DPPP_(my_sv_2pv_nolen)(pTHX_ register SV *sv);
+static
+#else
+extern char * DPPP_(my_sv_2pv_nolen)(pTHX_ register SV *sv);
#endif
+#ifdef sv_2pv_nolen
+# undef sv_2pv_nolen
+#endif
+#define sv_2pv_nolen(a) DPPP_(my_sv_2pv_nolen)(aTHX_ a)
+#define Perl_sv_2pv_nolen DPPP_(my_sv_2pv_nolen)
+
+#if defined(NEED_sv_2pv_nolen) || defined(NEED_sv_2pv_nolen_GLOBAL)
+
+char *
+DPPP_(my_sv_2pv_nolen)(pTHX_ register SV *sv)
+{
+ STRLEN n_a;
+ return sv_2pv(sv, &n_a);
+}
+
+#endif
+
+/* Hint: sv_2pv_nolen
+ * Use the SvPV_nolen() macro instead of sv_2pv_nolen().
+ */
+
+/* SvPV_nolen depends on sv_2pv_nolen */
+#define SvPV_nolen(sv) \
+ ((SvFLAGS(sv) & (SVf_POK)) == SVf_POK \
+ ? SvPVX(sv) : sv_2pv_nolen(sv))
+
+#endif
+
#ifdef SvPVbyte
-# if PERL_REVISION == 5 && PERL_VERSION < 7
- /* SvPVbyte does not work in perl-5.6.1, borrowed version for 5.7.3 */
-# undef SvPVbyte
-# define SvPVbyte(sv, lp) \
- ((SvFLAGS(sv) & (SVf_POK|SVf_UTF8)) == (SVf_POK) \
- ? ((lp = SvCUR(sv)), SvPVX(sv)) : my_sv_2pvbyte(aTHX_ sv, &lp))
- static char *
- my_sv_2pvbyte(pTHX_ register SV *sv, STRLEN *lp)
- {
- sv_utf8_downgrade(sv,0);
- return SvPV(sv,*lp);
- }
-# endif
+
+/* Hint: SvPVbyte
+ * Does not work in perl-5.6.1, vutil/ppport.h implements a version
+ * borrowed from perl-5.7.3.
+ */
+
+#if ((PERL_VERSION < 7) || ((PERL_VERSION == 7) && (PERL_SUBVERSION < 0)))
+
+#if defined(NEED_sv_2pvbyte)
+static char * DPPP_(my_sv_2pvbyte)(pTHX_ register SV *sv, STRLEN *lp);
+static
#else
-# define SvPVbyte SvPV
+extern char * DPPP_(my_sv_2pvbyte)(pTHX_ register SV *sv, STRLEN *lp);
#endif
-#ifndef SvPV_nolen
-# define SvPV_nolen(sv) \
- ((SvFLAGS(sv) & (SVf_POK)) == SVf_POK \
- ? SvPVX(sv) : sv_2pv_nolen(sv))
- static char *
- sv_2pv_nolen(pTHX_ register SV *sv)
- {
- STRLEN n_a;
- return sv_2pv(sv, &n_a);
- }
+#ifdef sv_2pvbyte
+# undef sv_2pvbyte
#endif
+#define sv_2pvbyte(a,b) DPPP_(my_sv_2pvbyte)(aTHX_ a,b)
+#define Perl_sv_2pvbyte DPPP_(my_sv_2pvbyte)
-#ifndef get_cv
-# define get_cv(name,create) perl_get_cv(name,create)
+#if defined(NEED_sv_2pvbyte) || defined(NEED_sv_2pvbyte_GLOBAL)
+
+char *
+DPPP_(my_sv_2pvbyte)(pTHX_ register SV *sv, STRLEN *lp)
+{
+ sv_utf8_downgrade(sv,0);
+ return SvPV(sv,*lp);
+}
+
#endif
-#ifndef get_sv
-# define get_sv(name,create) perl_get_sv(name,create)
+/* Hint: sv_2pvbyte
+ * Use the SvPVbyte() macro instead of sv_2pvbyte().
+ */
+
+#undef SvPVbyte
+
+/* SvPVbyte depends on sv_2pvbyte */
+#define SvPVbyte(sv, lp) \
+ ((SvFLAGS(sv) & (SVf_POK|SVf_UTF8)) == (SVf_POK) \
+ ? ((lp = SvCUR(sv)), SvPVX(sv)) : sv_2pvbyte(sv, &lp))
+
#endif
-#ifndef get_av
-# define get_av(name,create) perl_get_av(name,create)
+#else
+
+# define SvPVbyte SvPV
+# define sv_2pvbyte sv_2pv
+
#endif
-#ifndef get_hv
-# define get_hv(name,create) perl_get_hv(name,create)
+/* sv_2pvbyte_nolen depends on sv_2pv_nolen */
+#ifndef sv_2pvbyte_nolen
+# define sv_2pvbyte_nolen sv_2pv_nolen
#endif
-#ifndef call_argv
-# define call_argv perl_call_argv
+/* Hint: sv_pvn
+ * Always use the SvPV() macro instead of sv_pvn().
+ */
+#ifndef sv_pvn
+# define sv_pvn(sv, len) SvPV(sv, len)
#endif
-#ifndef call_method
-# define call_method perl_call_method
+/* Hint: sv_pvn_force
+ * Always use the SvPV_force() macro instead of sv_pvn_force().
+ */
+#ifndef sv_pvn_force
+# define sv_pvn_force(sv, len) SvPV_force(sv, len)
#endif
+#ifndef SvMAGIC_set
+# define SvMAGIC_set(sv, val) \
+ STMT_START { assert(SvTYPE(sv) >= SVt_PVMG); \
+ (((XPVMG*) SvANY(sv))->xmg_magic = (val)); } STMT_END
+#endif
-#ifndef call_pv
-# define call_pv perl_call_pv
+#if ((PERL_VERSION < 9) || ((PERL_VERSION == 9) && (PERL_SUBVERSION < 3)))
+#ifndef SvPVX_const
+# define SvPVX_const(sv) ((const char*) (0 + SvPVX(sv)))
#endif
-#ifndef call_sv
-# define call_sv perl_call_sv
+#ifndef SvPVX_mutable
+# define SvPVX_mutable(sv) (0 + SvPVX(sv))
#endif
+#ifndef SvRV_set
+# define SvRV_set(sv, val) \
+ STMT_START { assert(SvTYPE(sv) >= SVt_RV); \
+ (((XRV*) SvANY(sv))->xrv_rv = (val)); } STMT_END
+#endif
-#ifndef eval_pv
-# define eval_pv perl_eval_pv
+#else
+#ifndef SvPVX_const
+# define SvPVX_const(sv) ((const char*)((sv)->sv_u.svu_pv))
#endif
-#ifndef eval_sv
-# define eval_sv perl_eval_sv
+#ifndef SvPVX_mutable
+# define SvPVX_mutable(sv) ((sv)->sv_u.svu_pv)
#endif
+#ifndef SvRV_set
+# define SvRV_set(sv, val) \
+ STMT_START { assert(SvTYPE(sv) >= SVt_RV); \
+ ((sv)->sv_u.svu_rv = (val)); } STMT_END
+#endif
-#ifndef PERL_SCAN_GREATER_THAN_UV_MAX
-# define PERL_SCAN_GREATER_THAN_UV_MAX 0x02
#endif
+#ifndef SvSTASH_set
+# define SvSTASH_set(sv, val) \
+ STMT_START { assert(SvTYPE(sv) >= SVt_PVMG); \
+ (((XPVMG*) SvANY(sv))->xmg_stash = (val)); } STMT_END
+#endif
-#ifndef PERL_SCAN_SILENT_ILLDIGIT
-# define PERL_SCAN_SILENT_ILLDIGIT 0x04
+#if ((PERL_VERSION < 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION < 0)))
+#ifndef SvUV_set
+# define SvUV_set(sv, val) \
+ STMT_START { assert(SvTYPE(sv) == SVt_IV || SvTYPE(sv) >= SVt_PVIV); \
+ (((XPVIV*) SvANY(sv))->xiv_iv = (IV) (val)); } STMT_END
#endif
-#ifndef PERL_SCAN_ALLOW_UNDERSCORES
-# define PERL_SCAN_ALLOW_UNDERSCORES 0x01
+#else
+#ifndef SvUV_set
+# define SvUV_set(sv, val) \
+ STMT_START { assert(SvTYPE(sv) == SVt_IV || SvTYPE(sv) >= SVt_PVIV); \
+ (((XPVUV*) SvANY(sv))->xuv_uv = (val)); } STMT_END
#endif
-#ifndef PERL_SCAN_DISALLOW_PREFIX
-# define PERL_SCAN_DISALLOW_PREFIX 0x02
#endif
-#if (PERL_VERSION > 6) || ((PERL_VERSION == 6) && (PERL_SUBVERSION >= 1))
-#define I32_CAST
+#if ((PERL_VERSION > 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION >= 0))) && !defined(vnewSVpvf)
+#if defined(NEED_vnewSVpvf)
+static SV * DPPP_(my_vnewSVpvf)(pTHX_ const char * pat, va_list * args);
+static
#else
-#define I32_CAST (I32*)
+extern SV * DPPP_(my_vnewSVpvf)(pTHX_ const char * pat, va_list * args);
#endif
-#ifndef grok_hex
-static UV _grok_hex (pTHX_ char *string, STRLEN *len, I32 *flags, NV *result) {
- NV r = scan_hex(string, *len, I32_CAST len);
- if (r > UV_MAX) {
- *flags |= PERL_SCAN_GREATER_THAN_UV_MAX;
- if (result) *result = r;
- return UV_MAX;
- }
- return (UV)r;
+#ifdef vnewSVpvf
+# undef vnewSVpvf
+#endif
+#define vnewSVpvf(a,b) DPPP_(my_vnewSVpvf)(aTHX_ a,b)
+#define Perl_vnewSVpvf DPPP_(my_vnewSVpvf)
+
+#if defined(NEED_vnewSVpvf) || defined(NEED_vnewSVpvf_GLOBAL)
+
+SV *
+DPPP_(my_vnewSVpvf)(pTHX_ const char *pat, va_list *args)
+{
+ register SV *sv = newSV(0);
+ sv_vsetpvfn(sv, pat, strlen(pat), args, Null(SV**), 0, Null(bool*));
+ return sv;
}
-
-# define grok_hex(string, len, flags, result) \
- _grok_hex(pTHX_ (string), (len), (flags), (result))
-#endif
-#ifndef grok_oct
-static UV _grok_oct (pTHX_ char *string, STRLEN *len, I32 *flags, NV *result) {
- NV r = scan_oct(string, *len, I32_CAST len);
- if (r > UV_MAX) {
- *flags |= PERL_SCAN_GREATER_THAN_UV_MAX;
- if (result) *result = r;
- return UV_MAX;
- }
- return (UV)r;
+#endif
+#endif
+
+/* sv_vcatpvf depends on sv_vcatpvfn */
+#if ((PERL_VERSION > 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION >= 0))) && !defined(sv_vcatpvf)
+# define sv_vcatpvf(sv, pat, args) sv_vcatpvfn(sv, pat, strlen(pat), args, Null(SV**), 0, Null(bool*))
+#endif
+
+/* sv_vsetpvf depends on sv_vsetpvfn */
+#if ((PERL_VERSION > 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION >= 0))) && !defined(sv_vsetpvf)
+# define sv_vsetpvf(sv, pat, args) sv_vsetpvfn(sv, pat, strlen(pat), args, Null(SV**), 0, Null(bool*))
+#endif
+
+/* sv_catpvf_mg depends on sv_vcatpvfn, sv_catpvf_mg_nocontext */
+#if ((PERL_VERSION > 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION >= 0))) && !defined(sv_catpvf_mg)
+#if defined(NEED_sv_catpvf_mg)
+static void DPPP_(my_sv_catpvf_mg)(pTHX_ SV * sv, const char * pat, ...);
+static
+#else
+extern void DPPP_(my_sv_catpvf_mg)(pTHX_ SV * sv, const char * pat, ...);
+#endif
+
+#define Perl_sv_catpvf_mg DPPP_(my_sv_catpvf_mg)
+
+#if defined(NEED_sv_catpvf_mg) || defined(NEED_sv_catpvf_mg_GLOBAL)
+
+void
+DPPP_(my_sv_catpvf_mg)(pTHX_ SV *sv, const char *pat, ...)
+{
+ va_list args;
+ va_start(args, pat);
+ sv_vcatpvfn(sv, pat, strlen(pat), &args, Null(SV**), 0, Null(bool*));
+ SvSETMAGIC(sv);
+ va_end(args);
}
-# define grok_oct(string, len, flags, result) \
- _grok_oct(pTHX_ (string), (len), (flags), (result))
#endif
+#endif
-#if !defined(grok_bin) && defined(scan_bin)
-static UV _grok_bin (pTHX_ char *string, STRLEN *len, I32 *flags, NV *result) {
- NV r = scan_bin(string, *len, I32_CAST len);
- if (r > UV_MAX) {
- *flags |= PERL_SCAN_GREATER_THAN_UV_MAX;
- if (result) *result = r;
- return UV_MAX;
- }
- return (UV)r;
+/* sv_catpvf_mg_nocontext depends on sv_vcatpvfn */
+#ifdef PERL_IMPLICIT_CONTEXT
+#if ((PERL_VERSION > 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION >= 0))) && !defined(sv_catpvf_mg_nocontext)
+#if defined(NEED_sv_catpvf_mg_nocontext)
+static void DPPP_(my_sv_catpvf_mg_nocontext)(SV * sv, const char * pat, ...);
+static
+#else
+extern void DPPP_(my_sv_catpvf_mg_nocontext)(SV * sv, const char * pat, ...);
+#endif
+
+#define sv_catpvf_mg_nocontext DPPP_(my_sv_catpvf_mg_nocontext)
+#define Perl_sv_catpvf_mg_nocontext DPPP_(my_sv_catpvf_mg_nocontext)
+
+#if defined(NEED_sv_catpvf_mg_nocontext) || defined(NEED_sv_catpvf_mg_nocontext_GLOBAL)
+
+void
+DPPP_(my_sv_catpvf_mg_nocontext)(SV *sv, const char *pat, ...)
+{
+ dTHX;
+ va_list args;
+ va_start(args, pat);
+ sv_vcatpvfn(sv, pat, strlen(pat), &args, Null(SV**), 0, Null(bool*));
+ SvSETMAGIC(sv);
+ va_end(args);
}
-# define grok_bin(string, len, flags, result) \
- _grok_bin(pTHX_ (string), (len), (flags), (result))
#endif
+#endif
+#endif
-#ifndef IN_LOCALE
-# define IN_LOCALE \
- (PL_curcop == &PL_compiling ? IN_LOCALE_COMPILETIME : IN_LOCALE_RUNTIME)
+#ifndef sv_catpvf_mg
+# ifdef PERL_IMPLICIT_CONTEXT
+# define sv_catpvf_mg Perl_sv_catpvf_mg_nocontext
+# else
+# define sv_catpvf_mg Perl_sv_catpvf_mg
+# endif
#endif
+/* sv_vcatpvf_mg depends on sv_vcatpvfn */
+#if ((PERL_VERSION > 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION >= 0))) && !defined(sv_vcatpvf_mg)
+# define sv_vcatpvf_mg(sv, pat, args) \
+ STMT_START { \
+ sv_vcatpvfn(sv, pat, strlen(pat), args, Null(SV**), 0, Null(bool*)); \
+ SvSETMAGIC(sv); \
+ } STMT_END
+#endif
+
+/* sv_setpvf_mg depends on sv_vsetpvfn, sv_setpvf_mg_nocontext */
+#if ((PERL_VERSION > 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION >= 0))) && !defined(sv_setpvf_mg)
+#if defined(NEED_sv_setpvf_mg)
+static void DPPP_(my_sv_setpvf_mg)(pTHX_ SV * sv, const char * pat, ...);
+static
+#else
+extern void DPPP_(my_sv_setpvf_mg)(pTHX_ SV * sv, const char * pat, ...);
+#endif
+
+#define Perl_sv_setpvf_mg DPPP_(my_sv_setpvf_mg)
+
+#if defined(NEED_sv_setpvf_mg) || defined(NEED_sv_setpvf_mg_GLOBAL)
+
+void
+DPPP_(my_sv_setpvf_mg)(pTHX_ SV *sv, const char *pat, ...)
+{
+ va_list args;
+ va_start(args, pat);
+ sv_vsetpvfn(sv, pat, strlen(pat), &args, Null(SV**), 0, Null(bool*));
+ SvSETMAGIC(sv);
+ va_end(args);
+}
+
+#endif
+#endif
+
+/* sv_setpvf_mg_nocontext depends on sv_vsetpvfn */
+#ifdef PERL_IMPLICIT_CONTEXT
+#if ((PERL_VERSION > 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION >= 0))) && !defined(sv_setpvf_mg_nocontext)
+#if defined(NEED_sv_setpvf_mg_nocontext)
+static void DPPP_(my_sv_setpvf_mg_nocontext)(SV * sv, const char * pat, ...);
+static
+#else
+extern void DPPP_(my_sv_setpvf_mg_nocontext)(SV * sv, const char * pat, ...);
+#endif
+
+#define sv_setpvf_mg_nocontext DPPP_(my_sv_setpvf_mg_nocontext)
+#define Perl_sv_setpvf_mg_nocontext DPPP_(my_sv_setpvf_mg_nocontext)
+
+#if defined(NEED_sv_setpvf_mg_nocontext) || defined(NEED_sv_setpvf_mg_nocontext_GLOBAL)
+
+void
+DPPP_(my_sv_setpvf_mg_nocontext)(SV *sv, const char *pat, ...)
+{
+ dTHX;
+ va_list args;
+ va_start(args, pat);
+ sv_vsetpvfn(sv, pat, strlen(pat), &args, Null(SV**), 0, Null(bool*));
+ SvSETMAGIC(sv);
+ va_end(args);
+}
+
+#endif
+#endif
+#endif
+
+#ifndef sv_setpvf_mg
+# ifdef PERL_IMPLICIT_CONTEXT
+# define sv_setpvf_mg Perl_sv_setpvf_mg_nocontext
+# else
+# define sv_setpvf_mg Perl_sv_setpvf_mg
+# endif
+#endif
+
+/* sv_vsetpvf_mg depends on sv_vsetpvfn */
+#if ((PERL_VERSION > 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION >= 0))) && !defined(sv_vsetpvf_mg)
+# define sv_vsetpvf_mg(sv, pat, args) \
+ STMT_START { \
+ sv_vsetpvfn(sv, pat, strlen(pat), args, Null(SV**), 0, Null(bool*)); \
+ SvSETMAGIC(sv); \
+ } STMT_END
+#endif
+#ifndef SvGETMAGIC
+# define SvGETMAGIC(x) STMT_START { if (SvGMAGICAL(x)) mg_get(x); } STMT_END
+#endif
+#ifndef PERL_MAGIC_sv
+# define PERL_MAGIC_sv '\0'
+#endif
+
+#ifndef PERL_MAGIC_overload
+# define PERL_MAGIC_overload 'A'
+#endif
+
+#ifndef PERL_MAGIC_overload_elem
+# define PERL_MAGIC_overload_elem 'a'
+#endif
+
+#ifndef PERL_MAGIC_overload_table
+# define PERL_MAGIC_overload_table 'c'
+#endif
+
+#ifndef PERL_MAGIC_bm
+# define PERL_MAGIC_bm 'B'
+#endif
+
+#ifndef PERL_MAGIC_regdata
+# define PERL_MAGIC_regdata 'D'
+#endif
+
+#ifndef PERL_MAGIC_regdatum
+# define PERL_MAGIC_regdatum 'd'
+#endif
+
+#ifndef PERL_MAGIC_env
+# define PERL_MAGIC_env 'E'
+#endif
+
+#ifndef PERL_MAGIC_envelem
+# define PERL_MAGIC_envelem 'e'
+#endif
+
+#ifndef PERL_MAGIC_fm
+# define PERL_MAGIC_fm 'f'
+#endif
+
+#ifndef PERL_MAGIC_regex_global
+# define PERL_MAGIC_regex_global 'g'
+#endif
+
+#ifndef PERL_MAGIC_isa
+# define PERL_MAGIC_isa 'I'
+#endif
+
+#ifndef PERL_MAGIC_isaelem
+# define PERL_MAGIC_isaelem 'i'
+#endif
+
+#ifndef PERL_MAGIC_nkeys
+# define PERL_MAGIC_nkeys 'k'
+#endif
+
+#ifndef PERL_MAGIC_dbfile
+# define PERL_MAGIC_dbfile 'L'
+#endif
+
+#ifndef PERL_MAGIC_dbline
+# define PERL_MAGIC_dbline 'l'
+#endif
+
+#ifndef PERL_MAGIC_mutex
+# define PERL_MAGIC_mutex 'm'
+#endif
+
+#ifndef PERL_MAGIC_shared
+# define PERL_MAGIC_shared 'N'
+#endif
+
+#ifndef PERL_MAGIC_shared_scalar
+# define PERL_MAGIC_shared_scalar 'n'
+#endif
+
+#ifndef PERL_MAGIC_collxfrm
+# define PERL_MAGIC_collxfrm 'o'
+#endif
+
+#ifndef PERL_MAGIC_tied
+# define PERL_MAGIC_tied 'P'
+#endif
+
+#ifndef PERL_MAGIC_tiedelem
+# define PERL_MAGIC_tiedelem 'p'
+#endif
+
+#ifndef PERL_MAGIC_tiedscalar
+# define PERL_MAGIC_tiedscalar 'q'
+#endif
+
+#ifndef PERL_MAGIC_qr
+# define PERL_MAGIC_qr 'r'
+#endif
+
+#ifndef PERL_MAGIC_sig
+# define PERL_MAGIC_sig 'S'
+#endif
+
+#ifndef PERL_MAGIC_sigelem
+# define PERL_MAGIC_sigelem 's'
+#endif
+
+#ifndef PERL_MAGIC_taint
+# define PERL_MAGIC_taint 't'
+#endif
+
+#ifndef PERL_MAGIC_uvar
+# define PERL_MAGIC_uvar 'U'
+#endif
+
+#ifndef PERL_MAGIC_uvar_elem
+# define PERL_MAGIC_uvar_elem 'u'
+#endif
+
+#ifndef PERL_MAGIC_vstring
+# define PERL_MAGIC_vstring 'V'
+#endif
+
+#ifndef PERL_MAGIC_vec
+# define PERL_MAGIC_vec 'v'
+#endif
+
+#ifndef PERL_MAGIC_utf8
+# define PERL_MAGIC_utf8 'w'
+#endif
+
+#ifndef PERL_MAGIC_substr
+# define PERL_MAGIC_substr 'x'
+#endif
+
+#ifndef PERL_MAGIC_defelem
+# define PERL_MAGIC_defelem 'y'
+#endif
+
+#ifndef PERL_MAGIC_glob
+# define PERL_MAGIC_glob '*'
+#endif
+
+#ifndef PERL_MAGIC_arylen
+# define PERL_MAGIC_arylen '#'
+#endif
+
+#ifndef PERL_MAGIC_pos
+# define PERL_MAGIC_pos '.'
+#endif
+
+#ifndef PERL_MAGIC_backref
+# define PERL_MAGIC_backref '<'
+#endif
+
+#ifndef PERL_MAGIC_ext
+# define PERL_MAGIC_ext '~'
+#endif
+
+/* That's the best we can do... */
+#ifndef SvPV_force_nomg
+# define SvPV_force_nomg SvPV_force
+#endif
+
+#ifndef SvPV_nomg
+# define SvPV_nomg SvPV
+#endif
+
+#ifndef sv_catpvn_nomg
+# define sv_catpvn_nomg sv_catpvn
+#endif
+
+#ifndef sv_catsv_nomg
+# define sv_catsv_nomg sv_catsv
+#endif
+
+#ifndef sv_setsv_nomg
+# define sv_setsv_nomg sv_setsv
+#endif
+
+#ifndef sv_pvn_nomg
+# define sv_pvn_nomg sv_pvn
+#endif
+
+#ifndef SvIV_nomg
+# define SvIV_nomg SvIV
+#endif
+
+#ifndef SvUV_nomg
+# define SvUV_nomg SvUV
+#endif
+
+#ifndef sv_catpv_mg
+# define sv_catpv_mg(sv, ptr) \
+ STMT_START { \
+ SV *TeMpSv = sv; \
+ sv_catpv(TeMpSv,ptr); \
+ SvSETMAGIC(TeMpSv); \
+ } STMT_END
+#endif
+
+#ifndef sv_catpvn_mg
+# define sv_catpvn_mg(sv, ptr, len) \
+ STMT_START { \
+ SV *TeMpSv = sv; \
+ sv_catpvn(TeMpSv,ptr,len); \
+ SvSETMAGIC(TeMpSv); \
+ } STMT_END
+#endif
+
+#ifndef sv_catsv_mg
+# define sv_catsv_mg(dsv, ssv) \
+ STMT_START { \
+ SV *TeMpSv = dsv; \
+ sv_catsv(TeMpSv,ssv); \
+ SvSETMAGIC(TeMpSv); \
+ } STMT_END
+#endif
+
+#ifndef sv_setiv_mg
+# define sv_setiv_mg(sv, i) \
+ STMT_START { \
+ SV *TeMpSv = sv; \
+ sv_setiv(TeMpSv,i); \
+ SvSETMAGIC(TeMpSv); \
+ } STMT_END
+#endif
+
+#ifndef sv_setnv_mg
+# define sv_setnv_mg(sv, num) \
+ STMT_START { \
+ SV *TeMpSv = sv; \
+ sv_setnv(TeMpSv,num); \
+ SvSETMAGIC(TeMpSv); \
+ } STMT_END
+#endif
+
+#ifndef sv_setpv_mg
+# define sv_setpv_mg(sv, ptr) \
+ STMT_START { \
+ SV *TeMpSv = sv; \
+ sv_setpv(TeMpSv,ptr); \
+ SvSETMAGIC(TeMpSv); \
+ } STMT_END
+#endif
+
+#ifndef sv_setpvn_mg
+# define sv_setpvn_mg(sv, ptr, len) \
+ STMT_START { \
+ SV *TeMpSv = sv; \
+ sv_setpvn(TeMpSv,ptr,len); \
+ SvSETMAGIC(TeMpSv); \
+ } STMT_END
+#endif
+
+#ifndef sv_setsv_mg
+# define sv_setsv_mg(dsv, ssv) \
+ STMT_START { \
+ SV *TeMpSv = dsv; \
+ sv_setsv(TeMpSv,ssv); \
+ SvSETMAGIC(TeMpSv); \
+ } STMT_END
+#endif
+
+#ifndef sv_setuv_mg
+# define sv_setuv_mg(sv, i) \
+ STMT_START { \
+ SV *TeMpSv = sv; \
+ sv_setuv(TeMpSv,i); \
+ SvSETMAGIC(TeMpSv); \
+ } STMT_END
+#endif
+
+#ifndef sv_usepvn_mg
+# define sv_usepvn_mg(sv, ptr, len) \
+ STMT_START { \
+ SV *TeMpSv = sv; \
+ sv_usepvn(TeMpSv,ptr,len); \
+ SvSETMAGIC(TeMpSv); \
+ } STMT_END
+#endif
+
+#ifdef USE_ITHREADS
+#ifndef CopFILE
+# define CopFILE(c) ((c)->cop_file)
+#endif
+
+#ifndef CopFILEGV
+# define CopFILEGV(c) (CopFILE(c) ? gv_fetchfile(CopFILE(c)) : Nullgv)
+#endif
+
+#ifndef CopFILE_set
+# define CopFILE_set(c,pv) ((c)->cop_file = savepv(pv))
+#endif
+
+#ifndef CopFILESV
+# define CopFILESV(c) (CopFILE(c) ? GvSV(gv_fetchfile(CopFILE(c))) : Nullsv)
+#endif
+
+#ifndef CopFILEAV
+# define CopFILEAV(c) (CopFILE(c) ? GvAV(gv_fetchfile(CopFILE(c))) : Nullav)
+#endif
+
+#ifndef CopSTASHPV
+# define CopSTASHPV(c) ((c)->cop_stashpv)
+#endif
+
+#ifndef CopSTASHPV_set
+# define CopSTASHPV_set(c,pv) ((c)->cop_stashpv = ((pv) ? savepv(pv) : Nullch))
+#endif
+
+#ifndef CopSTASH
+# define CopSTASH(c) (CopSTASHPV(c) ? gv_stashpv(CopSTASHPV(c),GV_ADD) : Nullhv)
+#endif
+
+#ifndef CopSTASH_set
+# define CopSTASH_set(c,hv) CopSTASHPV_set(c, (hv) ? HvNAME(hv) : Nullch)
+#endif
+
+#ifndef CopSTASH_eq
+# define CopSTASH_eq(c,hv) ((hv) && (CopSTASHPV(c) == HvNAME(hv) \
+ || (CopSTASHPV(c) && HvNAME(hv) \
+ && strEQ(CopSTASHPV(c), HvNAME(hv)))))
+#endif
+
+#else
+#ifndef CopFILEGV
+# define CopFILEGV(c) ((c)->cop_filegv)
+#endif
+
+#ifndef CopFILEGV_set
+# define CopFILEGV_set(c,gv) ((c)->cop_filegv = (GV*)SvREFCNT_inc(gv))
+#endif
+
+#ifndef CopFILE_set
+# define CopFILE_set(c,pv) CopFILEGV_set((c), gv_fetchfile(pv))
+#endif
+
+#ifndef CopFILESV
+# define CopFILESV(c) (CopFILEGV(c) ? GvSV(CopFILEGV(c)) : Nullsv)
+#endif
+
+#ifndef CopFILEAV
+# define CopFILEAV(c) (CopFILEGV(c) ? GvAV(CopFILEGV(c)) : Nullav)
+#endif
+
+#ifndef CopFILE
+# define CopFILE(c) (CopFILESV(c) ? SvPVX(CopFILESV(c)) : Nullch)
+#endif
+
+#ifndef CopSTASH
+# define CopSTASH(c) ((c)->cop_stash)
+#endif
+
+#ifndef CopSTASH_set
+# define CopSTASH_set(c,hv) ((c)->cop_stash = (hv))
+#endif
+
+#ifndef CopSTASHPV
+# define CopSTASHPV(c) (CopSTASH(c) ? HvNAME(CopSTASH(c)) : Nullch)
+#endif
+
+#ifndef CopSTASHPV_set
+# define CopSTASHPV_set(c,pv) CopSTASH_set((c), gv_stashpv(pv,GV_ADD))
+#endif
+
+#ifndef CopSTASH_eq
+# define CopSTASH_eq(c,hv) (CopSTASH(c) == (hv))
+#endif
+
+#endif /* USE_ITHREADS */
+#ifndef IN_PERL_COMPILETIME
+# define IN_PERL_COMPILETIME (PL_curcop == &PL_compiling)
+#endif
+
#ifndef IN_LOCALE_RUNTIME
-# define IN_LOCALE_RUNTIME (PL_curcop->op_private & HINT_LOCALE)
+# define IN_LOCALE_RUNTIME (PL_curcop->op_private & HINT_LOCALE)
#endif
#ifndef IN_LOCALE_COMPILETIME
-# define IN_LOCALE_COMPILETIME (PL_hints & HINT_LOCALE)
+# define IN_LOCALE_COMPILETIME (PL_hints & HINT_LOCALE)
#endif
-
+#ifndef IN_LOCALE
+# define IN_LOCALE (IN_PERL_COMPILETIME ? IN_LOCALE_COMPILETIME : IN_LOCALE_RUNTIME)
+#endif
#ifndef IS_NUMBER_IN_UV
-# define IS_NUMBER_IN_UV 0x01
-# define IS_NUMBER_GREATER_THAN_UV_MAX 0x02
-# define IS_NUMBER_NOT_INT 0x04
-# define IS_NUMBER_NEG 0x08
-# define IS_NUMBER_INFINITY 0x10
-# define IS_NUMBER_NAN 0x20
+# define IS_NUMBER_IN_UV 0x01
#endif
-
+
+#ifndef IS_NUMBER_GREATER_THAN_UV_MAX
+# define IS_NUMBER_GREATER_THAN_UV_MAX 0x02
+#endif
+
+#ifndef IS_NUMBER_NOT_INT
+# define IS_NUMBER_NOT_INT 0x04
+#endif
+
+#ifndef IS_NUMBER_NEG
+# define IS_NUMBER_NEG 0x08
+#endif
+
+#ifndef IS_NUMBER_INFINITY
+# define IS_NUMBER_INFINITY 0x10
+#endif
+
+#ifndef IS_NUMBER_NAN
+# define IS_NUMBER_NAN 0x20
+#endif
+
+/* GROK_NUMERIC_RADIX depends on grok_numeric_radix */
+#ifndef GROK_NUMERIC_RADIX
+# define GROK_NUMERIC_RADIX(sp, send) grok_numeric_radix(sp, send)
+#endif
+#ifndef PERL_SCAN_GREATER_THAN_UV_MAX
+# define PERL_SCAN_GREATER_THAN_UV_MAX 0x02
+#endif
+
+#ifndef PERL_SCAN_SILENT_ILLDIGIT
+# define PERL_SCAN_SILENT_ILLDIGIT 0x04
+#endif
+
+#ifndef PERL_SCAN_ALLOW_UNDERSCORES
+# define PERL_SCAN_ALLOW_UNDERSCORES 0x01
+#endif
+
+#ifndef PERL_SCAN_DISALLOW_PREFIX
+# define PERL_SCAN_DISALLOW_PREFIX 0x02
+#endif
+
#ifndef grok_numeric_radix
-# define GROK_NUMERIC_RADIX(sp, send) grok_numeric_radix(aTHX_ sp, send)
+#if defined(NEED_grok_numeric_radix)
+static bool DPPP_(my_grok_numeric_radix)(pTHX_ const char ** sp, const char * send);
+static
+#else
+extern bool DPPP_(my_grok_numeric_radix)(pTHX_ const char ** sp, const char * send);
+#endif
-#define grok_numeric_radix Perl_grok_numeric_radix
-
-static
+#ifdef grok_numeric_radix
+# undef grok_numeric_radix
+#endif
+#define grok_numeric_radix(a,b) DPPP_(my_grok_numeric_radix)(aTHX_ a,b)
+#define Perl_grok_numeric_radix DPPP_(my_grok_numeric_radix)
+
+#if defined(NEED_grok_numeric_radix) || defined(NEED_grok_numeric_radix_GLOBAL)
bool
-Perl_grok_numeric_radix(pTHX_ const char **sp, const char *send)
+DPPP_(my_grok_numeric_radix)(pTHX_ const char **sp, const char *send)
{
#ifdef USE_LOCALE_NUMERIC
-#if (PERL_VERSION > 6) || ((PERL_VERSION == 6) && (PERL_SUBVERSION >= 1))
- if (PL_numeric_radix_sv && IN_LOCALE) {
+#ifdef PL_numeric_radix_sv
+ if (PL_numeric_radix_sv && IN_LOCALE) {
STRLEN len;
char* radix = SvPV(PL_numeric_radix_sv, len);
if (*sp + len <= send && memEQ(*sp, radix, len)) {
*sp += len;
- return TRUE;
+ return TRUE;
}
}
#else
- /* pre5.6.0 perls don't have PL_numeric_radix_sv so the radix
- * must manually be requested from locale.h */
+ /* older perls don't have PL_numeric_radix_sv so the radix
+ * must manually be requested from locale.h
+ */
#include <locale.h>
+ dTHR; /* needed for older threaded perls */
struct lconv *lc = localeconv();
char *radix = lc->decimal_point;
- if (radix && IN_LOCALE) {
+ if (radix && IN_LOCALE) {
STRLEN len = strlen(radix);
if (*sp + len <= send && memEQ(*sp, radix, len)) {
*sp += len;
- return TRUE;
+ return TRUE;
}
}
-#endif /* PERL_VERSION */
+#endif
#endif /* USE_LOCALE_NUMERIC */
/* always try "." if numeric radix didn't match because
* we may have data from different locales mixed */
@@ -738,15 +1920,28 @@
}
return FALSE;
}
-#endif /* grok_numeric_radix */
+#endif
+#endif
+/* grok_number depends on grok_numeric_radix */
+
#ifndef grok_number
+#if defined(NEED_grok_number)
+static int DPPP_(my_grok_number)(pTHX_ const char * pv, STRLEN len, UV * valuep);
+static
+#else
+extern int DPPP_(my_grok_number)(pTHX_ const char * pv, STRLEN len, UV * valuep);
+#endif
-#define grok_number Perl_grok_number
+#ifdef grok_number
+# undef grok_number
+#endif
+#define grok_number(a,b,c) DPPP_(my_grok_number)(aTHX_ a,b,c)
+#define Perl_grok_number DPPP_(my_grok_number)
-static
+#if defined(NEED_grok_number) || defined(NEED_grok_number_GLOBAL)
int
-Perl_grok_number(pTHX_ const char *pv, STRLEN len, UV *valuep)
+DPPP_(my_grok_number)(pTHX_ const char *pv, STRLEN len, UV *valuep)
{
const char *s = pv;
const char *send = pv + len;
@@ -792,7 +1987,7 @@
digit = *s - '0';
if (digit >= 0 && digit <= 9) {
value = value * 10 + digit;
- if (++s < send) {
+ if (++s < send) {
digit = *s - '0';
if (digit >= 0 && digit <= 9) {
value = value * 10 + digit;
@@ -840,7 +2035,7 @@
}
}
}
- }
+ }
}
}
}
@@ -852,7 +2047,7 @@
}
}
}
- }
+ }
}
}
numtype |= IS_NUMBER_IN_UV;
@@ -935,164 +2130,328 @@
}
return 0;
}
-#endif /* grok_number */
-
-#ifndef PERL_MAGIC_sv
-# define PERL_MAGIC_sv '\0'
#endif
-
-#ifndef PERL_MAGIC_overload
-# define PERL_MAGIC_overload 'A'
#endif
-#ifndef PERL_MAGIC_overload_elem
-# define PERL_MAGIC_overload_elem 'a'
-#endif
+/*
+ * The grok_* routines have been modified to use warn() instead of
+ * Perl_warner(). Also, 'hexdigit' was the former name of PL_hexdigit,
+ * which is why the stack variable has been renamed to 'xdigit'.
+ */
-#ifndef PERL_MAGIC_overload_table
-# define PERL_MAGIC_overload_table 'c'
+#ifndef grok_bin
+#if defined(NEED_grok_bin)
+static UV DPPP_(my_grok_bin)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result);
+static
+#else
+extern UV DPPP_(my_grok_bin)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result);
#endif
-#ifndef PERL_MAGIC_bm
-# define PERL_MAGIC_bm 'B'
+#ifdef grok_bin
+# undef grok_bin
#endif
+#define grok_bin(a,b,c,d) DPPP_(my_grok_bin)(aTHX_ a,b,c,d)
+#define Perl_grok_bin DPPP_(my_grok_bin)
-#ifndef PERL_MAGIC_regdata
-# define PERL_MAGIC_regdata 'D'
-#endif
+#if defined(NEED_grok_bin) || defined(NEED_grok_bin_GLOBAL)
+UV
+DPPP_(my_grok_bin)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result)
+{
+ const char *s = start;
+ STRLEN len = *len_p;
+ UV value = 0;
+ NV value_nv = 0;
-#ifndef PERL_MAGIC_regdatum
-# define PERL_MAGIC_regdatum 'd'
-#endif
+ const UV max_div_2 = UV_MAX / 2;
+ bool allow_underscores = *flags & PERL_SCAN_ALLOW_UNDERSCORES;
+ bool overflowed = FALSE;
-#ifndef PERL_MAGIC_env
-# define PERL_MAGIC_env 'E'
-#endif
+ if (!(*flags & PERL_SCAN_DISALLOW_PREFIX)) {
+ /* strip off leading b or 0b.
+ for compatibility silently suffer "b" and "0b" as valid binary
+ numbers. */
+ if (len >= 1) {
+ if (s[0] == 'b') {
+ s++;
+ len--;
+ }
+ else if (len >= 2 && s[0] == '0' && s[1] == 'b') {
+ s+=2;
+ len-=2;
+ }
+ }
+ }
-#ifndef PERL_MAGIC_envelem
-# define PERL_MAGIC_envelem 'e'
-#endif
+ for (; len-- && *s; s++) {
+ char bit = *s;
+ if (bit == '0' || bit == '1') {
+ /* Write it in this wonky order with a goto to attempt to get the
+ compiler to make the common case integer-only loop pretty tight.
+ With gcc seems to be much straighter code than old scan_bin. */
+ redo:
+ if (!overflowed) {
+ if (value <= max_div_2) {
+ value = (value << 1) | (bit - '0');
+ continue;
+ }
+ /* Bah. We're just overflowed. */
+ warn("Integer overflow in binary number");
+ overflowed = TRUE;
+ value_nv = (NV) value;
+ }
+ value_nv *= 2.0;
+ /* If an NV has not enough bits in its mantissa to
+ * represent a UV this summing of small low-order numbers
+ * is a waste of time (because the NV cannot preserve
+ * the low-order bits anyway): we could just remember when
+ * did we overflow and in the end just multiply value_nv by the
+ * right amount. */
+ value_nv += (NV)(bit - '0');
+ continue;
+ }
+ if (bit == '_' && len && allow_underscores && (bit = s[1])
+ && (bit == '0' || bit == '1'))
+ {
+ --len;
+ ++s;
+ goto redo;
+ }
+ if (!(*flags & PERL_SCAN_SILENT_ILLDIGIT))
+ warn("Illegal binary digit '%c' ignored", *s);
+ break;
+ }
-#ifndef PERL_MAGIC_fm
-# define PERL_MAGIC_fm 'f'
+ if ( ( overflowed && value_nv > 4294967295.0)
+#if UVSIZE > 4
+ || (!overflowed && value > 0xffffffff )
#endif
-
-#ifndef PERL_MAGIC_regex_global
-# define PERL_MAGIC_regex_global 'g'
+ ) {
+ warn("Binary number > 0b11111111111111111111111111111111 non-portable");
+ }
+ *len_p = s - start;
+ if (!overflowed) {
+ *flags = 0;
+ return value;
+ }
+ *flags = PERL_SCAN_GREATER_THAN_UV_MAX;
+ if (result)
+ *result = value_nv;
+ return UV_MAX;
+}
#endif
-
-#ifndef PERL_MAGIC_isa
-# define PERL_MAGIC_isa 'I'
#endif
-#ifndef PERL_MAGIC_isaelem
-# define PERL_MAGIC_isaelem 'i'
+#ifndef grok_hex
+#if defined(NEED_grok_hex)
+static UV DPPP_(my_grok_hex)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result);
+static
+#else
+extern UV DPPP_(my_grok_hex)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result);
#endif
-#ifndef PERL_MAGIC_nkeys
-# define PERL_MAGIC_nkeys 'k'
+#ifdef grok_hex
+# undef grok_hex
#endif
+#define grok_hex(a,b,c,d) DPPP_(my_grok_hex)(aTHX_ a,b,c,d)
+#define Perl_grok_hex DPPP_(my_grok_hex)
-#ifndef PERL_MAGIC_dbfile
-# define PERL_MAGIC_dbfile 'L'
-#endif
+#if defined(NEED_grok_hex) || defined(NEED_grok_hex_GLOBAL)
+UV
+DPPP_(my_grok_hex)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result)
+{
+ const char *s = start;
+ STRLEN len = *len_p;
+ UV value = 0;
+ NV value_nv = 0;
-#ifndef PERL_MAGIC_dbline
-# define PERL_MAGIC_dbline 'l'
-#endif
+ const UV max_div_16 = UV_MAX / 16;
+ bool allow_underscores = *flags & PERL_SCAN_ALLOW_UNDERSCORES;
+ bool overflowed = FALSE;
+ const char *xdigit;
-#ifndef PERL_MAGIC_mutex
-# define PERL_MAGIC_mutex 'm'
-#endif
+ if (!(*flags & PERL_SCAN_DISALLOW_PREFIX)) {
+ /* strip off leading x or 0x.
+ for compatibility silently suffer "x" and "0x" as valid hex numbers.
+ */
+ if (len >= 1) {
+ if (s[0] == 'x') {
+ s++;
+ len--;
+ }
+ else if (len >= 2 && s[0] == '0' && s[1] == 'x') {
+ s+=2;
+ len-=2;
+ }
+ }
+ }
-#ifndef PERL_MAGIC_shared
-# define PERL_MAGIC_shared 'N'
-#endif
+ for (; len-- && *s; s++) {
+ xdigit = strchr((char *) PL_hexdigit, *s);
+ if (xdigit) {
+ /* Write it in this wonky order with a goto to attempt to get the
+ compiler to make the common case integer-only loop pretty tight.
+ With gcc seems to be much straighter code than old scan_hex. */
+ redo:
+ if (!overflowed) {
+ if (value <= max_div_16) {
+ value = (value << 4) | ((xdigit - PL_hexdigit) & 15);
+ continue;
+ }
+ warn("Integer overflow in hexadecimal number");
+ overflowed = TRUE;
+ value_nv = (NV) value;
+ }
+ value_nv *= 16.0;
+ /* If an NV has not enough bits in its mantissa to
+ * represent a UV this summing of small low-order numbers
+ * is a waste of time (because the NV cannot preserve
+ * the low-order bits anyway): we could just remember when
+ * did we overflow and in the end just multiply value_nv by the
+ * right amount of 16-tuples. */
+ value_nv += (NV)((xdigit - PL_hexdigit) & 15);
+ continue;
+ }
+ if (*s == '_' && len && allow_underscores && s[1]
+ && (xdigit = strchr((char *) PL_hexdigit, s[1])))
+ {
+ --len;
+ ++s;
+ goto redo;
+ }
+ if (!(*flags & PERL_SCAN_SILENT_ILLDIGIT))
+ warn("Illegal hexadecimal digit '%c' ignored", *s);
+ break;
+ }
-#ifndef PERL_MAGIC_shared_scalar
-# define PERL_MAGIC_shared_scalar 'n'
+ if ( ( overflowed && value_nv > 4294967295.0)
+#if UVSIZE > 4
+ || (!overflowed && value > 0xffffffff )
#endif
-
-#ifndef PERL_MAGIC_collxfrm
-# define PERL_MAGIC_collxfrm 'o'
+ ) {
+ warn("Hexadecimal number > 0xffffffff non-portable");
+ }
+ *len_p = s - start;
+ if (!overflowed) {
+ *flags = 0;
+ return value;
+ }
+ *flags = PERL_SCAN_GREATER_THAN_UV_MAX;
+ if (result)
+ *result = value_nv;
+ return UV_MAX;
+}
#endif
-
-#ifndef PERL_MAGIC_tied
-# define PERL_MAGIC_tied 'P'
#endif
-#ifndef PERL_MAGIC_tiedelem
-# define PERL_MAGIC_tiedelem 'p'
+#ifndef grok_oct
+#if defined(NEED_grok_oct)
+static UV DPPP_(my_grok_oct)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result);
+static
+#else
+extern UV DPPP_(my_grok_oct)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result);
#endif
-#ifndef PERL_MAGIC_tiedscalar
-# define PERL_MAGIC_tiedscalar 'q'
+#ifdef grok_oct
+# undef grok_oct
#endif
+#define grok_oct(a,b,c,d) DPPP_(my_grok_oct)(aTHX_ a,b,c,d)
+#define Perl_grok_oct DPPP_(my_grok_oct)
-#ifndef PERL_MAGIC_qr
-# define PERL_MAGIC_qr 'r'
-#endif
+#if defined(NEED_grok_oct) || defined(NEED_grok_oct_GLOBAL)
+UV
+DPPP_(my_grok_oct)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result)
+{
+ const char *s = start;
+ STRLEN len = *len_p;
+ UV value = 0;
+ NV value_nv = 0;
-#ifndef PERL_MAGIC_sig
-# define PERL_MAGIC_sig 'S'
-#endif
+ const UV max_div_8 = UV_MAX / 8;
+ bool allow_underscores = *flags & PERL_SCAN_ALLOW_UNDERSCORES;
+ bool overflowed = FALSE;
-#ifndef PERL_MAGIC_sigelem
-# define PERL_MAGIC_sigelem 's'
-#endif
+ for (; len-- && *s; s++) {
+ /* gcc 2.95 optimiser not smart enough to figure that this subtraction
+ out front allows slicker code. */
+ int digit = *s - '0';
+ if (digit >= 0 && digit <= 7) {
+ /* Write it in this wonky order with a goto to attempt to get the
+ compiler to make the common case integer-only loop pretty tight.
+ */
+ redo:
+ if (!overflowed) {
+ if (value <= max_div_8) {
+ value = (value << 3) | digit;
+ continue;
+ }
+ /* Bah. We're just overflowed. */
+ warn("Integer overflow in octal number");
+ overflowed = TRUE;
+ value_nv = (NV) value;
+ }
+ value_nv *= 8.0;
+ /* If an NV has not enough bits in its mantissa to
+ * represent a UV this summing of small low-order numbers
+ * is a waste of time (because the NV cannot preserve
+ * the low-order bits anyway): we could just remember when
+ * did we overflow and in the end just multiply value_nv by the
+ * right amount of 8-tuples. */
+ value_nv += (NV)digit;
+ continue;
+ }
+ if (digit == ('_' - '0') && len && allow_underscores
+ && (digit = s[1] - '0') && (digit >= 0 && digit <= 7))
+ {
+ --len;
+ ++s;
+ goto redo;
+ }
+ /* Allow \octal to work the DWIM way (that is, stop scanning
+ * as soon as non-octal characters are seen, complain only iff
+ * someone seems to want to use the digits eight and nine). */
+ if (digit == 8 || digit == 9) {
+ if (!(*flags & PERL_SCAN_SILENT_ILLDIGIT))
+ warn("Illegal octal digit '%c' ignored", *s);
+ }
+ break;
+ }
-#ifndef PERL_MAGIC_taint
-# define PERL_MAGIC_taint 't'
+ if ( ( overflowed && value_nv > 4294967295.0)
+#if UVSIZE > 4
+ || (!overflowed && value > 0xffffffff )
#endif
-
-#ifndef PERL_MAGIC_uvar
-# define PERL_MAGIC_uvar 'U'
+ ) {
+ warn("Octal number > 037777777777 non-portable");
+ }
+ *len_p = s - start;
+ if (!overflowed) {
+ *flags = 0;
+ return value;
+ }
+ *flags = PERL_SCAN_GREATER_THAN_UV_MAX;
+ if (result)
+ *result = value_nv;
+ return UV_MAX;
+}
#endif
-
-#ifndef PERL_MAGIC_uvar_elem
-# define PERL_MAGIC_uvar_elem 'u'
#endif
-#ifndef PERL_MAGIC_vstring
-# define PERL_MAGIC_vstring 'V'
+#ifdef NO_XSLOCKS
+# ifdef dJMPENV
+# define dXCPT dJMPENV; int rEtV = 0
+# define XCPT_TRY_START JMPENV_PUSH(rEtV); if (rEtV == 0)
+# define XCPT_TRY_END JMPENV_POP;
+# define XCPT_CATCH if (rEtV != 0)
+# define XCPT_RETHROW JMPENV_JUMP(rEtV)
+# else
+# define dXCPT Sigjmp_buf oldTOP; int rEtV = 0
+# define XCPT_TRY_START Copy(top_env, oldTOP, 1, Sigjmp_buf); rEtV = Sigsetjmp(top_env, 1); if (rEtV == 0)
+# define XCPT_TRY_END Copy(oldTOP, top_env, 1, Sigjmp_buf);
+# define XCPT_CATCH if (rEtV != 0)
+# define XCPT_RETHROW Siglongjmp(top_env, rEtV)
+# endif
#endif
-#ifndef PERL_MAGIC_vec
-# define PERL_MAGIC_vec 'v'
-#endif
-
-#ifndef PERL_MAGIC_utf8
-# define PERL_MAGIC_utf8 'w'
-#endif
-
-#ifndef PERL_MAGIC_substr
-# define PERL_MAGIC_substr 'x'
-#endif
-
-#ifndef PERL_MAGIC_defelem
-# define PERL_MAGIC_defelem 'y'
-#endif
-
-#ifndef PERL_MAGIC_glob
-# define PERL_MAGIC_glob '*'
-#endif
-
-#ifndef PERL_MAGIC_arylen
-# define PERL_MAGIC_arylen '#'
-#endif
-
-#ifndef PERL_MAGIC_pos
-# define PERL_MAGIC_pos '.'
-#endif
-
-#ifndef PERL_MAGIC_backref
-# define PERL_MAGIC_backref '<'
-#endif
-
-#ifndef PERL_MAGIC_ext
-# define PERL_MAGIC_ext '~'
-#endif
-
#endif /* _P_P_PORTABILITY_H_ */
-/* End of File ppport.h */
+/* End of File vutil/ppport.h */
Modified: packages/libversion-perl/branches/upstream/current/vutil/vutil.c
===================================================================
--- packages/libversion-perl/branches/upstream/current/vutil/vutil.c 2006-03-29 20:57:18 UTC (rev 2486)
+++ packages/libversion-perl/branches/upstream/current/vutil/vutil.c 2006-03-30 12:20:09 UTC (rev 2487)
@@ -284,8 +284,12 @@
}
s = scan_version(version, ver, qv);
if ( *s != '\0' )
+#if defined(ckWARN)
if(ckWARN(WARN_MISC))
Perl_warner(aTHX_ packWARN(WARN_MISC),
+#else
+ warn(
+#endif
"Version string '%s' contains invalid data; "
"ignoring: '%s'", version, s);
Safefree(version);
Modified: packages/libversion-perl/branches/upstream/current/vutil/vutil.h
===================================================================
--- packages/libversion-perl/branches/upstream/current/vutil/vutil.h 2006-03-29 20:57:18 UTC (rev 2486)
+++ packages/libversion-perl/branches/upstream/current/vutil/vutil.h 2006-03-30 12:20:09 UTC (rev 2487)
@@ -7,6 +7,14 @@
#define PERL_ABS(x) ((x) < 0 ? -(x) : (x))
#endif
+#ifndef WARN_MISC
+#define WARN_MISC (1)
+#endif
+
+#ifndef packWARN
+#define packWARN(a) (a)
+#endif
+
#ifndef SVf
#define SVf "_"
#endif
Modified: packages/libversion-perl/branches/upstream/current/vutil/vxs.pm
===================================================================
--- packages/libversion-perl/branches/upstream/current/vutil/vxs.pm 2006-03-29 20:57:18 UTC (rev 2486)
+++ packages/libversion-perl/branches/upstream/current/vutil/vxs.pm 2006-03-30 12:20:09 UTC (rev 2487)
@@ -12,7 +12,7 @@
@EXPORT = qw(qv);
-$VERSION = 0.57;
+$VERSION = 0.59;
$CLASS = 'version::vxs';
More information about the Pkg-perl-cvs-commits
mailing list