+++ /dev/null
-commit 96d386d2bd8b9d06c33837008bd420a9c0b29d28
-Author: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-Commit: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
- bump to 0.06
-
-commit 68e1c1d355f045fd7959393307144aa9a894bbd3
-Author: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-Commit: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
- remove unused variables per -Wall
-
-commit 4c6249853ec480c9cf860a0a6d130a4e42409bc3
-Author: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-Commit: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
- Expanded on a comment in example code
-
-commit d0797f762a80a7ebad75dfd1c453dd2f7a6e38e8
-Author: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-Commit: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
- remove -Wall
-
-commit b2d169dc7467a275069b4378c600df905ea1c6ff
-Author: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-Commit: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
- New ChangeLog file that's made from git, not manually maintained
-
-commit 55b1c44b39286c06a4d352826ac81345b1e0f5cd
-Author: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-Commit: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
- make the function prototype match the header file
-
-commit 8b916a3b3c9a115c834e192c9c1ecf6f431c8f73
-Author: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-Commit: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
- also refer to L<perlpragma>
-
-commit dc80cc73f25e62588ca1164b3be3a281e6acb3be
-Author: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-Commit: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
- typo in ok() docs, /x mod not /i
-
-commit 2b8c214d523e63053b8216b9011b45037922ec3f
-Author: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-Commit: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
- Bump to 0.05
-
-commit 9577daa3b2c3e93ee91478a50461f7b8a8702bd8
-Author: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-Commit: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
- dos2unix to get rid of \r\n
-
-commit 2fe84543333001d29ca366aeb8e795de7ef7772e
-Author: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-Commit: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
- Bump version to 0.05
-
-commit 5feac29518975b05987edbc997123cfa06586bb8
-Author: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-Commit: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
- Update copyright notice to 2008
-
-commit 3988d8ac3fc89133fc48d19c8e5f986f97ac9ae3
-Author: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-Commit: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
- Removed genetared META.yml file
-
-commit 56513ca501ad38f5358ca5f3ee8bdb5ba61b4639
-Author: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-Commit: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
- RT#31635: add aTHX_ to Perl_croak call so it'll run on threaded perls
-
-commit 5da29bf099eb7bfbc1afcba037356cf196e72a72
-Author: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-Commit: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
- Now using ExtUtils::MakeMaker instead of Module::Install
-
-commit 933728271dfc39e78c1c91913753ad49655f32b2
-Author: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-Commit: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
- more stuff for 0.04
-
-commit d81c7c9f05735ada95a64682a6a810bf8e0d302b
-Author: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-Commit: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
- Bump $VERSION to 0.04
- Don't use base, set @ISA directly
-
-commit 5082c33697a378822636072363223ba929a9b51f
-Author: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-Commit: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
- format
-
-commit 3fa42bbb85f17d6edd50bf3ede176ee80b0f2007
-Author: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-Commit: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
- import.t not impor.t
-
-commit 17828d44aeb1c7f68794671796104f7a088c5964
-Author: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-Commit: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
- gitignore and MANIFEST stuff
-
-commit 86e082409eeb8df843893486f92273c0e46d7637
-Author: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-Commit: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
- Backported from 0.04_01
-
-commit 5b5f13004fe16542da2b113b9b45157ceccef343
-Author: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-Commit: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
- Bumping the changelog
-
-commit 5a42c05b23e4ffea50b5bfe897992b013c9e90a4
-Author: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-Commit: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
- Fix up prototypes to match the callbacks in the actual 5.10 release
-
-commit 4d5d5872e8624a2e37fb68c6a280f497806313e8
-Author: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-Commit: Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
- 0.03 from cpan
+++ /dev/null
-Revision history for Perl extension re::engine::Plugin
-
-0.01 Sun Feb 18 2007
- - Initial release, incomplete
\ No newline at end of file
t/usage/import.t
t/usage/import.pm
typemap
-META.yml Module meta-data (added by MakeMaker)
+++ /dev/null
---- #YAML:1.0
-name: re-engine-Plugin
-version: 0.06
-abstract: API to write custom regex engines
-license: perl
-author:
- - Ævar Arnfjörð Bjarmason <avar@cpan.org>
-generated_by: ExtUtils::MakeMaker version 6.42
-distribution_type: module
-requires:
-meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.3.html
- version: 1.3
+++ /dev/null
-Store callbacks in $^H to have a lexical pragma
-
-Make match vars work
-
-Change perl internals to allow match vars to be arbitary SV*? Can only
-be offsets into a string now, Perhaps cheat and pack SV* into two
-I32*?
-
- I32 *startp; /* Array of offsets from start of string (@-) */
- I32 *endp; /* Array of offsets from start of string (@+) */
-
-That requires changes
-
-
-allow comp and exec callbacks not to be specified
-
-bless into the package that import gets called with
-
-Make move eval.t files when the rest of the callbacks are implemented
+++ /dev/null
-Index: D:/dev/perl/ver/zoro/embed.h
-===================================================================
---- D:/dev/perl/ver/zoro/embed.h (revision 972)
-+++ D:/dev/perl/ver/zoro/embed.h (revision 973)
-@@ -698,6 +698,8 @@
- #if defined(PERL_CORE) || defined(PERL_EXT)
- #define reg_named_buff_get Perl_reg_named_buff_get
- #define reg_numbered_buff_get Perl_reg_numbered_buff_get
-+#endif
-+#if defined(PERL_CORE) || defined(PERL_EXT)
- #define regprop Perl_regprop
- #endif
- #define repeatcpy Perl_repeatcpy
-@@ -2915,7 +2917,9 @@
- #define regnext(a) Perl_regnext(aTHX_ a)
- #if defined(PERL_CORE) || defined(PERL_EXT)
- #define reg_named_buff_get(a,b,c) Perl_reg_named_buff_get(aTHX_ a,b,c)
--#define reg_numbered_buff_get(a,b,c,d) Perl_reg_numbered_buff_get(aTHX_ a,b,c,d)
-+#define reg_numbered_buff_get(a,b,c) Perl_reg_numbered_buff_get(aTHX_ a,b,c)
-+#endif
-+#if defined(PERL_CORE) || defined(PERL_EXT)
- #define regprop(a,b,c) Perl_regprop(aTHX_ a,b,c)
- #endif
- #define repeatcpy(a,b,c,d) Perl_repeatcpy(aTHX_ a,b,c,d)
-Index: D:/dev/perl/ver/zoro/regcomp.c
-===================================================================
---- D:/dev/perl/ver/zoro/regcomp.c (revision 972)
-+++ D:/dev/perl/ver/zoro/regcomp.c (revision 973)
-@@ -4692,58 +4692,53 @@
- return(r);
- }
-
--#undef CORE_ONLY_BLOCK
- #undef RE_ENGINE_PTR
-
--#ifndef PERL_IN_XSUB_RE
-+
- SV*
--Perl_reg_named_buff_get(pTHX_ SV* namesv, const REGEXP * const from_re, U32 flags)
-+Perl_reg_named_buff_get(pTHX_ const REGEXP * const rx, SV* namesv, U32 flags)
- {
- AV *retarray = NULL;
- SV *ret;
- if (flags & 1)
- retarray=newAV();
--
-- if (from_re || PL_curpm) {
-- const REGEXP * const rx = from_re ? from_re : PM_GETRE(PL_curpm);
-- if (rx && rx->paren_names) {
-- HE *he_str = hv_fetch_ent( rx->paren_names, namesv, 0, 0 );
-- if (he_str) {
-- IV i;
-- SV* sv_dat=HeVAL(he_str);
-- I32 *nums=(I32*)SvPVX(sv_dat);
-- for ( i=0; i<SvIVX(sv_dat); i++ ) {
-- if ((I32)(rx->nparens) >= nums[i]
-- && rx->startp[nums[i]] != -1
-- && rx->endp[nums[i]] != -1)
-- {
-- ret = reg_numbered_buff_get(nums[i],rx,NULL,0);
-- if (!retarray)
-- return ret;
-- } else {
-- ret = newSVsv(&PL_sv_undef);
-- }
-- if (retarray) {
-- SvREFCNT_inc(ret);
-- av_push(retarray, ret);
-- }
-+
-+ if (rx && rx->paren_names) {
-+ HE *he_str = hv_fetch_ent( rx->paren_names, namesv, 0, 0 );
-+ if (he_str) {
-+ IV i;
-+ SV* sv_dat=HeVAL(he_str);
-+ I32 *nums=(I32*)SvPVX(sv_dat);
-+ for ( i=0; i<SvIVX(sv_dat); i++ ) {
-+ if ((I32)(rx->nparens) >= nums[i]
-+ && rx->startp[nums[i]] != -1
-+ && rx->endp[nums[i]] != -1)
-+ {
-+ ret = CALLREG_NUMBUF(rx,nums[i],NULL);
-+ if (!retarray)
-+ return ret;
-+ } else {
-+ ret = newSVsv(&PL_sv_undef);
- }
-- if (retarray)
-- return (SV*)retarray;
-+ if (retarray) {
-+ SvREFCNT_inc(ret);
-+ av_push(retarray, ret);
-+ }
- }
-+ if (retarray)
-+ return (SV*)retarray;
- }
- }
- return NULL;
- }
-
- SV*
--Perl_reg_numbered_buff_get(pTHX_ I32 paren, const REGEXP * const rx, SV* usesv, U32 flags)
-+Perl_reg_numbered_buff_get(pTHX_ const REGEXP * const rx, I32 paren, SV* usesv)
- {
- char *s = NULL;
- I32 i = 0;
- I32 s1, t1;
- SV *sv = usesv ? usesv : newSVpvs("");
-- PERL_UNUSED_ARG(flags);
-
- if (!rx->subbeg) {
- sv_setsv(sv,&PL_sv_undef);
-@@ -4812,8 +4807,8 @@
- }
- return sv;
- }
--#endif
-
-+
- /* Scans the name of a named buffer from the pattern.
- * If flags is REG_RSN_RETURN_NULL returns null.
- * If flags is REG_RSN_RETURN_NAME returns an SV* containing the name
-Index: D:/dev/perl/ver/zoro/regcomp.h
-===================================================================
---- D:/dev/perl/ver/zoro/regcomp.h (revision 972)
-+++ D:/dev/perl/ver/zoro/regcomp.h (revision 973)
-@@ -463,6 +463,8 @@
- Perl_re_intuit_start,
- Perl_re_intuit_string,
- Perl_regfree_internal,
-+ Perl_reg_numbered_buff_get,
-+ Perl_reg_named_buff_get,
- #if defined(USE_ITHREADS)
- Perl_regdupe_internal
- #endif
-Index: D:/dev/perl/ver/zoro/regexp.h
-===================================================================
---- D:/dev/perl/ver/zoro/regexp.h (revision 972)
-+++ D:/dev/perl/ver/zoro/regexp.h (revision 973)
-@@ -111,6 +111,8 @@
- struct re_scream_pos_data_s *data);
- SV* (*checkstr) (pTHX_ regexp *prog);
- void (*free) (pTHX_ struct regexp* r);
-+ SV* (*numbered_buff_get) (pTHX_ const REGEXP * const rx, I32 paren, SV* usesv);
-+ SV* (*named_buff_get)(pTHX_ const REGEXP * const rx, SV* namesv, U32 flags);
- #ifdef USE_ITHREADS
- void* (*dupe) (pTHX_ const regexp *r, CLONE_PARAMS *param);
- #endif
-Index: D:/dev/perl/ver/zoro/perl.h
-===================================================================
---- D:/dev/perl/ver/zoro/perl.h (revision 972)
-+++ D:/dev/perl/ver/zoro/perl.h (revision 973)
-@@ -219,6 +219,13 @@
- #define CALLREGFREE_PVT(prog) \
- if(prog) CALL_FPTR((prog)->engine->free)(aTHX_ (prog))
-
-+#define CALLREG_NUMBUF(rx,paren,usesv) \
-+ CALL_FPTR((rx)->engine->numbered_buff_get)(aTHX_ (rx),(paren),(usesv))
-+
-+#define CALLREG_NAMEDBUF(rx,name,flags) \
-+ CALL_FPTR((rx)->engine->named_buff_get)(aTHX_ (rx),(name),(flags))
-+
-+
- #if defined(USE_ITHREADS)
- #define CALLREGDUPE(prog,param) \
- Perl_re_dup(aTHX_ (prog),(param))
-Index: D:/dev/perl/ver/zoro/proto.h
-===================================================================
---- D:/dev/perl/ver/zoro/proto.h (revision 972)
-+++ D:/dev/perl/ver/zoro/proto.h (revision 973)
-@@ -1888,12 +1888,15 @@
- __attribute__warn_unused_result__
- __attribute__nonnull__(pTHX_1);
-
--PERL_CALLCONV SV* Perl_reg_named_buff_get(pTHX_ SV* namesv, const REGEXP * const from_re, U32 flags)
-- __attribute__nonnull__(pTHX_1);
-
--PERL_CALLCONV SV* Perl_reg_numbered_buff_get(pTHX_ I32 paren, const REGEXP * const rx, SV* usesv, U32 flags)
-+PERL_CALLCONV SV* Perl_reg_named_buff_get(pTHX_ const REGEXP * const rx, SV* namesv, U32 flags)
-+ __attribute__nonnull__(pTHX_1)
- __attribute__nonnull__(pTHX_2);
-
-+PERL_CALLCONV SV* Perl_reg_numbered_buff_get(pTHX_ const REGEXP * const rx, I32 paren, SV* usesv)
-+ __attribute__nonnull__(pTHX_1);
-+
-+
- PERL_CALLCONV void Perl_regprop(pTHX_ const regexp *prog, SV* sv, const regnode* o)
- __attribute__nonnull__(pTHX_2)
- __attribute__nonnull__(pTHX_3);
-Index: D:/dev/perl/ver/zoro/ext/re/re.xs
-===================================================================
---- D:/dev/perl/ver/zoro/ext/re/re.xs (revision 972)
-+++ D:/dev/perl/ver/zoro/ext/re/re.xs (revision 973)
-@@ -22,6 +22,8 @@
- extern SV* my_re_intuit_string (pTHX_ regexp *prog);
-
- extern void my_regfree (pTHX_ struct regexp* r);
-+extern SV* my_reg_numbered_buff_get(pTHX_ const REGEXP * const rx, I32 paren, SV* usesv);
-+extern SV* my_reg_named_buff_get(pTHX_ const REGEXP * const rx, SV* namesv, U32 flags);
- #if defined(USE_ITHREADS)
- extern void* my_regdupe (pTHX_ const regexp *r, CLONE_PARAMS *param);
- #endif
-@@ -36,6 +38,8 @@
- my_re_intuit_start,
- my_re_intuit_string,
- my_regfree,
-+ my_reg_numbered_buff_get,
-+ my_reg_named_buff_get,
- #if defined(USE_ITHREADS)
- my_regdupe
- #endif
-@@ -213,7 +217,7 @@
- {
- re = get_re_arg( aTHX_ qr, 1, NULL);
- if (SvPOK(sv) && re && re->paren_names) {
-- bufs = Perl_reg_named_buff_get(aTHX_ sv, re ,all && SvTRUE(all));
-+ bufs = CALLREG_NAMEDBUF(re,sv,all && SvTRUE(all));
- if (bufs) {
- if (all && SvTRUE(all))
- XPUSHs(newRV(bufs));
-Index: D:/dev/perl/ver/zoro/ext/re/re_top.h
-===================================================================
---- D:/dev/perl/ver/zoro/ext/re/re_top.h (revision 972)
-+++ D:/dev/perl/ver/zoro/ext/re/re_top.h (revision 973)
-@@ -16,6 +16,8 @@
- #define Perl_regfree_internal my_regfree
- #define Perl_re_intuit_string my_re_intuit_string
- #define Perl_regdupe_internal my_regdupe
-+#define Perl_reg_numbered_buff_get my_reg_numbered_buff_get
-+#define Perl_reg_named_buff_get my_reg_named_buff_get
-
- #define PERL_NO_GET_CONTEXT
-
-Index: D:/dev/perl/ver/zoro/mg.c
-===================================================================
---- D:/dev/perl/ver/zoro/mg.c (revision 972)
-+++ D:/dev/perl/ver/zoro/mg.c (revision 973)
-@@ -863,7 +863,7 @@
- * XXX Does the new way break anything?
- */
- paren = atoi(mg->mg_ptr); /* $& is in [0] */
-- reg_numbered_buff_get( paren, rx, sv, 0);
-+ CALLREG_NUMBUF(rx,paren,sv);
- break;
- }
- sv_setsv(sv,&PL_sv_undef);
-@@ -872,7 +872,7 @@
- case '+':
- if (PL_curpm && (rx = PM_GETRE(PL_curpm))) {
- if (rx->lastparen) {
-- reg_numbered_buff_get( rx->lastparen, rx, sv, 0);
-+ CALLREG_NUMBUF(rx,rx->lastparen,sv);
- break;
- }
- }
-@@ -881,7 +881,7 @@
- case '\016': /* ^N */
- if (PL_curpm && (rx = PM_GETRE(PL_curpm))) {
- if (rx->lastcloseparen) {
-- reg_numbered_buff_get( rx->lastcloseparen, rx, sv, 0);
-+ CALLREG_NUMBUF(rx,rx->lastcloseparen,sv);
- break;
- }
-
-@@ -891,16 +891,16 @@
- case '`':
- do_prematch_fetch:
- if (PL_curpm && (rx = PM_GETRE(PL_curpm))) {
-- reg_numbered_buff_get( -2, rx, sv, 0);
-- break;
-+ CALLREG_NUMBUF(rx,-2,sv);
-+ break;
- }
- sv_setsv(sv,&PL_sv_undef);
- break;
- case '\'':
- do_postmatch_fetch:
- if (PL_curpm && (rx = PM_GETRE(PL_curpm))) {
-- reg_numbered_buff_get( -1, rx, sv, 0);
-- break;
-+ CALLREG_NUMBUF(rx,-1,sv);
-+ break;
- }
- sv_setsv(sv,&PL_sv_undef);
- break;
-Index: D:/dev/perl/ver/zoro/embed.fnc
-===================================================================
---- D:/dev/perl/ver/zoro/embed.fnc (revision 972)
-+++ D:/dev/perl/ver/zoro/embed.fnc (revision 973)
-@@ -691,8 +691,10 @@
- |NN char* strend|NN char* strbeg|I32 minend \
- |NN SV* screamer|NULLOK void* data|U32 flags
- ApR |regnode*|regnext |NN regnode* p
--EXp |SV*|reg_named_buff_get |NN SV* namesv|NULLOK const REGEXP * const from_re|U32 flags
--EXp |SV*|reg_numbered_buff_get|I32 paren|NN const REGEXP * const rx|NULLOK SV* usesv|U32 flags
-+
-+EXp |SV*|reg_named_buff_get |NN const REGEXP * const rx|NN SV* namesv|U32 flags
-+EXp |SV*|reg_numbered_buff_get|NN const REGEXP * const rx|I32 paren|NULLOK SV* usesv
-+
- Ep |void |regprop |NULLOK const regexp *prog|NN SV* sv|NN const regnode* o
- Ap |void |repeatcpy |NN char* to|NN const char* from|I32 len|I32 count
- ApP |char* |rninstr |NN const char* big|NN const char* bigend \
+++ /dev/null
-#line 1
-package Module::AutoInstall;
-
-use strict;
-use Cwd ();
-use ExtUtils::MakeMaker ();
-
-use vars qw{$VERSION};
-BEGIN {
- $VERSION = '1.03';
-}
-
-# special map on pre-defined feature sets
-my %FeatureMap = (
- '' => 'Core Features', # XXX: deprecated
- '-core' => 'Core Features',
-);
-
-# various lexical flags
-my ( @Missing, @Existing, %DisabledTests, $UnderCPAN, $HasCPANPLUS );
-my ( $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly );
-my ( $PostambleActions, $PostambleUsed );
-
-# See if it's a testing or non-interactive session
-_accept_default( $ENV{AUTOMATED_TESTING} or ! -t STDIN );
-_init();
-
-sub _accept_default {
- $AcceptDefault = shift;
-}
-
-sub missing_modules {
- return @Missing;
-}
-
-sub do_install {
- __PACKAGE__->install(
- [
- $Config
- ? ( UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} )
- : ()
- ],
- @Missing,
- );
-}
-
-# initialize various flags, and/or perform install
-sub _init {
- foreach my $arg (
- @ARGV,
- split(
- /[\s\t]+/,
- $ENV{PERL_AUTOINSTALL} || $ENV{PERL_EXTUTILS_AUTOINSTALL} || ''
- )
- )
- {
- if ( $arg =~ /^--config=(.*)$/ ) {
- $Config = [ split( ',', $1 ) ];
- }
- elsif ( $arg =~ /^--installdeps=(.*)$/ ) {
- __PACKAGE__->install( $Config, @Missing = split( /,/, $1 ) );
- exit 0;
- }
- elsif ( $arg =~ /^--default(?:deps)?$/ ) {
- $AcceptDefault = 1;
- }
- elsif ( $arg =~ /^--check(?:deps)?$/ ) {
- $CheckOnly = 1;
- }
- elsif ( $arg =~ /^--skip(?:deps)?$/ ) {
- $SkipInstall = 1;
- }
- elsif ( $arg =~ /^--test(?:only)?$/ ) {
- $TestOnly = 1;
- }
- }
-}
-
-# overrides MakeMaker's prompt() to automatically accept the default choice
-sub _prompt {
- goto &ExtUtils::MakeMaker::prompt unless $AcceptDefault;
-
- my ( $prompt, $default ) = @_;
- my $y = ( $default =~ /^[Yy]/ );
-
- print $prompt, ' [', ( $y ? 'Y' : 'y' ), '/', ( $y ? 'n' : 'N' ), '] ';
- print "$default\n";
- return $default;
-}
-
-# the workhorse
-sub import {
- my $class = shift;
- my @args = @_ or return;
- my $core_all;
-
- print "*** $class version " . $class->VERSION . "\n";
- print "*** Checking for Perl dependencies...\n";
-
- my $cwd = Cwd::cwd();
-
- $Config = [];
-
- my $maxlen = length(
- (
- sort { length($b) <=> length($a) }
- grep { /^[^\-]/ }
- map {
- ref($_)
- ? ( ( ref($_) eq 'HASH' ) ? keys(%$_) : @{$_} )
- : ''
- }
- map { +{@args}->{$_} }
- grep { /^[^\-]/ or /^-core$/i } keys %{ +{@args} }
- )[0]
- );
-
- while ( my ( $feature, $modules ) = splice( @args, 0, 2 ) ) {
- my ( @required, @tests, @skiptests );
- my $default = 1;
- my $conflict = 0;
-
- if ( $feature =~ m/^-(\w+)$/ ) {
- my $option = lc($1);
-
- # check for a newer version of myself
- _update_to( $modules, @_ ) and return if $option eq 'version';
-
- # sets CPAN configuration options
- $Config = $modules if $option eq 'config';
-
- # promote every features to core status
- $core_all = ( $modules =~ /^all$/i ) and next
- if $option eq 'core';
-
- next unless $option eq 'core';
- }
-
- print "[" . ( $FeatureMap{ lc($feature) } || $feature ) . "]\n";
-
- $modules = [ %{$modules} ] if UNIVERSAL::isa( $modules, 'HASH' );
-
- unshift @$modules, -default => &{ shift(@$modules) }
- if ( ref( $modules->[0] ) eq 'CODE' ); # XXX: bugward combatability
-
- while ( my ( $mod, $arg ) = splice( @$modules, 0, 2 ) ) {
- if ( $mod =~ m/^-(\w+)$/ ) {
- my $option = lc($1);
-
- $default = $arg if ( $option eq 'default' );
- $conflict = $arg if ( $option eq 'conflict' );
- @tests = @{$arg} if ( $option eq 'tests' );
- @skiptests = @{$arg} if ( $option eq 'skiptests' );
-
- next;
- }
-
- printf( "- %-${maxlen}s ...", $mod );
-
- if ( $arg and $arg =~ /^\D/ ) {
- unshift @$modules, $arg;
- $arg = 0;
- }
-
- # XXX: check for conflicts and uninstalls(!) them.
- if (
- defined( my $cur = _version_check( _load($mod), $arg ||= 0 ) ) )
- {
- print "loaded. ($cur" . ( $arg ? " >= $arg" : '' ) . ")\n";
- push @Existing, $mod => $arg;
- $DisabledTests{$_} = 1 for map { glob($_) } @skiptests;
- }
- else {
- print "missing." . ( $arg ? " (would need $arg)" : '' ) . "\n";
- push @required, $mod => $arg;
- }
- }
-
- next unless @required;
-
- my $mandatory = ( $feature eq '-core' or $core_all );
-
- if (
- !$SkipInstall
- and (
- $CheckOnly
- or _prompt(
- qq{==> Auto-install the }
- . ( @required / 2 )
- . ( $mandatory ? ' mandatory' : ' optional' )
- . qq{ module(s) from CPAN?},
- $default ? 'y' : 'n',
- ) =~ /^[Yy]/
- )
- )
- {
- push( @Missing, @required );
- $DisabledTests{$_} = 1 for map { glob($_) } @skiptests;
- }
-
- elsif ( !$SkipInstall
- and $default
- and $mandatory
- and
- _prompt( qq{==> The module(s) are mandatory! Really skip?}, 'n', )
- =~ /^[Nn]/ )
- {
- push( @Missing, @required );
- $DisabledTests{$_} = 1 for map { glob($_) } @skiptests;
- }
-
- else {
- $DisabledTests{$_} = 1 for map { glob($_) } @tests;
- }
- }
-
- $UnderCPAN = _check_lock(); # check for $UnderCPAN
-
- if ( @Missing and not( $CheckOnly or $UnderCPAN ) ) {
- require Config;
- print
-"*** Dependencies will be installed the next time you type '$Config::Config{make}'.\n";
-
- # make an educated guess of whether we'll need root permission.
- print " (You may need to do that as the 'root' user.)\n"
- if eval '$>';
- }
- print "*** $class configuration finished.\n";
-
- chdir $cwd;
-
- # import to main::
- no strict 'refs';
- *{'main::WriteMakefile'} = \&Write if caller(0) eq 'main';
-}
-
-# Check to see if we are currently running under CPAN.pm and/or CPANPLUS;
-# if we are, then we simply let it taking care of our dependencies
-sub _check_lock {
- return unless @Missing;
-
- if ($ENV{PERL5_CPANPLUS_IS_RUNNING}) {
- print <<'END_MESSAGE';
-
-*** Since we're running under CPANPLUS, I'll just let it take care
- of the dependency's installation later.
-END_MESSAGE
- return 1;
- }
-
- _load_cpan();
-
- # Find the CPAN lock-file
- my $lock = MM->catfile( $CPAN::Config->{cpan_home}, ".lock" );
- return unless -f $lock;
-
- # Check the lock
- local *LOCK;
- return unless open(LOCK, $lock);
-
- if (
- ( $^O eq 'MSWin32' ? _under_cpan() : <LOCK> == getppid() )
- and ( $CPAN::Config->{prerequisites_policy} || '' ) ne 'ignore'
- ) {
- print <<'END_MESSAGE';
-
-*** Since we're running under CPAN, I'll just let it take care
- of the dependency's installation later.
-END_MESSAGE
- return 1;
- }
-
- close LOCK;
- return;
-}
-
-sub install {
- my $class = shift;
-
- my $i; # used below to strip leading '-' from config keys
- my @config = ( map { s/^-// if ++$i; $_ } @{ +shift } );
-
- my ( @modules, @installed );
- while ( my ( $pkg, $ver ) = splice( @_, 0, 2 ) ) {
-
- # grep out those already installed
- if ( defined( _version_check( _load($pkg), $ver ) ) ) {
- push @installed, $pkg;
- }
- else {
- push @modules, $pkg, $ver;
- }
- }
-
- return @installed unless @modules; # nothing to do
- return @installed if _check_lock(); # defer to the CPAN shell
-
- print "*** Installing dependencies...\n";
-
- return unless _connected_to('cpan.org');
-
- my %args = @config;
- my %failed;
- local *FAILED;
- if ( $args{do_once} and open( FAILED, '.#autoinstall.failed' ) ) {
- while (<FAILED>) { chomp; $failed{$_}++ }
- close FAILED;
-
- my @newmod;
- while ( my ( $k, $v ) = splice( @modules, 0, 2 ) ) {
- push @newmod, ( $k => $v ) unless $failed{$k};
- }
- @modules = @newmod;
- }
-
- if ( _has_cpanplus() ) {
- _install_cpanplus( \@modules, \@config );
- } else {
- _install_cpan( \@modules, \@config );
- }
-
- print "*** $class installation finished.\n";
-
- # see if we have successfully installed them
- while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
- if ( defined( _version_check( _load($pkg), $ver ) ) ) {
- push @installed, $pkg;
- }
- elsif ( $args{do_once} and open( FAILED, '>> .#autoinstall.failed' ) ) {
- print FAILED "$pkg\n";
- }
- }
-
- close FAILED if $args{do_once};
-
- return @installed;
-}
-
-sub _install_cpanplus {
- my @modules = @{ +shift };
- my @config = _cpanplus_config( @{ +shift } );
- my $installed = 0;
-
- require CPANPLUS::Backend;
- my $cp = CPANPLUS::Backend->new;
- my $conf = $cp->configure_object;
-
- return unless $conf->can('conf') # 0.05x+ with "sudo" support
- or _can_write($conf->_get_build('base')); # 0.04x
-
- # if we're root, set UNINST=1 to avoid trouble unless user asked for it.
- my $makeflags = $conf->get_conf('makeflags') || '';
- if ( UNIVERSAL::isa( $makeflags, 'HASH' ) ) {
- # 0.03+ uses a hashref here
- $makeflags->{UNINST} = 1 unless exists $makeflags->{UNINST};
-
- } else {
- # 0.02 and below uses a scalar
- $makeflags = join( ' ', split( ' ', $makeflags ), 'UNINST=1' )
- if ( $makeflags !~ /\bUNINST\b/ and eval qq{ $> eq '0' } );
-
- }
- $conf->set_conf( makeflags => $makeflags );
- $conf->set_conf( prereqs => 1 );
-
-
-
- while ( my ( $key, $val ) = splice( @config, 0, 2 ) ) {
- $conf->set_conf( $key, $val );
- }
-
- my $modtree = $cp->module_tree;
- while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
- print "*** Installing $pkg...\n";
-
- MY::preinstall( $pkg, $ver ) or next if defined &MY::preinstall;
-
- my $success;
- my $obj = $modtree->{$pkg};
-
- if ( $obj and defined( _version_check( $obj->{version}, $ver ) ) ) {
- my $pathname = $pkg;
- $pathname =~ s/::/\\W/;
-
- foreach my $inc ( grep { m/$pathname.pm/i } keys(%INC) ) {
- delete $INC{$inc};
- }
-
- my $rv = $cp->install( modules => [ $obj->{module} ] );
-
- if ( $rv and ( $rv->{ $obj->{module} } or $rv->{ok} ) ) {
- print "*** $pkg successfully installed.\n";
- $success = 1;
- } else {
- print "*** $pkg installation cancelled.\n";
- $success = 0;
- }
-
- $installed += $success;
- } else {
- print << ".";
-*** Could not find a version $ver or above for $pkg; skipping.
-.
- }
-
- MY::postinstall( $pkg, $ver, $success ) if defined &MY::postinstall;
- }
-
- return $installed;
-}
-
-sub _cpanplus_config {
- my @config = ();
- while ( @_ ) {
- my ($key, $value) = (shift(), shift());
- if ( $key eq 'prerequisites_policy' ) {
- if ( $value eq 'follow' ) {
- $value = CPANPLUS::Internals::Constants::PREREQ_INSTALL();
- } elsif ( $value eq 'ask' ) {
- $value = CPANPLUS::Internals::Constants::PREREQ_ASK();
- } elsif ( $value eq 'ignore' ) {
- $value = CPANPLUS::Internals::Constants::PREREQ_IGNORE();
- } else {
- die "*** Cannot convert option $key = '$value' to CPANPLUS version.\n";
- }
- } else {
- die "*** Cannot convert option $key to CPANPLUS version.\n";
- }
- }
- return @config;
-}
-
-sub _install_cpan {
- my @modules = @{ +shift };
- my @config = @{ +shift };
- my $installed = 0;
- my %args;
-
- _load_cpan();
- require Config;
-
- if (CPAN->VERSION < 1.80) {
- # no "sudo" support, probe for writableness
- return unless _can_write( MM->catfile( $CPAN::Config->{cpan_home}, 'sources' ) )
- and _can_write( $Config::Config{sitelib} );
- }
-
- # if we're root, set UNINST=1 to avoid trouble unless user asked for it.
- my $makeflags = $CPAN::Config->{make_install_arg} || '';
- $CPAN::Config->{make_install_arg} =
- join( ' ', split( ' ', $makeflags ), 'UNINST=1' )
- if ( $makeflags !~ /\bUNINST\b/ and eval qq{ $> eq '0' } );
-
- # don't show start-up info
- $CPAN::Config->{inhibit_startup_message} = 1;
-
- # set additional options
- while ( my ( $opt, $arg ) = splice( @config, 0, 2 ) ) {
- ( $args{$opt} = $arg, next )
- if $opt =~ /^force$/; # pseudo-option
- $CPAN::Config->{$opt} = $arg;
- }
-
- local $CPAN::Config->{prerequisites_policy} = 'follow';
-
- while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
- MY::preinstall( $pkg, $ver ) or next if defined &MY::preinstall;
-
- print "*** Installing $pkg...\n";
-
- my $obj = CPAN::Shell->expand( Module => $pkg );
- my $success = 0;
-
- if ( $obj and defined( _version_check( $obj->cpan_version, $ver ) ) ) {
- my $pathname = $pkg;
- $pathname =~ s/::/\\W/;
-
- foreach my $inc ( grep { m/$pathname.pm/i } keys(%INC) ) {
- delete $INC{$inc};
- }
-
- my $rv = $args{force} ? CPAN::Shell->force( install => $pkg )
- : CPAN::Shell->install($pkg);
- $rv ||= eval {
- $CPAN::META->instance( 'CPAN::Distribution', $obj->cpan_file, )
- ->{install}
- if $CPAN::META;
- };
-
- if ( $rv eq 'YES' ) {
- print "*** $pkg successfully installed.\n";
- $success = 1;
- }
- else {
- print "*** $pkg installation failed.\n";
- $success = 0;
- }
-
- $installed += $success;
- }
- else {
- print << ".";
-*** Could not find a version $ver or above for $pkg; skipping.
-.
- }
-
- MY::postinstall( $pkg, $ver, $success ) if defined &MY::postinstall;
- }
-
- return $installed;
-}
-
-sub _has_cpanplus {
- return (
- $HasCPANPLUS = (
- $INC{'CPANPLUS/Config.pm'}
- or _load('CPANPLUS::Shell::Default')
- )
- );
-}
-
-# make guesses on whether we're under the CPAN installation directory
-sub _under_cpan {
- require Cwd;
- require File::Spec;
-
- my $cwd = File::Spec->canonpath( Cwd::cwd() );
- my $cpan = File::Spec->canonpath( $CPAN::Config->{cpan_home} );
-
- return ( index( $cwd, $cpan ) > -1 );
-}
-
-sub _update_to {
- my $class = __PACKAGE__;
- my $ver = shift;
-
- return
- if defined( _version_check( _load($class), $ver ) ); # no need to upgrade
-
- if (
- _prompt( "==> A newer version of $class ($ver) is required. Install?",
- 'y' ) =~ /^[Nn]/
- )
- {
- die "*** Please install $class $ver manually.\n";
- }
-
- print << ".";
-*** Trying to fetch it from CPAN...
-.
-
- # install ourselves
- _load($class) and return $class->import(@_)
- if $class->install( [], $class, $ver );
-
- print << '.'; exit 1;
-
-*** Cannot bootstrap myself. :-( Installation terminated.
-.
-}
-
-# check if we're connected to some host, using inet_aton
-sub _connected_to {
- my $site = shift;
-
- return (
- ( _load('Socket') and Socket::inet_aton($site) ) or _prompt(
- qq(
-*** Your host cannot resolve the domain name '$site', which
- probably means the Internet connections are unavailable.
-==> Should we try to install the required module(s) anyway?), 'n'
- ) =~ /^[Yy]/
- );
-}
-
-# check if a directory is writable; may create it on demand
-sub _can_write {
- my $path = shift;
- mkdir( $path, 0755 ) unless -e $path;
-
- return 1 if -w $path;
-
- print << ".";
-*** You are not allowed to write to the directory '$path';
- the installation may fail due to insufficient permissions.
-.
-
- if (
- eval '$>' and lc(`sudo -V`) =~ /version/ and _prompt(
- qq(
-==> Should we try to re-execute the autoinstall process with 'sudo'?),
- ((-t STDIN) ? 'y' : 'n')
- ) =~ /^[Yy]/
- )
- {
-
- # try to bootstrap ourselves from sudo
- print << ".";
-*** Trying to re-execute the autoinstall process with 'sudo'...
-.
- my $missing = join( ',', @Missing );
- my $config = join( ',',
- UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} )
- if $Config;
-
- return
- unless system( 'sudo', $^X, $0, "--config=$config",
- "--installdeps=$missing" );
-
- print << ".";
-*** The 'sudo' command exited with error! Resuming...
-.
- }
-
- return _prompt(
- qq(
-==> Should we try to install the required module(s) anyway?), 'n'
- ) =~ /^[Yy]/;
-}
-
-# load a module and return the version it reports
-sub _load {
- my $mod = pop; # class/instance doesn't matter
- my $file = $mod;
-
- $file =~ s|::|/|g;
- $file .= '.pm';
-
- local $@;
- return eval { require $file; $mod->VERSION } || ( $@ ? undef: 0 );
-}
-
-# Load CPAN.pm and it's configuration
-sub _load_cpan {
- return if $CPAN::VERSION;
- require CPAN;
- if ( $CPAN::HandleConfig::VERSION ) {
- # Newer versions of CPAN have a HandleConfig module
- CPAN::HandleConfig->load;
- } else {
- # Older versions had the load method in Config directly
- CPAN::Config->load;
- }
-}
-
-# compare two versions, either use Sort::Versions or plain comparison
-sub _version_check {
- my ( $cur, $min ) = @_;
- return unless defined $cur;
-
- $cur =~ s/\s+$//;
-
- # check for version numbers that are not in decimal format
- if ( ref($cur) or ref($min) or $cur =~ /v|\..*\./ or $min =~ /v|\..*\./ ) {
- if ( ( $version::VERSION or defined( _load('version') )) and
- version->can('new')
- ) {
-
- # use version.pm if it is installed.
- return (
- ( version->new($cur) >= version->new($min) ) ? $cur : undef );
- }
- elsif ( $Sort::Versions::VERSION or defined( _load('Sort::Versions') ) )
- {
-
- # use Sort::Versions as the sorting algorithm for a.b.c versions
- return ( ( Sort::Versions::versioncmp( $cur, $min ) != -1 )
- ? $cur
- : undef );
- }
-
- warn "Cannot reliably compare non-decimal formatted versions.\n"
- . "Please install version.pm or Sort::Versions.\n";
- }
-
- # plain comparison
- local $^W = 0; # shuts off 'not numeric' bugs
- return ( $cur >= $min ? $cur : undef );
-}
-
-# nothing; this usage is deprecated.
-sub main::PREREQ_PM { return {}; }
-
-sub _make_args {
- my %args = @_;
-
- $args{PREREQ_PM} = { %{ $args{PREREQ_PM} || {} }, @Existing, @Missing }
- if $UnderCPAN or $TestOnly;
-
- if ( $args{EXE_FILES} and -e 'MANIFEST' ) {
- require ExtUtils::Manifest;
- my $manifest = ExtUtils::Manifest::maniread('MANIFEST');
-
- $args{EXE_FILES} =
- [ grep { exists $manifest->{$_} } @{ $args{EXE_FILES} } ];
- }
-
- $args{test}{TESTS} ||= 't/*.t';
- $args{test}{TESTS} = join( ' ',
- grep { !exists( $DisabledTests{$_} ) }
- map { glob($_) } split( /\s+/, $args{test}{TESTS} ) );
-
- my $missing = join( ',', @Missing );
- my $config =
- join( ',', UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} )
- if $Config;
-
- $PostambleActions = (
- $missing
- ? "\$(PERL) $0 --config=$config --installdeps=$missing"
- : "\$(NOECHO) \$(NOOP)"
- );
-
- return %args;
-}
-
-# a wrapper to ExtUtils::MakeMaker::WriteMakefile
-sub Write {
- require Carp;
- Carp::croak "WriteMakefile: Need even number of args" if @_ % 2;
-
- if ($CheckOnly) {
- print << ".";
-*** Makefile not written in check-only mode.
-.
- return;
- }
-
- my %args = _make_args(@_);
-
- no strict 'refs';
-
- $PostambleUsed = 0;
- local *MY::postamble = \&postamble unless defined &MY::postamble;
- ExtUtils::MakeMaker::WriteMakefile(%args);
-
- print << "." unless $PostambleUsed;
-*** WARNING: Makefile written with customized MY::postamble() without
- including contents from Module::AutoInstall::postamble() --
- auto installation features disabled. Please contact the author.
-.
-
- return 1;
-}
-
-sub postamble {
- $PostambleUsed = 1;
-
- return << ".";
-
-config :: installdeps
-\t\$(NOECHO) \$(NOOP)
-
-checkdeps ::
-\t\$(PERL) $0 --checkdeps
-
-installdeps ::
-\t$PostambleActions
-
-.
-
-}
-
-1;
-
-__END__
-
-#line 1003
+++ /dev/null
-#line 1
-package Module::Install;
-
-# For any maintainers:
-# The load order for Module::Install is a bit magic.
-# It goes something like this...
-#
-# IF ( host has Module::Install installed, creating author mode ) {
-# 1. Makefile.PL calls "use inc::Module::Install"
-# 2. $INC{inc/Module/Install.pm} set to installed version of inc::Module::Install
-# 3. The installed version of inc::Module::Install loads
-# 4. inc::Module::Install calls "require Module::Install"
-# 5. The ./inc/ version of Module::Install loads
-# } ELSE {
-# 1. Makefile.PL calls "use inc::Module::Install"
-# 2. $INC{inc/Module/Install.pm} set to ./inc/ version of Module::Install
-# 3. The ./inc/ version of Module::Install loads
-# }
-
-use 5.004;
-use strict 'vars';
-
-use vars qw{$VERSION};
-BEGIN {
- # All Module::Install core packages now require synchronised versions.
- # This will be used to ensure we don't accidentally load old or
- # different versions of modules.
- # This is not enforced yet, but will be some time in the next few
- # releases once we can make sure it won't clash with custom
- # Module::Install extensions.
- $VERSION = '0.65';
-}
-
-# Whether or not inc::Module::Install is actually loaded, the
-# $INC{inc/Module/Install.pm} is what will still get set as long as
-# the caller loaded module this in the documented manner.
-# If not set, the caller may NOT have loaded the bundled version, and thus
-# they may not have a MI version that works with the Makefile.PL. This would
-# result in false errors or unexpected behaviour. And we don't want that.
-my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm';
-unless ( $INC{$file} ) {
- die <<"END_DIE";
-Please invoke ${\__PACKAGE__} with:
-
- use inc::${\__PACKAGE__};
-
-not:
-
- use ${\__PACKAGE__};
-
-END_DIE
-}
-
-# If the script that is loading Module::Install is from the future,
-# then make will detect this and cause it to re-run over and over
-# again. This is bad. Rather than taking action to touch it (which
-# is unreliable on some platforms and requires write permissions)
-# for now we should catch this and refuse to run.
-if ( -f $0 and (stat($0))[9] > time ) {
- die << "END_DIE";
-Your installer $0 has a modification time in the future.
-
-This is known to create infinite loops in make.
-
-Please correct this, then run $0 again.
-
-END_DIE
-}
-
-use Cwd ();
-use File::Find ();
-use File::Path ();
-use FindBin;
-
-*inc::Module::Install::VERSION = *VERSION;
-@inc::Module::Install::ISA = __PACKAGE__;
-
-sub autoload {
- my $self = shift;
- my $who = $self->_caller;
- my $cwd = Cwd::cwd();
- my $sym = "${who}::AUTOLOAD";
- $sym->{$cwd} = sub {
- my $pwd = Cwd::cwd();
- if ( my $code = $sym->{$pwd} ) {
- # delegate back to parent dirs
- goto &$code unless $cwd eq $pwd;
- }
- $$sym =~ /([^:]+)$/ or die "Cannot autoload $who - $sym";
- unshift @_, ($self, $1);
- goto &{$self->can('call')} unless uc($1) eq $1;
- };
-}
-
-sub import {
- my $class = shift;
- my $self = $class->new(@_);
- my $who = $self->_caller;
-
- unless ( -f $self->{file} ) {
- require "$self->{path}/$self->{dispatch}.pm";
- File::Path::mkpath("$self->{prefix}/$self->{author}");
- $self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self );
- $self->{admin}->init;
- @_ = ($class, _self => $self);
- goto &{"$self->{name}::import"};
- }
-
- *{"${who}::AUTOLOAD"} = $self->autoload;
- $self->preload;
-
- # Unregister loader and worker packages so subdirs can use them again
- delete $INC{"$self->{file}"};
- delete $INC{"$self->{path}.pm"};
-}
-
-sub preload {
- my ($self) = @_;
-
- unless ( $self->{extensions} ) {
- $self->load_extensions(
- "$self->{prefix}/$self->{path}", $self
- );
- }
-
- my @exts = @{$self->{extensions}};
- unless ( @exts ) {
- my $admin = $self->{admin};
- @exts = $admin->load_all_extensions;
- }
-
- my %seen;
- foreach my $obj ( @exts ) {
- while (my ($method, $glob) = each %{ref($obj) . '::'}) {
- next unless $obj->can($method);
- next if $method =~ /^_/;
- next if $method eq uc($method);
- $seen{$method}++;
- }
- }
-
- my $who = $self->_caller;
- foreach my $name ( sort keys %seen ) {
- *{"${who}::$name"} = sub {
- ${"${who}::AUTOLOAD"} = "${who}::$name";
- goto &{"${who}::AUTOLOAD"};
- };
- }
-}
-
-sub new {
- my ($class, %args) = @_;
-
- # ignore the prefix on extension modules built from top level.
- my $base_path = Cwd::abs_path($FindBin::Bin);
- unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) {
- delete $args{prefix};
- }
-
- return $args{_self} if $args{_self};
-
- $args{dispatch} ||= 'Admin';
- $args{prefix} ||= 'inc';
- $args{author} ||= ($^O eq 'VMS' ? '_author' : '.author');
- $args{bundle} ||= 'inc/BUNDLES';
- $args{base} ||= $base_path;
- $class =~ s/^\Q$args{prefix}\E:://;
- $args{name} ||= $class;
- $args{version} ||= $class->VERSION;
- unless ( $args{path} ) {
- $args{path} = $args{name};
- $args{path} =~ s!::!/!g;
- }
- $args{file} ||= "$args{base}/$args{prefix}/$args{path}.pm";
-
- bless( \%args, $class );
-}
-
-sub call {
- my ($self, $method) = @_;
- my $obj = $self->load($method) or return;
- splice(@_, 0, 2, $obj);
- goto &{$obj->can($method)};
-}
-
-sub load {
- my ($self, $method) = @_;
-
- $self->load_extensions(
- "$self->{prefix}/$self->{path}", $self
- ) unless $self->{extensions};
-
- foreach my $obj (@{$self->{extensions}}) {
- return $obj if $obj->can($method);
- }
-
- my $admin = $self->{admin} or die <<"END_DIE";
-The '$method' method does not exist in the '$self->{prefix}' path!
-Please remove the '$self->{prefix}' directory and run $0 again to load it.
-END_DIE
-
- my $obj = $admin->load($method, 1);
- push @{$self->{extensions}}, $obj;
-
- $obj;
-}
-
-sub load_extensions {
- my ($self, $path, $top) = @_;
-
- unless ( grep { lc $_ eq lc $self->{prefix} } @INC ) {
- unshift @INC, $self->{prefix};
- }
-
- foreach my $rv ( $self->find_extensions($path) ) {
- my ($file, $pkg) = @{$rv};
- next if $self->{pathnames}{$pkg};
-
- local $@;
- my $new = eval { require $file; $pkg->can('new') };
- unless ( $new ) {
- warn $@ if $@;
- next;
- }
- $self->{pathnames}{$pkg} = delete $INC{$file};
- push @{$self->{extensions}}, &{$new}($pkg, _top => $top );
- }
-
- $self->{extensions} ||= [];
-}
-
-sub find_extensions {
- my ($self, $path) = @_;
-
- my @found;
- File::Find::find( sub {
- my $file = $File::Find::name;
- return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is;
- my $subpath = $1;
- return if lc($subpath) eq lc($self->{dispatch});
-
- $file = "$self->{path}/$subpath.pm";
- my $pkg = "$self->{name}::$subpath";
- $pkg =~ s!/!::!g;
-
- # If we have a mixed-case package name, assume case has been preserved
- # correctly. Otherwise, root through the file to locate the case-preserved
- # version of the package name.
- if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) {
- open PKGFILE, "<$subpath.pm" or die "find_extensions: Can't open $subpath.pm: $!";
- my $in_pod = 0;
- while ( <PKGFILE> ) {
- $in_pod = 1 if /^=\w/;
- $in_pod = 0 if /^=cut/;
- next if ($in_pod || /^=cut/); # skip pod text
- next if /^\s*#/; # and comments
- if ( m/^\s*package\s+($pkg)\s*;/i ) {
- $pkg = $1;
- last;
- }
- }
- close PKGFILE;
- }
-
- push @found, [ $file, $pkg ];
- }, $path ) if -d $path;
-
- @found;
-}
-
-sub _caller {
- my $depth = 0;
- my $call = caller($depth);
- while ( $call eq __PACKAGE__ ) {
- $depth++;
- $call = caller($depth);
- }
- return $call;
-}
-
-1;
+++ /dev/null
-#line 1
-package Module::Install::AutoInstall;
-
-use strict;
-use Module::Install::Base;
-
-use vars qw{$VERSION $ISCORE @ISA};
-BEGIN {
- $VERSION = '0.65';
- $ISCORE = 1;
- @ISA = qw{Module::Install::Base};
-}
-
-sub AutoInstall { $_[0] }
-
-sub run {
- my $self = shift;
- $self->auto_install_now(@_);
-}
-
-sub write {
- my $self = shift;
- $self->auto_install(@_);
-}
-
-sub auto_install {
- my $self = shift;
- return if $self->{done}++;
-
- # Flatten array of arrays into a single array
- my @core = map @$_, map @$_, grep ref,
- $self->build_requires, $self->requires;
-
- my @config = @_;
-
- # We'll need Module::AutoInstall
- $self->include('Module::AutoInstall');
- require Module::AutoInstall;
-
- Module::AutoInstall->import(
- (@config ? (-config => \@config) : ()),
- (@core ? (-core => \@core) : ()),
- $self->features,
- );
-
- $self->makemaker_args( Module::AutoInstall::_make_args() );
-
- my $class = ref($self);
- $self->postamble(
- "# --- $class section:\n" .
- Module::AutoInstall::postamble()
- );
-}
-
-sub auto_install_now {
- my $self = shift;
- $self->auto_install(@_);
- Module::AutoInstall::do_install();
-}
-
-1;
+++ /dev/null
-#line 1
-package Module::Install::Base;
-
-$VERSION = '0.65';
-
-# Suspend handler for "redefined" warnings
-BEGIN {
- my $w = $SIG{__WARN__};
- $SIG{__WARN__} = sub { $w };
-}
-
-### This is the ONLY module that shouldn't have strict on
-# use strict;
-
-#line 41
-
-sub new {
- my ($class, %args) = @_;
-
- foreach my $method ( qw(call load) ) {
- *{"$class\::$method"} = sub {
- shift()->_top->$method(@_);
- } unless defined &{"$class\::$method"};
- }
-
- bless( \%args, $class );
-}
-
-#line 61
-
-sub AUTOLOAD {
- my $self = shift;
- local $@;
- my $autoload = eval { $self->_top->autoload } or return;
- goto &$autoload;
-}
-
-#line 76
-
-sub _top { $_[0]->{_top} }
-
-#line 89
-
-sub admin {
- $_[0]->_top->{admin} or Module::Install::Base::FakeAdmin->new;
-}
-
-sub is_admin {
- $_[0]->admin->VERSION;
-}
-
-sub DESTROY {}
-
-package Module::Install::Base::FakeAdmin;
-
-my $Fake;
-sub new { $Fake ||= bless(\@_, $_[0]) }
-
-sub AUTOLOAD {}
-
-sub DESTROY {}
-
-# Restore warning handler
-BEGIN {
- $SIG{__WARN__} = $SIG{__WARN__}->();
-}
-
-1;
-
-#line 138
+++ /dev/null
-#line 1
-package Module::Install::Can;
-
-use strict;
-use Module::Install::Base;
-use Config ();
-### This adds a 5.005 Perl version dependency.
-### This is a bug and will be fixed.
-use File::Spec ();
-use ExtUtils::MakeMaker ();
-
-use vars qw{$VERSION $ISCORE @ISA};
-BEGIN {
- $VERSION = '0.65';
- $ISCORE = 1;
- @ISA = qw{Module::Install::Base};
-}
-
-# check if we can load some module
-### Upgrade this to not have to load the module if possible
-sub can_use {
- my ($self, $mod, $ver) = @_;
- $mod =~ s{::|\\}{/}g;
- $mod .= '.pm' unless $mod =~ /\.pm$/i;
-
- my $pkg = $mod;
- $pkg =~ s{/}{::}g;
- $pkg =~ s{\.pm$}{}i;
-
- local $@;
- eval { require $mod; $pkg->VERSION($ver || 0); 1 };
-}
-
-# check if we can run some command
-sub can_run {
- my ($self, $cmd) = @_;
-
- my $_cmd = $cmd;
- return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd));
-
- for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
- my $abs = File::Spec->catfile($dir, $_[1]);
- return $abs if (-x $abs or $abs = MM->maybe_command($abs));
- }
-
- return;
-}
-
-# can we locate a (the) C compiler
-sub can_cc {
- my $self = shift;
- my @chunks = split(/ /, $Config::Config{cc}) or return;
-
- # $Config{cc} may contain args; try to find out the program part
- while (@chunks) {
- return $self->can_run("@chunks") || (pop(@chunks), next);
- }
-
- return;
-}
-
-# Fix Cygwin bug on maybe_command();
-if ( $^O eq 'cygwin' ) {
- require ExtUtils::MM_Cygwin;
- require ExtUtils::MM_Win32;
- if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) {
- *ExtUtils::MM_Cygwin::maybe_command = sub {
- my ($self, $file) = @_;
- if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) {
- ExtUtils::MM_Win32->maybe_command($file);
- } else {
- ExtUtils::MM_Unix->maybe_command($file);
- }
- }
- }
-}
-
-1;
-
-__END__
-
-#line 157
+++ /dev/null
-#line 1
-package Module::Install::Fetch;
-
-use strict;
-use Module::Install::Base;
-
-use vars qw{$VERSION $ISCORE @ISA};
-BEGIN {
- $VERSION = '0.65';
- $ISCORE = 1;
- @ISA = qw{Module::Install::Base};
-}
-
-sub get_file {
- my ($self, %args) = @_;
- my ($scheme, $host, $path, $file) =
- $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
-
- if ( $scheme eq 'http' and ! eval { require LWP::Simple; 1 } ) {
- $args{url} = $args{ftp_url}
- or (warn("LWP support unavailable!\n"), return);
- ($scheme, $host, $path, $file) =
- $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
- }
-
- $|++;
- print "Fetching '$file' from $host... ";
-
- unless (eval { require Socket; Socket::inet_aton($host) }) {
- warn "'$host' resolve failed!\n";
- return;
- }
-
- return unless $scheme eq 'ftp' or $scheme eq 'http';
-
- require Cwd;
- my $dir = Cwd::getcwd();
- chdir $args{local_dir} or return if exists $args{local_dir};
-
- if (eval { require LWP::Simple; 1 }) {
- LWP::Simple::mirror($args{url}, $file);
- }
- elsif (eval { require Net::FTP; 1 }) { eval {
- # use Net::FTP to get past firewall
- my $ftp = Net::FTP->new($host, Passive => 1, Timeout => 600);
- $ftp->login("anonymous", 'anonymous@example.com');
- $ftp->cwd($path);
- $ftp->binary;
- $ftp->get($file) or (warn("$!\n"), return);
- $ftp->quit;
- } }
- elsif (my $ftp = $self->can_run('ftp')) { eval {
- # no Net::FTP, fallback to ftp.exe
- require FileHandle;
- my $fh = FileHandle->new;
-
- local $SIG{CHLD} = 'IGNORE';
- unless ($fh->open("|$ftp -n")) {
- warn "Couldn't open ftp: $!\n";
- chdir $dir; return;
- }
-
- my @dialog = split(/\n/, <<"END_FTP");
-open $host
-user anonymous anonymous\@example.com
-cd $path
-binary
-get $file $file
-quit
-END_FTP
- foreach (@dialog) { $fh->print("$_\n") }
- $fh->close;
- } }
- else {
- warn "No working 'ftp' program available!\n";
- chdir $dir; return;
- }
-
- unless (-f $file) {
- warn "Fetching failed: $@\n";
- chdir $dir; return;
- }
-
- return if exists $args{size} and -s $file != $args{size};
- system($args{run}) if exists $args{run};
- unlink($file) if $args{remove};
-
- print(((!exists $args{check_for} or -e $args{check_for})
- ? "done!" : "failed! ($!)"), "\n");
- chdir $dir; return !$?;
-}
-
-1;
+++ /dev/null
-#line 1
-package Module::Install::Include;
-
-use strict;
-use Module::Install::Base;
-
-use vars qw{$VERSION $ISCORE @ISA};
-BEGIN {
- $VERSION = '0.65';
- $ISCORE = 1;
- @ISA = qw{Module::Install::Base};
-}
-
-sub include {
- shift()->admin->include(@_);
-}
-
-sub include_deps {
- shift()->admin->include_deps(@_);
-}
-
-sub auto_include {
- shift()->admin->auto_include(@_);
-}
-
-sub auto_include_deps {
- shift()->admin->auto_include_deps(@_);
-}
-
-sub auto_include_dependent_dists {
- shift()->admin->auto_include_dependent_dists(@_);
-}
-
-1;
+++ /dev/null
-#line 1
-package Module::Install::Makefile;
-
-use strict 'vars';
-use Module::Install::Base;
-use ExtUtils::MakeMaker ();
-
-use vars qw{$VERSION $ISCORE @ISA};
-BEGIN {
- $VERSION = '0.65';
- $ISCORE = 1;
- @ISA = qw{Module::Install::Base};
-}
-
-sub Makefile { $_[0] }
-
-my %seen = ();
-
-sub prompt {
- shift;
-
- # Infinite loop protection
- my @c = caller();
- if ( ++$seen{"$c[1]|$c[2]|$_[0]"} > 3 ) {
- die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])";
- }
-
- # In automated testing, always use defaults
- if ( $ENV{AUTOMATED_TESTING} and ! $ENV{PERL_MM_USE_DEFAULT} ) {
- local $ENV{PERL_MM_USE_DEFAULT} = 1;
- goto &ExtUtils::MakeMaker::prompt;
- } else {
- goto &ExtUtils::MakeMaker::prompt;
- }
-}
-
-sub makemaker_args {
- my $self = shift;
- my $args = ($self->{makemaker_args} ||= {});
- %$args = ( %$args, @_ ) if @_;
- $args;
-}
-
-# For mm args that take multiple space-seperated args,
-# append an argument to the current list.
-sub makemaker_append {
- my $self = shift;
- my $name = shift;
- my $args = $self->makemaker_args;
- $args->{name} = defined $args->{$name}
- ? join( ' ', $args->{name}, @_ )
- : join( ' ', @_ );
-}
-
-sub build_subdirs {
- my $self = shift;
- my $subdirs = $self->makemaker_args->{DIR} ||= [];
- for my $subdir (@_) {
- push @$subdirs, $subdir;
- }
-}
-
-sub clean_files {
- my $self = shift;
- my $clean = $self->makemaker_args->{clean} ||= {};
- %$clean = (
- %$clean,
- FILES => join(' ', grep length, $clean->{FILES}, @_),
- );
-}
-
-sub realclean_files {
- my $self = shift;
- my $realclean = $self->makemaker_args->{realclean} ||= {};
- %$realclean = (
- %$realclean,
- FILES => join(' ', grep length, $realclean->{FILES}, @_),
- );
-}
-
-sub libs {
- my $self = shift;
- my $libs = ref $_[0] ? shift : [ shift ];
- $self->makemaker_args( LIBS => $libs );
-}
-
-sub inc {
- my $self = shift;
- $self->makemaker_args( INC => shift );
-}
-
-sub write {
- my $self = shift;
- die "&Makefile->write() takes no arguments\n" if @_;
-
- my $args = $self->makemaker_args;
- $args->{DISTNAME} = $self->name;
- $args->{NAME} = $self->module_name || $self->name || $self->determine_NAME($args);
- $args->{VERSION} = $self->version || $self->determine_VERSION($args);
- $args->{NAME} =~ s/-/::/g;
- if ( $self->tests ) {
- $args->{test} = { TESTS => $self->tests };
- }
- if ($] >= 5.005) {
- $args->{ABSTRACT} = $self->abstract;
- $args->{AUTHOR} = $self->author;
- }
- if ( eval($ExtUtils::MakeMaker::VERSION) >= 6.10 ) {
- $args->{NO_META} = 1;
- }
- if ( eval($ExtUtils::MakeMaker::VERSION) > 6.17 and $self->sign ) {
- $args->{SIGN} = 1;
- }
- unless ( $self->is_admin ) {
- delete $args->{SIGN};
- }
-
- # merge both kinds of requires into prereq_pm
- my $prereq = ($args->{PREREQ_PM} ||= {});
- %$prereq = ( %$prereq, map { @$_ } map { @$_ } grep $_,
- ($self->build_requires, $self->requires) );
-
- # merge both kinds of requires into prereq_pm
- my $subdirs = ($args->{DIR} ||= []);
- if ($self->bundles) {
- foreach my $bundle (@{ $self->bundles }) {
- my ($file, $dir) = @$bundle;
- push @$subdirs, $dir if -d $dir;
- delete $prereq->{$file};
- }
- }
-
- if ( my $perl_version = $self->perl_version ) {
- eval "use $perl_version; 1"
- or die "ERROR: perl: Version $] is installed, "
- . "but we need version >= $perl_version";
- }
-
- $args->{INSTALLDIRS} = $self->installdirs;
-
- my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args;
-
- my $user_preop = delete $args{dist}->{PREOP};
- if (my $preop = $self->admin->preop($user_preop)) {
- $args{dist} = $preop;
- }
-
- my $mm = ExtUtils::MakeMaker::WriteMakefile(%args);
- $self->fix_up_makefile($mm->{FIRST_MAKEFILE} || 'Makefile');
-}
-
-sub fix_up_makefile {
- my $self = shift;
- my $makefile_name = shift;
- my $top_class = ref($self->_top) || '';
- my $top_version = $self->_top->VERSION || '';
-
- my $preamble = $self->preamble
- ? "# Preamble by $top_class $top_version\n"
- . $self->preamble
- : '';
- my $postamble = "# Postamble by $top_class $top_version\n"
- . ($self->postamble || '');
-
- local *MAKEFILE;
- open MAKEFILE, "< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
- my $makefile = do { local $/; <MAKEFILE> };
- close MAKEFILE or die $!;
-
- $makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /;
- $makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g;
- $makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g;
- $makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m;
- $makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m;
-
- # Module::Install will never be used to build the Core Perl
- # Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks
- # PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist
- $makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m;
- #$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m;
-
- # Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well.
- $makefile =~ s/("?)-I\$\(PERL_LIB\)\1//g;
-
- # XXX - This is currently unused; not sure if it breaks other MM-users
- # $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg;
-
- open MAKEFILE, "> $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
- print MAKEFILE "$preamble$makefile$postamble" or die $!;
- close MAKEFILE or die $!;
-
- 1;
-}
-
-sub preamble {
- my ($self, $text) = @_;
- $self->{preamble} = $text . $self->{preamble} if defined $text;
- $self->{preamble};
-}
-
-sub postamble {
- my ($self, $text) = @_;
- $self->{postamble} ||= $self->admin->postamble;
- $self->{postamble} .= $text if defined $text;
- $self->{postamble}
-}
-
-1;
-
-__END__
-
-#line 338
+++ /dev/null
-#line 1
-package Module::Install::Makefile::Version;
-
-use Module::Install::Base;
-@ISA = qw(Module::Install::Base);
-
-$VERSION = '0.65';
-
-use strict;
-
-sub determine_VERSION {
- my $self = shift;
- my @modules = glob('*.pm');
-
- require File::Find;
- File::Find::find( sub {
- push @modules, $File::Find::name =~ /\.pm\z/i;
- }, 'lib' );
-
- if (@modules == 1) {
- eval {
- $self->version(
- ExtUtils::MM_Unix->parse_version($modules[0])
- );
- };
- print STDERR $@ if $@;
-
- } elsif ( my $file = "lib/" . $self->name . ".pm" ) {
- $file =~ s!-!/!g;
- $self->version(
- ExtUtils::MM_Unix->parse_version($file)
- ) if -f $file;
-
- }
-
- $self->version or die << "END_MESSAGE";
-Can't determine a VERSION for this distribution.
-Please call the 'version' or 'version_from' function in Makefile.PL.
-END_MESSAGE
-}
-
-1;
+++ /dev/null
-#line 1
-package Module::Install::Metadata;
-
-use strict 'vars';
-use Module::Install::Base;
-
-use vars qw{$VERSION $ISCORE @ISA};
-BEGIN {
- $VERSION = '0.65';
- $ISCORE = 1;
- @ISA = qw{Module::Install::Base};
-}
-
-my @scalar_keys = qw{
- name module_name abstract author version license
- distribution_type perl_version tests installdirs
-};
-
-my @tuple_keys = qw{
- build_requires requires recommends bundles
-};
-
-sub Meta { shift }
-sub Meta_ScalarKeys { @scalar_keys }
-sub Meta_TupleKeys { @tuple_keys }
-
-foreach my $key (@scalar_keys) {
- *$key = sub {
- my $self = shift;
- return $self->{values}{$key} if defined wantarray and !@_;
- $self->{values}{$key} = shift;
- return $self;
- };
-}
-
-foreach my $key (@tuple_keys) {
- *$key = sub {
- my $self = shift;
- return $self->{values}{$key} unless @_;
-
- my @rv;
- while (@_) {
- my $module = shift or last;
- my $version = shift || 0;
- if ( $module eq 'perl' ) {
- $version =~ s{^(\d+)\.(\d+)\.(\d+)}
- {$1 + $2/1_000 + $3/1_000_000}e;
- $self->perl_version($version);
- next;
- }
- my $rv = [ $module, $version ];
- push @rv, $rv;
- }
- push @{ $self->{values}{$key} }, @rv;
- @rv;
- };
-}
-
-sub install_as_core { $_[0]->installdirs('perl') }
-sub install_as_cpan { $_[0]->installdirs('site') }
-sub install_as_site { $_[0]->installdirs('site') }
-sub install_as_vendor { $_[0]->installdirs('vendor') }
-
-sub sign {
- my $self = shift;
- return $self->{'values'}{'sign'} if defined wantarray and !@_;
- $self->{'values'}{'sign'} = ( @_ ? $_[0] : 1 );
- return $self;
-}
-
-sub dynamic_config {
- my $self = shift;
- unless ( @_ ) {
- warn "You MUST provide an explicit true/false value to dynamic_config, skipping\n";
- return $self;
- }
- $self->{'values'}{'dynamic_config'} = $_[0] ? 1 : 0;
- return $self;
-}
-
-sub all_from {
- my ( $self, $file ) = @_;
-
- unless ( defined($file) ) {
- my $name = $self->name
- or die "all_from called with no args without setting name() first";
- $file = join('/', 'lib', split(/-/, $name)) . '.pm';
- $file =~ s{.*/}{} unless -e $file;
- die "all_from: cannot find $file from $name" unless -e $file;
- }
-
- $self->version_from($file) unless $self->version;
- $self->perl_version_from($file) unless $self->perl_version;
-
- # The remaining probes read from POD sections; if the file
- # has an accompanying .pod, use that instead
- my $pod = $file;
- if ( $pod =~ s/\.pm$/.pod/i and -e $pod ) {
- $file = $pod;
- }
-
- $self->author_from($file) unless $self->author;
- $self->license_from($file) unless $self->license;
- $self->abstract_from($file) unless $self->abstract;
-}
-
-sub provides {
- my $self = shift;
- my $provides = ( $self->{values}{provides} ||= {} );
- %$provides = (%$provides, @_) if @_;
- return $provides;
-}
-
-sub auto_provides {
- my $self = shift;
- return $self unless $self->is_admin;
-
- unless (-e 'MANIFEST') {
- warn "Cannot deduce auto_provides without a MANIFEST, skipping\n";
- return $self;
- }
-
- # Avoid spurious warnings as we are not checking manifest here.
-
- local $SIG{__WARN__} = sub {1};
- require ExtUtils::Manifest;
- local *ExtUtils::Manifest::manicheck = sub { return };
-
- require Module::Build;
- my $build = Module::Build->new(
- dist_name => $self->name,
- dist_version => $self->version,
- license => $self->license,
- );
- $self->provides(%{ $build->find_dist_packages || {} });
-}
-
-sub feature {
- my $self = shift;
- my $name = shift;
- my $features = ( $self->{values}{features} ||= [] );
-
- my $mods;
-
- if ( @_ == 1 and ref( $_[0] ) ) {
- # The user used ->feature like ->features by passing in the second
- # argument as a reference. Accomodate for that.
- $mods = $_[0];
- } else {
- $mods = \@_;
- }
-
- my $count = 0;
- push @$features, (
- $name => [
- map {
- ref($_) ? ( ref($_) eq 'HASH' ) ? %$_
- : @$_
- : $_
- } @$mods
- ]
- );
-
- return @$features;
-}
-
-sub features {
- my $self = shift;
- while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) {
- $self->feature( $name, @$mods );
- }
- return $self->{values}->{features}
- ? @{ $self->{values}->{features} }
- : ();
-}
-
-sub no_index {
- my $self = shift;
- my $type = shift;
- push @{ $self->{values}{no_index}{$type} }, @_ if $type;
- return $self->{values}{no_index};
-}
-
-sub read {
- my $self = shift;
- $self->include_deps( 'YAML', 0 );
-
- require YAML;
- my $data = YAML::LoadFile('META.yml');
-
- # Call methods explicitly in case user has already set some values.
- while ( my ( $key, $value ) = each %$data ) {
- next unless $self->can($key);
- if ( ref $value eq 'HASH' ) {
- while ( my ( $module, $version ) = each %$value ) {
- $self->can($key)->($self, $module => $version );
- }
- }
- else {
- $self->can($key)->($self, $value);
- }
- }
- return $self;
-}
-
-sub write {
- my $self = shift;
- return $self unless $self->is_admin;
- $self->admin->write_meta;
- return $self;
-}
-
-sub version_from {
- my ( $self, $file ) = @_;
- require ExtUtils::MM_Unix;
- $self->version( ExtUtils::MM_Unix->parse_version($file) );
-}
-
-sub abstract_from {
- my ( $self, $file ) = @_;
- require ExtUtils::MM_Unix;
- $self->abstract(
- bless(
- { DISTNAME => $self->name },
- 'ExtUtils::MM_Unix'
- )->parse_abstract($file)
- );
-}
-
-sub _slurp {
- my ( $self, $file ) = @_;
-
- local *FH;
- open FH, "< $file" or die "Cannot open $file.pod: $!";
- do { local $/; <FH> };
-}
-
-sub perl_version_from {
- my ( $self, $file ) = @_;
-
- if (
- $self->_slurp($file) =~ m/
- ^
- use \s*
- v?
- ([\d_\.]+)
- \s* ;
- /ixms
- )
- {
- my $v = $1;
- $v =~ s{_}{}g;
- $self->perl_version($1);
- }
- else {
- warn "Cannot determine perl version info from $file\n";
- return;
- }
-}
-
-sub author_from {
- my ( $self, $file ) = @_;
- my $content = $self->_slurp($file);
- if ($content =~ m/
- =head \d \s+ (?:authors?)\b \s*
- ([^\n]*)
- |
- =head \d \s+ (?:licen[cs]e|licensing|copyright|legal)\b \s*
- .*? copyright .*? \d\d\d[\d.]+ \s* (?:\bby\b)? \s*
- ([^\n]*)
- /ixms) {
- my $author = $1 || $2;
- $author =~ s{E<lt>}{<}g;
- $author =~ s{E<gt>}{>}g;
- $self->author($author);
- }
- else {
- warn "Cannot determine author info from $file\n";
- }
-}
-
-sub license_from {
- my ( $self, $file ) = @_;
-
- if (
- $self->_slurp($file) =~ m/
- (
- =head \d \s+
- (?:licen[cs]e|licensing|copyright|legal)\b
- .*?
- )
- (=head\\d.*|=cut.*|)
- \z
- /ixms
- )
- {
- my $license_text = $1;
- my @phrases = (
- 'under the same (?:terms|license) as perl itself' => 'perl',
- 'GNU public license' => 'gpl',
- 'GNU lesser public license' => 'gpl',
- 'BSD license' => 'bsd',
- 'Artistic license' => 'artistic',
- 'GPL' => 'gpl',
- 'LGPL' => 'lgpl',
- 'BSD' => 'bsd',
- 'Artistic' => 'artistic',
- 'MIT' => 'MIT',
- );
- while ( my ( $pattern, $license ) = splice( @phrases, 0, 2 ) ) {
- $pattern =~ s{\s+}{\\s+}g;
- if ( $license_text =~ /\b$pattern\b/i ) {
- $self->license($license);
- return 1;
- }
- }
- }
-
- warn "Cannot determine license info from $file\n";
- return 'unknown';
-}
-
-1;
+++ /dev/null
-#line 1
-package Module::Install::Win32;
-
-use strict;
-use Module::Install::Base;
-
-use vars qw{$VERSION $ISCORE @ISA};
-BEGIN {
- $VERSION = '0.65';
- $ISCORE = 1;
- @ISA = qw{Module::Install::Base};
-}
-
-# determine if the user needs nmake, and download it if needed
-sub check_nmake {
- my $self = shift;
- $self->load('can_run');
- $self->load('get_file');
-
- require Config;
- return unless (
- $^O eq 'MSWin32' and
- $Config::Config{make} and
- $Config::Config{make} =~ /^nmake\b/i and
- ! $self->can_run('nmake')
- );
-
- print "The required 'nmake' executable not found, fetching it...\n";
-
- require File::Basename;
- my $rv = $self->get_file(
- url => 'http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe',
- ftp_url => 'ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe',
- local_dir => File::Basename::dirname($^X),
- size => 51928,
- run => 'Nmake15.exe /o > nul',
- check_for => 'Nmake.exe',
- remove => 1,
- );
-
- if (!$rv) {
- die <<'END_MESSAGE';
-
--------------------------------------------------------------------------------
-
-Since you are using Microsoft Windows, you will need the 'nmake' utility
-before installation. It's available at:
-
- http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe
- or
- ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe
-
-Please download the file manually, save it to a directory in %PATH% (e.g.
-C:\WINDOWS\COMMAND\), then launch the MS-DOS command line shell, "cd" to
-that directory, and run "Nmake15.exe" from there; that will create the
-'nmake.exe' file needed by this module.
-
-You may then resume the installation process described in README.
-
--------------------------------------------------------------------------------
-END_MESSAGE
- }
-}
-
-1;
+++ /dev/null
-#line 1
-package Module::Install::WriteAll;
-
-use strict;
-use Module::Install::Base;
-
-use vars qw{$VERSION $ISCORE @ISA};
-BEGIN {
- $VERSION = '0.65';
- $ISCORE = 1;
- @ISA = qw{Module::Install::Base};
-}
-
-sub WriteAll {
- my $self = shift;
- my %args = (
- meta => 1,
- sign => 0,
- inline => 0,
- check_nmake => 1,
- @_
- );
-
- $self->sign(1) if $args{sign};
- $self->Meta->write if $args{meta};
- $self->admin->WriteAll(%args) if $self->is_admin;
-
- if ( $0 =~ /Build.PL$/i ) {
- $self->Build->write;
- } else {
- $self->check_nmake if $args{check_nmake};
- unless ( $self->makemaker_args->{'PL_FILES'} ) {
- $self->makemaker_args( PL_FILES => {} );
- }
- if ($args{inline}) {
- $self->Inline->write;
- } else {
- $self->Makefile->write;
- }
- }
-}
-
-1;
+++ /dev/null
-diff --git a/embed.fnc b/embed.fnc
-index fec5643..643c652 100644
---- a/embed.fnc
-+++ b/embed.fnc
-@@ -694,7 +694,15 @@ Ap |I32 |regexec_flags |NN REGEXP * const rx|NN char* stringarg \
- |NN SV* screamer|NULLOK void* data|U32 flags
- ApR |regnode*|regnext |NN regnode* p
-
--EXp |SV*|reg_named_buff_fetch |NN REGEXP * const rx|NN SV * const key|const U32 flags
-+EXp |SV*|reg_named_buff_fetch |NN REGEXP * const rx|NN SV * const namesv|const U32 flags
-+EXp |void|reg_named_buff_store |NN REGEXP * const rx|NN SV * const key \
-+ |NN SV * const value|const U32 flags
-+EXp |void|reg_named_buff_delete |NN REGEXP * const rx|NN SV * const key|const U32 flags
-+EXp |void|reg_named_buff_clear |NN REGEXP * const rx|const U32 flags
-+EXp |bool|reg_named_buff_exists |NN REGEXP * const rx|NN SV * const key|const U32 flags
-+EXp |SV*|reg_named_buff_firstkey |NN REGEXP * const rx|const U32 flags
-+EXp |SV*|reg_named_buff_nextkey |NN REGEXP * const rx|NN SV * const lastkey|const U32 flags
-+EXp |SV*|reg_named_buff_scalar |NN REGEXP * const rx|const U32 flags
-
- EXp |void|reg_numbered_buff_fetch|NN REGEXP * const rx|const I32 paren|NULLOK SV * const sv
- EXp |void|reg_numbered_buff_store|NN REGEXP * const rx|const I32 paren|NULLOK SV const * const value
-diff --git a/embed.h b/embed.h
-index 8e0ecba..aa0aa72 100644
---- a/embed.h
-+++ b/embed.h
-@@ -705,6 +705,13 @@
- #define regnext Perl_regnext
- #if defined(PERL_CORE) || defined(PERL_EXT)
- #define reg_named_buff_fetch Perl_reg_named_buff_fetch
-+#define reg_named_buff_store Perl_reg_named_buff_store
-+#define reg_named_buff_delete Perl_reg_named_buff_delete
-+#define reg_named_buff_clear Perl_reg_named_buff_clear
-+#define reg_named_buff_exists Perl_reg_named_buff_exists
-+#define reg_named_buff_firstkey Perl_reg_named_buff_firstkey
-+#define reg_named_buff_nextkey Perl_reg_named_buff_nextkey
-+#define reg_named_buff_scalar Perl_reg_named_buff_scalar
- #endif
- #if defined(PERL_CORE) || defined(PERL_EXT)
- #define reg_numbered_buff_fetch Perl_reg_numbered_buff_fetch
-@@ -2981,6 +2988,13 @@
- #define regnext(a) Perl_regnext(aTHX_ a)
- #if defined(PERL_CORE) || defined(PERL_EXT)
- #define reg_named_buff_fetch(a,b,c) Perl_reg_named_buff_fetch(aTHX_ a,b,c)
-+#define reg_named_buff_store(a,b,c,d) Perl_reg_named_buff_store(aTHX_ a,b,c,d)
-+#define reg_named_buff_delete(a,b,c) Perl_reg_named_buff_delete(aTHX_ a,b,c)
-+#define reg_named_buff_clear(a,b) Perl_reg_named_buff_clear(aTHX_ a,b)
-+#define reg_named_buff_exists(a,b,c) Perl_reg_named_buff_exists(aTHX_ a,b,c)
-+#define reg_named_buff_firstkey(a,b) Perl_reg_named_buff_firstkey(aTHX_ a,b)
-+#define reg_named_buff_nextkey(a,b,c) Perl_reg_named_buff_nextkey(aTHX_ a,b,c)
-+#define reg_named_buff_scalar(a,b) Perl_reg_named_buff_scalar(aTHX_ a,b)
- #endif
- #if defined(PERL_CORE) || defined(PERL_EXT)
- #define reg_numbered_buff_fetch(a,b,c) Perl_reg_numbered_buff_fetch(aTHX_ a,b,c)
-diff --git a/ext/re/re.xs b/ext/re/re.xs
-index 1344065..fe59940 100644
---- a/ext/re/re.xs
-+++ b/ext/re/re.xs
-@@ -30,8 +30,22 @@ extern void my_reg_numbered_buff_store(pTHX_ REGEXP * const rx, const I32 paren,
- extern I32 my_reg_numbered_buff_length(pTHX_ REGEXP * const rx,
- const SV * const sv, const I32 paren);
-
--extern SV* my_reg_named_buff_fetch(pTHX_ REGEXP * const rx, SV * const key,
-- const U32 flags);
-+extern SV* my_reg_named_buff_fetch(pTHX_ REGEXP * const, SV * const,
-+ const U32);
-+extern void my_reg_named_buff_store(pTHX_ REGEXP * const rx,
-+ SV * const key, SV * const value,
-+ const U32 flags);
-+extern void my_reg_named_buff_delete(pTHX_ REGEXP * const rx,
-+ SV * const key, const U32 flags);
-+extern void my_reg_named_buff_clear(pTHX_ REGEXP * const rx, const U32 flags);
-+extern bool my_reg_named_buff_exists(pTHX_ REGEXP * const rx,
-+ SV * const key, const U32 flags);
-+extern SV* my_reg_named_buff_firstkey(pTHX_ REGEXP * const rx,
-+ const U32 flags);
-+extern SV* my_reg_named_buff_nextkey(pTHX_ REGEXP * const rx,
-+ SV * const lastkey, const U32 flags);
-+extern SV* my_reg_named_buff_scalar(pTHX_ REGEXP * const rx,
-+ const U32 flags);
-
- extern SV* my_reg_qr_package(pTHX_ REGEXP * const rx);
- #if defined(USE_ITHREADS)
-@@ -52,6 +66,13 @@ const struct regexp_engine my_reg_engine = {
- my_reg_numbered_buff_store,
- my_reg_numbered_buff_length,
- my_reg_named_buff_fetch,
-+ my_reg_named_buff_store,
-+ my_reg_named_buff_delete,
-+ my_reg_named_buff_clear,
-+ my_reg_named_buff_exists,
-+ my_reg_named_buff_firstkey,
-+ my_reg_named_buff_nextkey,
-+ my_reg_named_buff_scalar,
- my_reg_qr_package,
- #if defined(USE_ITHREADS)
- my_regdupe
-diff --git a/ext/re/re_top.h b/ext/re/re_top.h
-index 5570ed7..23ee654 100644
---- a/ext/re/re_top.h
-+++ b/ext/re/re_top.h
-@@ -20,6 +20,13 @@
- #define Perl_reg_numbered_buff_store my_reg_numbered_buff_store
- #define Perl_reg_numbered_buff_length my_reg_numbered_buff_length
- #define Perl_reg_named_buff_fetch my_reg_named_buff_fetch
-+#define Perl_reg_named_buff_store my_reg_named_buff_store
-+#define Perl_reg_named_buff_delete my_reg_named_buff_delete
-+#define Perl_reg_named_buff_clear my_reg_named_buff_clear
-+#define Perl_reg_named_buff_exists my_reg_named_buff_exists
-+#define Perl_reg_named_buff_firstkey my_reg_named_buff_firstkey
-+#define Perl_reg_named_buff_nextkey my_reg_named_buff_nextkey
-+#define Perl_reg_named_buff_scalar my_reg_named_buff_scalar
- #define Perl_reg_qr_package my_reg_qr_package
-
- #define PERL_NO_GET_CONTEXT
-diff --git a/ext/re/t/re_funcs.t b/ext/re/t/re_funcs.t
-index 0d9092a..fa3e11b 100644
---- a/ext/re/t/re_funcs.t
-+++ b/ext/re/t/re_funcs.t
-@@ -40,23 +40,17 @@ use re qw(is_regexp regexp_pattern regmust
- is($floating,undef,"Regmust anchored - ref");
- }
-
--
- if ('1234'=~/(?:(?<A>\d)|(?<C>!))(?<B>\d)(?<A>\d)(?<B>\d)/){
- my @names = sort +regnames();
- is("@names","A B","regnames");
-+ my @names = sort +regnames(0);
-+ is("@names","A B","regnames");
- @names = sort +regnames(1);
- is("@names","A B C","regnames");
- is(join("", @{regname("A",1)}),"13");
- is(join("", @{regname("B",1)}),"24");
- {
- if ('foobar'=~/(?<foo>foo)(?<bar>bar)/) {
-- regnames_iterinit();
-- my @res;
-- while (defined(my $key=regnames_iternext)) {
-- push @res,$key;
-- }
-- @res=sort @res;
-- is("@res","bar foo");
- is(regnames_count(),2);
- } else {
- ok(0); ok(0);
-diff --git a/global.sym b/global.sym
-index c5181b4..0714bff 100644
---- a/global.sym
-+++ b/global.sym
-@@ -406,6 +406,13 @@ Perl_re_intuit_string
- Perl_regexec_flags
- Perl_regnext
- Perl_reg_named_buff_fetch
-+Perl_reg_named_buff_store
-+Perl_reg_named_buff_delete
-+Perl_reg_named_buff_clear
-+Perl_reg_named_buff_exists
-+Perl_reg_named_buff_firstkey
-+Perl_reg_named_buff_nextkey
-+Perl_reg_named_buff_scalar
- Perl_reg_numbered_buff_fetch
- Perl_reg_numbered_buff_store
- Perl_reg_numbered_buff_length
-diff --git a/gv.c b/gv.c
-index 17f754f..8f98f00 100644
---- a/gv.c
-+++ b/gv.c
-@@ -1014,7 +1014,7 @@ Perl_gv_fetchpvn_flags(pTHX_ const char *nambeg, STRLEN full_len, I32 flags,
- if (*name == '!')
- require_tie_mod(gv, "!", newSVpvs("Errno"), "TIEHASH", 1);
- else if (*name == '-' || *name == '+')
-- require_tie_mod(gv, name, newSVpvs("Tie::Hash::NamedCapture"), "FETCH", 0);
-+ require_tie_mod(gv, name, newSVpvs("Tie::Hash::NamedCapture"), "TIEHASH", 0);
- }
- }
- return gv;
-@@ -1224,7 +1224,7 @@ Perl_gv_fetchpvn_flags(pTHX_ const char *nambeg, STRLEN full_len, I32 flags,
- SvREADONLY_on(av);
-
- if (sv_type == SVt_PVHV || sv_type == SVt_PVGV)
-- require_tie_mod(gv, name, newSVpvs("Tie::Hash::NamedCapture"), "FETCH", 0);
-+ require_tie_mod(gv, name, newSVpvs("Tie::Hash::NamedCapture"), "TIEHASH", 0);
-
- break;
- }
-diff --git a/lib/Tie/Hash/NamedCapture.pm b/lib/Tie/Hash/NamedCapture.pm
-index 73bc20b..66cf1b5 100644
---- a/lib/Tie/Hash/NamedCapture.pm
-+++ b/lib/Tie/Hash/NamedCapture.pm
-@@ -1,52 +1,19 @@
- package Tie::Hash::NamedCapture;
-
--use strict;
--use warnings;
-+our $VERSION = "0.06";
-
--our $VERSION = "0.05";
-+# The real meat implemented in XS in universal.c in the core, but this
-+# method was left behind because gv.c expects a Purl-Perl method in
-+# this package when it loads the tie magic for %+ and %-
-
--sub TIEHASH {
-- my $classname = shift;
-- my %opts = @_;
--
-- my $self = bless { all => $opts{all} }, $classname;
-- return $self;
--}
--
--sub FETCH {
-- return re::regname($_[1],$_[0]->{all});
--}
--
--sub STORE {
-- require Carp;
-- Carp::croak("STORE forbidden: hashes tied to ",__PACKAGE__," are read-only.");
--}
--
--sub FIRSTKEY {
-- re::regnames_iterinit();
-- return $_[0]->NEXTKEY;
--}
-+# These should match the #defines in regexp.h
-+sub RXf_HASH_ONE () { 0x00000001 } # %+
-+sub RXf_HASH_ALL () { 0x00000002 } # %-
-
--sub NEXTKEY {
-- return re::regnames_iternext($_[0]->{all});
--}
--
--sub EXISTS {
-- return defined re::regname( $_[1], $_[0]->{all});
--}
--
--sub DELETE {
-- require Carp;
-- Carp::croak("DELETE forbidden: hashes tied to ",__PACKAGE__," are read-only");
--}
--
--sub CLEAR {
-- require Carp;
-- Carp::croak("CLEAR forbidden: hashes tied to ",__PACKAGE__," are read-only");
--}
--
--sub SCALAR {
-- return scalar re::regnames($_[0]->{all});
-+sub TIEHASH {
-+ my ($pkg, %arg) = @_;
-+ my $flag = $arg{all} ? RXf_HASH_ALL : RXf_HASH_ONE;
-+ bless \$flag => $pkg;
- }
-
- tie %+, __PACKAGE__;
-@@ -91,6 +58,7 @@ buffers that have captured (and that are thus associated to defined values).
-
- =head1 SEE ALSO
-
--L<re>, L<perlmodlib/Pragmatic Modules>, L<perlvar/"%+">, L<perlvar/"%-">.
-+L<perlreapi>, L<re>, L<perlmodlib/Pragmatic Modules>, L<perlvar/"%+">,
-+L<perlvar/"%-">.
-
- =cut
-diff --git a/mg.c b/mg.c
-index 77ae021..bc08d4a 100644
---- a/mg.c
-+++ b/mg.c
-@@ -603,15 +603,15 @@ Perl_magic_len(pTHX_ SV *sv, MAGIC *mg)
- }
- case '`':
- do_prematch:
-- paren = -2;
-+ paren = RXrf_PREMATCH;
- goto maybegetparen;
- case '\'':
- do_postmatch:
-- paren = -1;
-+ paren = RXrf_POSTMATCH;
- goto maybegetparen;
- case '&':
- do_match:
-- paren = 0;
-+ paren = RXrf_MATCH;
- goto maybegetparen;
- case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9':
-@@ -2235,15 +2235,15 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg)
- goto do_match;
- case '`': /* ${^PREMATCH} caught below */
- do_prematch:
-- paren = -2;
-+ paren = RXrf_PREMATCH;
- goto setparen;
- case '\'': /* ${^POSTMATCH} caught below */
- do_postmatch:
-- paren = -1;
-+ paren = RXrf_POSTMATCH;
- goto setparen;
- case '&':
- do_match:
-- paren = 0;
-+ paren = RXrf_MATCH;
- goto setparen;
- case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9':
-diff --git a/perl.h b/perl.h
-index 8cd8753..0a4aebf 100644
---- a/perl.h
-+++ b/perl.h
-@@ -231,6 +231,27 @@
- #define CALLREG_NAMEDBUF_FETCH(rx,name,flags) \
- CALL_FPTR((rx)->engine->named_buff_FETCH)(aTHX_ (rx),(name),(flags))
-
-+#define CALLREG_NAMEDBUF_STORE(rx,key,value,flags) \
-+ CALL_FPTR((rx)->engine->named_buff_STORE)(aTHX_ (rx),(key),(value),(flags))
-+
-+#define CALLREG_NAMEDBUF_DELETE(rx,key,flags) \
-+ CALL_FPTR((rx)->engine->named_buff_DELETE)(aTHX_ (rx),(key),(flags))
-+
-+#define CALLREG_NAMEDBUF_CLEAR(rx,flags) \
-+ CALL_FPTR((rx)->engine->named_buff_CLEAR)(aTHX_ (rx),(flags))
-+
-+#define CALLREG_NAMEDBUF_EXISTS(rx,key,flags) \
-+ CALL_FPTR((rx)->engine->named_buff_EXISTS)(aTHX_ (rx),(key),(flags))
-+
-+#define CALLREG_NAMEDBUF_FIRSTKEY(rx,flags) \
-+ CALL_FPTR((rx)->engine->named_buff_FIRSTKEY)(aTHX_ (rx),(flags))
-+
-+#define CALLREG_NAMEDBUF_NEXTKEY(rx,lastkey,flags) \
-+ CALL_FPTR((rx)->engine->named_buff_NEXTKEY)(aTHX_ (rx),(lastkey),(flags))
-+
-+#define CALLREG_NAMEDBUF_SCALAR(rx,flags) \
-+ CALL_FPTR((rx)->engine->named_buff_SCALAR)(aTHX_ (rx),(flags))
-+
- #define CALLREG_PACKAGE(rx) \
- CALL_FPTR((rx)->engine->qr_package)(aTHX_ (rx))
-
-diff --git a/pod/perlreapi.pod b/pod/perlreapi.pod
-index 1a170ff..08ae8cd 100644
---- a/pod/perlreapi.pod
-+++ b/pod/perlreapi.pod
-@@ -26,6 +26,18 @@ structure of the following format:
- const I32 paren);
- SV* (*named_buff_FETCH) (pTHX_ REGEXP * const rx, SV * const sv,
- const U32 flags);
-+ void (*named_buff_STORE) (pTHX_ REGEXP * const rx, SV * const key,
-+ SV * const value, const U32 flags);
-+ void (*named_buff_DELETE) (pTHX_ REGEXP * const rx,
-+ SV * const key, const U32 flags);
-+ void (*named_buff_CLEAR) (pTHX_ REGEXP * const rx, const U32 flags);
-+ bool (*named_buff_EXISTS) (pTHX_ REGEXP * const rx,
-+ SV * const key, const U32 flags);
-+ SV* (*named_buff_FIRSTKEY) (pTHX_ REGEXP * const rx, const U32 flags);
-+ SV* (*named_buff_NEXTKEY) (pTHX_ REGEXP * const rx,
-+ SV * const lastkey, const U32 flags);
-+ SV* (*named_buff_SCALAR) (pTHX_ REGEXP * const rx,
-+ const U32 flags);
- SV* (*qr_package)(pTHX_ REGEXP * const rx);
- #ifdef USE_ITHREADS
- void* (*dupe) (pTHX_ REGEXP * const rx, CLONE_PARAMS *param);
-@@ -186,38 +198,45 @@ can release any resources pointed to by the C<pprivate> member of the
- regexp structure. This is only responsible for freeing private data;
- perl will handle releasing anything else contained in the regexp structure.
-
--=head2 numbered_buff_FETCH
-+=head2 Numbered capture callbacks
-
-- void numbered_buff_FETCH(pTHX_ REGEXP * const rx, const I32 paren,
-- SV * const sv);
--
--Called to get the value of C<$`>, C<$'>, C<$&> (and their named
--equivalents, see L<perlvar>) and the numbered capture buffers (C<$1>,
--C<$2>, ...).
-+Called to get/set the value of C<$`>, C<$'>, C<$&> and their named
-+equivalents, ${^PREMATCH}, ${^POSTMATCH} and $^{MATCH}, as well as the
-+numbered capture buffers (C<$1>, C<$2>, ...).
-
- The C<paren> paramater will be C<-2> for C<$`>, C<-1> for C<$'>, C<0>
- for C<$&>, C<1> for C<$1> and so forth.
-
--C<sv> should be set to the scalar to return, the scalar is passed as
--an argument rather than being returned from the function because when
--it's called perl already has a scalar to store the value, creating
--another one would be redundant. The scalar can be set with
--C<sv_setsv>, C<sv_setpvn> and friends, see L<perlapi>.
-+The names have been chosen by analogy with L<Tie::Scalar> methods
-+names with an additional B<LENGTH> callback for efficiency. However
-+named capture variables are currently not tied internally but
-+implemented via magic.
-+
-+=head3 numbered_buff_FETCH
-+
-+ void numbered_buff_FETCH(pTHX_ REGEXP * const rx, const I32 paren,
-+ SV * const sv);
-+
-+Fetch a specified numbered capture. C<sv> should be set to the scalar
-+to return, the scalar is passed as an argument rather than being
-+returned from the function because when it's called perl already has a
-+scalar to store the value, creating another one would be
-+redundant. The scalar can be set with C<sv_setsv>, C<sv_setpvn> and
-+friends, see L<perlapi>.
-
- This callback is where perl untaints its own capture variables under
- taint mode (see L<perlsec>). See the C<Perl_reg_numbered_buff_get>
- function in F<regcomp.c> for how to untaint capture variables if
- that's something you'd like your engine to do as well.
-
--=head2 numbered_buff_STORE
-+=head3 numbered_buff_STORE
-
- void (*numbered_buff_STORE) (pTHX_ REGEXP * const rx, const I32 paren,
- SV const * const value);
-
--Called to set the value of a numbered capture variable. C<paren> is
--the paren number (see the L<mapping|/numbered_buff_FETCH> above) and
--C<value> is the scalar that is to be used as the new value. It's up to
--the engine to make sure this is used as the new value (or reject it).
-+Set the value of a numbered capture variable. C<value> is the scalar
-+that is to be used as the new value. It's up to the engine to make
-+sure this is used as the new value (or reject it).
-
- Example:
-
-@@ -262,19 +281,19 @@ behave in the same situation:
-
- Because C<$sv> is C<undef> when the C<y///> operator is applied to it
- the transliteration won't actually execute and the program won't
--C<die>. This is different to how 5.8 behaved since the capture
--variables were READONLY variables then, now they'll just die on
--assignment in the default engine.
-+C<die>. This is different to how 5.8 and earlier versions behaved
-+since the capture variables were READONLY variables then, now they'll
-+just die when assigned to in the default engine.
-
--=head2 numbered_buff_LENGTH
-+=head3 numbered_buff_LENGTH
-
- I32 numbered_buff_LENGTH (pTHX_ REGEXP * const rx, const SV * const sv,
- const I32 paren);
-
- Get the C<length> of a capture variable. There's a special callback
- for this so that perl doesn't have to do a FETCH and run C<length> on
--the result, since the length is (in perl's case) known from a memory
--offset this is much more efficient:
-+the result, since the length is (in perl's case) known from an offset
-+stored in C<<rx->offs> this is much more efficient:
-
- I32 s1 = rx->offs[paren].start;
- I32 s2 = rx->offs[paren].end;
-@@ -284,14 +303,79 @@ This is a little bit more complex in the case of UTF-8, see what
- C<Perl_reg_numbered_buff_length> does with
- L<is_utf8_string_loclen|perlapi/is_utf8_string_loclen>.
-
--=head2 named_buff_FETCH
-+=head2 Named capture callbacks
-+
-+Called to get/set the value of C<%+> and C<%->. If C<%+> is being
-+operated on C<flags & RXf_HASH_ONE> will be true and C<flags &
-+RXf_HASH_ALL> will be true for C<%->. There's also an additional flag
-+for the L<SCALAR|/named_buff_SCALAR> callback, see below.
-+
-+This is implemented with a real tied interface via
-+L<Tie::Hash::NamedCapture>, its methods call back into these
-+functions, the usage of L<Tie::Hash::NamedCapture> for this purpose
-+might change in future releases. For instance this might be
-+implemented by magic instead (would need an extension to mgvtbl).
-+
-+Since these functions are just C level wrappers for the interface
-+described in L<Tie::Hash> their arguments and return values are as
-+described there, only with C prototypes.
-+
-+=head3 named_buff_FETCH
-
- SV* named_buff_FETCH(pTHX_ REGEXP * const rx, SV * const key,
- const U32 flags);
-
--Called to get the value of key in the C<%+> and C<%-> hashes, C<key>
--is the hash key being requested and if C<flags & 1> is true C<%-> is
--being requested (and C<%+> if it's not).
-+Get an entry.
-+
-+=head3 named_buff_STORE
-+
-+ void named_buff_STORE (pTHX_ REGEXP * const rx, SV * const key,
-+ SV * const value, const U32 flags);
-+
-+Store a value.
-+
-+=head3 named_buff_DELETE
-+
-+ void named_buff_DELETE (pTHX_ REGEXP * const rx,
-+ SV * const key, const U32 flags);
-+
-+Delete an entry.
-+
-+=head3 named_buff_CLEAR
-+
-+ void named_buff_CLEAR (pTHX_ REGEXP * const rx, const U32 flags);
-+
-+Clear the hash.
-+
-+=head3 named_buff_EXISTS
-+
-+ bool named_buff_EXISTS (pTHX_ REGEXP * const rx,
-+ SV * const key, const U32 flags);
-+
-+Check whether an entry C<exists>.
-+
-+=head3 named_buff_FIRSTKEY
-+
-+ SV* (*named_buff_FIRSTKEY) (pTHX_ REGEXP * const rx, const U32 flags);
-+
-+Begin iterating the hash.
-+
-+=head3 named_buff_NEXTKEY
-+
-+ SV* named_buff_NEXTKEY (pTHX_ REGEXP * const rx,
-+ SV * const lastkey, const U32 flags);
-+
-+Get the next entry in the hash.
-+
-+=head3 named_buff_SCALAR
-+
-+ SV* named_buff_SCALAR (pTHX_ REGEXP * const rx, const U32 flags);
-+
-+Return what the hash evaluates to in C<scalar> context.
-+
-+This will also be called by L<re::regnames_count|re> to get the total
-+number of named capture buffers defined for the pattern, in this case
-+C<flags & RXf_HASH_COUNT> will be true.
-
- =head2 qr_package
-
-@@ -333,7 +417,7 @@ following snippet:
- SvTYPE(sv) == SVt_PVMG &&
- (mg = mg_find(sv, PERL_MAGIC_qr))) /* assignment deliberate */
- {
-- re = (REGEXP *)mg->mg_obj;
-+ re = (REGEXP *)mg->mg_obj;
- }
-
- Or use the (CURRENTLY UNDOCUMENETED!) C<Perl_get_re_arg> function:
-@@ -448,8 +532,9 @@ TODO, see L<http://www.mail-archive.com/perl5-changes@perl.org/msg17328.html>
-
- =head2 C<extflags>
-
--This will be used by perl to see what flags the regexp was compiled with, this
--will normally be set to the value of the flags parameter on L</comp>.
-+This will be used by perl to see what flags the regexp was compiled
-+with, this will normally be set to the value of the flags parameter by
-+the L<comp|/comp> callback.
-
- =head2 C<minlen> C<minlenret>
-
-@@ -479,7 +564,9 @@ Left offset from pos() to start match at.
-
- =head2 C<substrs>
-
--TODO: document
-+Substring data about strings that must appear in the final match. This
-+is currently only used internally by perl's engine for but might be
-+used in the future for all engines for optimisations like C<minlen>.
-
- =head2 C<nparens>, C<lasparen>, and C<lastcloseparen>
-
-@@ -490,7 +577,7 @@ the last close paren to be entered.
- =head2 C<intflags>
-
- The engine's private copy of the flags the pattern was compiled with. Usually
--this is the same as C<extflags> unless the engine chose to modify one of them
-+this is the same as C<extflags> unless the engine chose to modify one of them.
-
- =head2 C<pprivate>
-
-@@ -520,8 +607,18 @@ C<$paren >= 1>.
-
- =head2 C<precomp> C<prelen>
-
--Used for debugging purposes. C<precomp> holds a copy of the pattern
--that was compiled and C<prelen> its length.
-+Used for optimisations. C<precomp> holds a copy of the pattern that
-+was compiled and C<prelen> its length. When a new pattern is to be
-+compiled (such as inside a loop) the internal C<regcomp> operator
-+checks whether the last compiled C<REGEXP>'s C<precomp> and C<prelen>
-+are equivalent to the new one, and if so uses the old pattern instead
-+of compiling a new one.
-+
-+The relevant snippet from C<Perl_pp_regcomp>:
-+
-+ if (!re || !re->precomp || re->prelen != (I32)len ||
-+ memNE(re->precomp, t, len))
-+ /* Compile a new pattern */
-
- =head2 C<paren_names>
-
-@@ -563,11 +660,11 @@ inline modifiers it's best to have C<qr//> stringify to the supplied pattern,
- note that this will create invalid patterns in cases such as:
-
- my $x = qr/a|b/; # "a|b"
-- my $y = qr/c/; # "c"
-+ my $y = qr/c/i; # "c"
- my $z = qr/$x$y/; # "a|bc"
-
--There's no solution for such problems other than making the custom engine
--understand some for of inline modifiers.
-+There's no solution for this problem other than making the custom
-+engine understand a construct like C<(?:)>.
-
- The C<Perl_reg_stringify> in F<regcomp.c> does the stringification work.
-
-diff --git a/proto.h b/proto.h
-index dee615f..02b24d5 100644
---- a/proto.h
-+++ b/proto.h
-@@ -1893,10 +1893,36 @@ PERL_CALLCONV regnode* Perl_regnext(pTHX_ regnode* p)
- __attribute__nonnull__(pTHX_1);
-
-
--PERL_CALLCONV SV* Perl_reg_named_buff_fetch(pTHX_ REGEXP * const rx, SV * const key, const U32 flags)
-+PERL_CALLCONV SV* Perl_reg_named_buff_fetch(pTHX_ REGEXP * const rx, SV * const namesv, const U32 flags)
- __attribute__nonnull__(pTHX_1)
- __attribute__nonnull__(pTHX_2);
-
-+PERL_CALLCONV void Perl_reg_named_buff_store(pTHX_ REGEXP * const rx, SV * const key, SV * const value, const U32 flags)
-+ __attribute__nonnull__(pTHX_1)
-+ __attribute__nonnull__(pTHX_2)
-+ __attribute__nonnull__(pTHX_3);
-+
-+PERL_CALLCONV void Perl_reg_named_buff_delete(pTHX_ REGEXP * const rx, SV * const key, const U32 flags)
-+ __attribute__nonnull__(pTHX_1)
-+ __attribute__nonnull__(pTHX_2);
-+
-+PERL_CALLCONV void Perl_reg_named_buff_clear(pTHX_ REGEXP * const rx, const U32 flags)
-+ __attribute__nonnull__(pTHX_1);
-+
-+PERL_CALLCONV bool Perl_reg_named_buff_exists(pTHX_ REGEXP * const rx, SV * const key, const U32 flags)
-+ __attribute__nonnull__(pTHX_1)
-+ __attribute__nonnull__(pTHX_2);
-+
-+PERL_CALLCONV SV* Perl_reg_named_buff_firstkey(pTHX_ REGEXP * const rx, const U32 flags)
-+ __attribute__nonnull__(pTHX_1);
-+
-+PERL_CALLCONV SV* Perl_reg_named_buff_nextkey(pTHX_ REGEXP * const rx, SV * const lastkey, const U32 flags)
-+ __attribute__nonnull__(pTHX_1)
-+ __attribute__nonnull__(pTHX_2);
-+
-+PERL_CALLCONV SV* Perl_reg_named_buff_scalar(pTHX_ REGEXP * const rx, const U32 flags)
-+ __attribute__nonnull__(pTHX_1);
-+
-
- PERL_CALLCONV void Perl_reg_numbered_buff_fetch(pTHX_ REGEXP * const rx, const I32 paren, SV * const sv)
- __attribute__nonnull__(pTHX_1);
-diff --git a/regcomp.c b/regcomp.c
-index baa5d99..c144d76 100644
---- a/regcomp.c
-+++ b/regcomp.c
-@@ -228,7 +228,7 @@ typedef struct RExC_state_t {
-
- /FOO[xX]A.*B[xX]BAR/
-
-- Both 'FOO' and 'A' are fixed strings. Both 'B' and 'BAR' are floating
-+v Both 'FOO' and 'A' are fixed strings. Both 'B' and 'BAR' are floating
- strings (because they follow a .* construct). study_chunk will identify
- both FOO and BAR as being the longest fixed and floating strings respectively.
-
-@@ -4800,7 +4800,7 @@ Perl_reg_named_buff_fetch(pTHX_ REGEXP * const rx, SV * const namesv, const U32
- {
- AV *retarray = NULL;
- SV *ret;
-- if (flags & 1)
-+ if (flags & RXf_HASH_ALL)
- retarray=newAV();
-
- if (rx && rx->paren_names) {
-@@ -4810,9 +4810,9 @@ Perl_reg_named_buff_fetch(pTHX_ REGEXP * const rx, SV * const namesv, const U32
- SV* sv_dat=HeVAL(he_str);
- I32 *nums=(I32*)SvPVX(sv_dat);
- for ( i=0; i<SvIVX(sv_dat); i++ ) {
-- if ((I32)(rx->nparens) >= nums[i]
-- && rx->offs[nums[i]].start != -1
-- && rx->offs[nums[i]].end != -1)
-+ if ((I32)(rx->nparens) >= nums[i]
-+ && rx->offs[nums[i]].start != -1
-+ && rx->offs[nums[i]].end != -1)
- {
- ret = newSVpvs("");
- CALLREG_NUMBUF_FETCH(rx,nums[i],ret);
-@@ -4827,13 +4827,116 @@ Perl_reg_named_buff_fetch(pTHX_ REGEXP * const rx, SV * const namesv, const U32
- }
- }
- if (retarray)
-- return (SV*)retarray;
-+ return newRV((SV*)retarray);
- }
- }
- return NULL;
- }
-
- void
-+Perl_reg_named_buff_store(pTHX_ REGEXP * const rx, SV * const key,
-+ SV * const value, const U32 flags)
-+{
-+ PERL_UNUSED_ARG(rx);
-+ PERL_UNUSED_ARG(key);
-+ PERL_UNUSED_ARG(value);
-+ PERL_UNUSED_ARG(flags);
-+
-+ Perl_croak(aTHX_ PL_no_modify);
-+}
-+
-+void
-+Perl_reg_named_buff_delete(pTHX_ REGEXP * const rx, SV * const key, const U32 flags)
-+{
-+ PERL_UNUSED_ARG(rx);
-+ PERL_UNUSED_ARG(key);
-+ PERL_UNUSED_ARG(flags);
-+
-+ Perl_croak(aTHX_ PL_no_modify);
-+}
-+
-+void
-+Perl_reg_named_buff_clear(pTHX_ REGEXP * const rx, const U32 flags)
-+{
-+ PERL_UNUSED_ARG(rx);
-+ PERL_UNUSED_ARG(flags);
-+
-+ Perl_croak(aTHX_ PL_no_modify);
-+}
-+
-+bool
-+Perl_reg_named_buff_exists(pTHX_ REGEXP * const rx, SV * const key,
-+ const U32 flags)
-+{
-+ PERL_UNUSED_ARG(flags);
-+
-+ if (rx && rx->paren_names) {
-+ return hv_exists_ent(rx->paren_names, key, 0);
-+ } else {
-+ return FALSE;
-+ }
-+}
-+
-+SV*
-+Perl_reg_named_buff_firstkey(pTHX_ REGEXP * const rx, const U32 flags)
-+{
-+ PERL_UNUSED_ARG(flags);
-+
-+ (void)hv_iterinit(rx->paren_names);
-+
-+ return CALLREG_NAMEDBUF_NEXTKEY(rx, NULL, flags);
-+}
-+
-+SV*
-+Perl_reg_named_buff_nextkey(pTHX_ REGEXP * const rx, SV * const lastkey,
-+ const U32 flags)
-+{
-+ PERL_UNUSED_ARG(lastkey);
-+ bool all = flags & RXf_HASH_ALL;
-+
-+ if (rx && rx->paren_names) {
-+ HV *hv= rx->paren_names;
-+ while (1) {
-+ HE *temphe = hv_iternext_flags(hv,0);
-+ if (temphe) {
-+ IV i;
-+ IV parno = 0;
-+ SV* sv_dat = HeVAL(temphe);
-+ I32 *nums = (I32*)SvPVX(sv_dat);
-+ for ( i = 0; i < SvIVX(sv_dat); i++ ) {
-+ if ((I32)(rx->lastcloseparen) >= nums[i] &&
-+ rx->offs[nums[i]].start != -1 &&
-+ rx->offs[nums[i]].end != -1)
-+ {
-+ parno = nums[i];
-+ break;
-+ }
-+ }
-+ if (parno || all) {
-+ STRLEN len;
-+ char *pv = HePV(temphe, len);
-+ return newSVpvn(pv,len);
-+ }
-+ } else {
-+ break;
-+ }
-+ }
-+ }
-+
-+ return NULL;
-+}
-+
-+SV*
-+Perl_reg_named_buff_scalar(pTHX_ REGEXP * const rx, const U32 flags)
-+{
-+ PERL_UNUSED_ARG(flags);
-+
-+ if (rx && rx->paren_names)
-+ return newSViv(HvTOTALKEYS(rx->paren_names));
-+ return &PL_sv_undef;
-+}
-+
-+void
- Perl_reg_numbered_buff_fetch(pTHX_ REGEXP * const rx, const I32 paren, SV * const sv)
- {
- char *s = NULL;
-@@ -4845,13 +4948,13 @@ Perl_reg_numbered_buff_fetch(pTHX_ REGEXP * const rx, const I32 paren, SV * cons
- return;
- }
- else
-- if (paren == -2 && rx->offs[0].start != -1) {
-+ if (paren == RXrf_PREMATCH && rx->offs[0].start != -1) {
- /* $` */
- i = rx->offs[0].start;
- s = rx->subbeg;
- }
- else
-- if (paren == -1 && rx->offs[0].end != -1) {
-+ if (paren == RXrf_POSTMATCH && rx->offs[0].end != -1) {
- /* $' */
- s = rx->subbeg + rx->offs[0].end;
- i = rx->sublen - rx->offs[0].end;
-@@ -4929,7 +5032,8 @@ Perl_reg_numbered_buff_length(pTHX_ REGEXP * const rx, const SV * const sv,
-
- /* Some of this code was originally in C<Perl_magic_len> in F<mg.c> */
- switch (paren) {
-- case -2: /* $` */
-+ /* $` / ${^PREMATCH} */
-+ case RXrf_PREMATCH:
- if (rx->offs[0].start != -1) {
- i = rx->offs[0].start;
- if (i > 0) {
-@@ -4939,7 +5043,8 @@ Perl_reg_numbered_buff_length(pTHX_ REGEXP * const rx, const SV * const sv,
- }
- }
- return 0;
-- case -1: /* $' */
-+ /* $' / ${^POSTMATCH} */
-+ case RXrf_POSTMATCH:
- if (rx->offs[0].end != -1) {
- i = rx->sublen - rx->offs[0].end;
- if (i > 0) {
-@@ -4949,7 +5054,8 @@ Perl_reg_numbered_buff_length(pTHX_ REGEXP * const rx, const SV * const sv,
- }
- }
- return 0;
-- default: /* $&, $1, $2, ... */
-+ /* $& / ${^MATCH}, $1, $2, ... */
-+ default:
- if (paren <= (I32)rx->nparens &&
- (s1 = rx->offs[paren].start) != -1 &&
- (t1 = rx->offs[paren].end) != -1)
-diff --git a/regcomp.h b/regcomp.h
-index 33c3eef..5be7f32 100644
---- a/regcomp.h
-+++ b/regcomp.h
-@@ -473,6 +473,13 @@ EXTCONST regexp_engine PL_core_reg_engine = {
- Perl_reg_numbered_buff_store,
- Perl_reg_numbered_buff_length,
- Perl_reg_named_buff_fetch,
-+ Perl_reg_named_buff_store,
-+ Perl_reg_named_buff_delete,
-+ Perl_reg_named_buff_clear,
-+ Perl_reg_named_buff_exists,
-+ Perl_reg_named_buff_firstkey,
-+ Perl_reg_named_buff_nextkey,
-+ Perl_reg_named_buff_scalar,
- Perl_reg_qr_package,
- #if defined(USE_ITHREADS)
- Perl_regdupe_internal
-diff --git a/regexp.h b/regexp.h
-index 1f72112..31d264d 100644
---- a/regexp.h
-+++ b/regexp.h
-@@ -136,14 +136,40 @@ typedef struct regexp_engine {
- SV const * const value);
- I32 (*numbered_buff_LENGTH) (pTHX_ REGEXP * const rx, const SV * const sv,
- const I32 paren);
-- SV* (*named_buff_FETCH) (pTHX_ REGEXP * const rx, SV * const key,
-+ SV* (*named_buff_FETCH) (pTHX_ REGEXP * const rx, SV * const sv,
- const U32 flags);
-+ void (*named_buff_STORE) (pTHX_ REGEXP * const rx, SV * const key,
-+ SV * const value, const U32 flags);
-+ void (*named_buff_DELETE) (pTHX_ REGEXP * const rx,
-+ SV * const key, const U32 flags);
-+ void (*named_buff_CLEAR) (pTHX_ REGEXP * const rx, const U32 flags);
-+ bool (*named_buff_EXISTS) (pTHX_ REGEXP * const rx,
-+ SV * const key, const U32 flags);
-+ SV* (*named_buff_FIRSTKEY) (pTHX_ REGEXP * const rx, const U32 flags);
-+ SV* (*named_buff_NEXTKEY) (pTHX_ REGEXP * const rx,
-+ SV * const lastkey, const U32 flags);
-+ SV* (*named_buff_SCALAR) (pTHX_ REGEXP * const rx,
-+ const U32 flags);
- SV* (*qr_package)(pTHX_ REGEXP * const rx);
- #ifdef USE_ITHREADS
- void* (*dupe) (pTHX_ REGEXP * const rx, CLONE_PARAMS *param);
- #endif
- } regexp_engine;
-
-+/*
-+ These are passed to the numbered capture variable callbacks as the
-+ paren name. >= 1 is reserved for actual numbered captures, i.e. $1,
-+ $2 etc.
-+*/
-+
-+#define RXrf_PREMATCH -2 /* $` / ${^PREMATCH} */
-+#define RXrf_POSTMATCH -1 /* $' / ${^POSTMATCH} */
-+#define RXrf_MATCH 0 /* $& / ${^MATCH} */
-+
-+#define RXf_HASH_ONE 0x00000001 /* %+ */
-+#define RXf_HASH_ALL 0x00000002 /* %- */
-+#define RXf_HASH_COUNT 0x00000004 /* scalar %+ / scalar %- */
-+
- /* Flags stored in regexp->extflags
- * These are used by code external to the regexp engine
- *
-diff --git a/t/TEST b/t/TEST
-old mode 100644
-new mode 100755
-diff --git a/t/op/readdir.t b/t/op/readdir.t
-index c4d5ed2..971a02a 100644
---- a/t/op/readdir.t
-+++ b/t/op/readdir.t
-@@ -24,7 +24,7 @@ closedir(OP);
- ## This range will have to adjust as the number of tests expands,
- ## as it's counting the number of .t files in src/t
- ##
--my ($min, $max) = (140, 160);
-+my ($min, $max) = (150, 170);
- if (@D > $min && @D < $max) { print "ok 2\n"; }
- else {
- printf "not ok 2 # counting op/*.t, expect $min < %d < $max files\n",
-diff --git a/t/op/regexp_namedcapture_tie.t b/t/op/regexp_namedcapture_tie.t
-new file mode 100644
-index 0000000..f72970e
---- /dev/null
-+++ b/t/op/regexp_namedcapture_tie.t
-@@ -0,0 +1,48 @@
-+#!./perl
-+
-+BEGIN {
-+ chdir 't' if -d 't';
-+ @INC = '../lib';
-+ require './test.pl';
-+}
-+
-+# Do a basic test on all the tied methods of Tie::Hash::NamedCapture
-+
-+print "1..12\n";
-+
-+"hlagh" =~ /
-+ (?<a>.)
-+ (?<b>.)
-+ (?<a>.)
-+ .*
-+ (?<e>$)
-+/x;
-+
-+# FETCH
-+is($+{a}, "h", "FETCH");
-+is($+{b}, "l", "FETCH");
-+is($-{a}[0], "h", "FETCH");
-+is($-{a}[1], "a", "FETCH");
-+
-+# STORE
-+eval { $+{a} = "yon" };
-+ok(index($@, "read-only") != -1, "STORE");
-+
-+# DELETE
-+eval { delete $+{a} };
-+ok(index($@, "read-only") != -1, "DELETE");
-+
-+# CLEAR
-+eval { %+ = () };
-+ok(index($@, "read-only") != -1, "CLEAR");
-+
-+# EXISTS
-+ok(exists $+{e}, "EXISTS");
-+ok(!exists $+{d}, "EXISTS");
-+
-+# FIRSTKEY/NEXTKEY
-+is(join('|', sort keys %+), "a|b|e", "FIRSTKEY/NEXTKEY");
-+
-+# SCALAR
-+is(scalar(%+), 3, "SCALAR");
-+is(scalar(%-), 3, "SCALAR");
-diff --git a/universal.c b/universal.c
-index 396dd3d..f506441 100644
---- a/universal.c
-+++ b/universal.c
-@@ -16,6 +16,11 @@
-
- /* This file contains the code that implements the functions in Perl's
- * UNIVERSAL package, such as UNIVERSAL->can().
-+ *
-+ * It is also used to store XS functions that need to be present in
-+ * miniperl for a lack of a better place to put them. It might be
-+ * clever to move them to seperate XS files which would then be pulled
-+ * in by some to-be-written build process.
- */
-
- #include "EXTERN.h"
-@@ -226,11 +231,17 @@ XS(XS_Internals_rehash_seed);
- XS(XS_Internals_HvREHASH);
- XS(XS_Internals_inc_sub_generation);
- XS(XS_re_is_regexp);
--XS(XS_re_regname);
--XS(XS_re_regnames);
--XS(XS_re_regnames_iterinit);
--XS(XS_re_regnames_iternext);
-+XS(XS_re_regname);
-+XS(XS_re_regnames);
- XS(XS_re_regnames_count);
-+XS(XS_Tie_Hash_NamedCapture_FETCH);
-+XS(XS_Tie_Hash_NamedCapture_STORE);
-+XS(XS_Tie_Hash_NamedCapture_DELETE);
-+XS(XS_Tie_Hash_NamedCapture_CLEAR);
-+XS(XS_Tie_Hash_NamedCapture_EXISTS);
-+XS(XS_Tie_Hash_NamedCapture_FIRSTKEY);
-+XS(XS_Tie_Hash_NamedCapture_NEXTKEY);
-+XS(XS_Tie_Hash_NamedCapture_SCALAR);
-
- void
- Perl_boot_core_UNIVERSAL(pTHX)
-@@ -284,9 +295,15 @@ Perl_boot_core_UNIVERSAL(pTHX)
- newXSproto("re::is_regexp", XS_re_is_regexp, file, "$");
- newXSproto("re::regname", XS_re_regname, file, ";$$");
- newXSproto("re::regnames", XS_re_regnames, file, ";$");
-- newXSproto("re::regnames_iterinit", XS_re_regnames_iterinit, file, "");
-- newXSproto("re::regnames_iternext", XS_re_regnames_iternext, file, ";$");
- newXSproto("re::regnames_count", XS_re_regnames_count, file, "");
-+ newXS("Tie::Hash::NamedCapture::FETCH", XS_Tie_Hash_NamedCapture_FETCH, file);
-+ newXS("Tie::Hash::NamedCapture::STORE", XS_Tie_Hash_NamedCapture_STORE, file);
-+ newXS("Tie::Hash::NamedCapture::DELETE", XS_Tie_Hash_NamedCapture_DELETE, file);
-+ newXS("Tie::Hash::NamedCapture::CLEAR", XS_Tie_Hash_NamedCapture_CLEAR, file);
-+ newXS("Tie::Hash::NamedCapture::EXISTS", XS_Tie_Hash_NamedCapture_EXISTS, file);
-+ newXS("Tie::Hash::NamedCapture::FIRSTKEY", XS_Tie_Hash_NamedCapture_FIRSTKEY, file);
-+ newXS("Tie::Hash::NamedCapture::NEXTKEY", XS_Tie_Hash_NamedCapture_NEXTKEY, file);
-+ newXS("Tie::Hash::NamedCapture::SCALAR", XS_Tie_Hash_NamedCapture_SCALAR, file);
- }
-
-
-@@ -1072,206 +1089,341 @@ XS(XS_re_is_regexp)
- /* NOTREACHED */
- PUTBACK;
- return;
-+
- }
- }
-
--XS(XS_re_regname)
-+XS(XS_re_regnames_count)
- {
--
-+ REGEXP *rx = PL_curpm ? PM_GETRE(PL_curpm) : NULL;
-+ SV *ret;
- dVAR;
- dXSARGS;
-+
-+ if (items != 0)
-+ Perl_croak(aTHX_ "Usage: %s(%s)", "re::regnames_count", "");
-+ PERL_UNUSED_VAR(cv); /* -W */
-+ PERL_UNUSED_VAR(ax); /* -Wall */
-+ SP -= items;
-+
-+ if (!rx)
-+ XSRETURN_UNDEF;
-+
-+ ret = CALLREG_NAMEDBUF_SCALAR(rx, RXf_HASH_COUNT);
-+
-+ SPAGAIN;
-+
-+ if (ret) {
-+ XPUSHs(ret);
-+ PUTBACK;
-+ return;
-+ } else {
-+ XSRETURN_UNDEF;
-+ }
-+}
-+
-+XS(XS_re_regname)
-+{
-+ dVAR;
-+ dXSARGS;
- if (items < 1 || items > 2)
-- Perl_croak(aTHX_ "Usage: %s(%s)", "re::regname", "name[, all ]");
-+ Perl_croak(aTHX_ "Usage: %s(%s)", "re::regname", "name[, all ]");
- PERL_UNUSED_VAR(cv); /* -W */
- PERL_UNUSED_VAR(ax); /* -Wall */
- SP -= items;
-- {
-- SV * sv = ST(0);
-- SV * all;
-- regexp *re = PL_curpm ? PM_GETRE(PL_curpm) : NULL;
-- SV *bufs = NULL;
-+ REGEXP * rx = PL_curpm ? PM_GETRE(PL_curpm) : NULL;
-+ U32 flags;
-+ SV * ret;
-
-- if (items < 2)
-- all = NULL;
-- else {
-- all = ST(1);
-- }
-- {
-- if (SvPOK(sv) && re && re->paren_names) {
-- bufs = CALLREG_NAMEDBUF_FETCH(re,sv,all && SvTRUE(all));
-- if (bufs) {
-- if (all && SvTRUE(all))
-- XPUSHs(newRV(bufs));
-- else
-- XPUSHs(SvREFCNT_inc(bufs));
-- XSRETURN(1);
-- }
-- }
-- XSRETURN_UNDEF;
-- }
-- PUTBACK;
-- return;
-+ if (!rx)
-+ XSRETURN_UNDEF;
-+
-+ if (items == 2 && SvTRUE(ST(1))) {
-+ flags = RXf_HASH_ALL;
-+ } else {
-+ flags = RXf_HASH_ONE;
-+ }
-+ ret = CALLREG_NAMEDBUF_FETCH(rx, ST(0), flags);
-+
-+ if (ret) {
-+ if (SvROK(ret))
-+ XPUSHs(ret);
-+ else
-+ XPUSHs(SvREFCNT_inc(ret));
-+ XSRETURN(1);
- }
-+ XSRETURN_UNDEF;
- }
-
-+
- XS(XS_re_regnames)
- {
-- dVAR;
-+ dVAR;
- dXSARGS;
- if (items < 0 || items > 1)
-- Perl_croak(aTHX_ "Usage: %s(%s)", "re::regnames", "[all]");
-+ Perl_croak(aTHX_ "Usage: %s(%s)", "re::regnames", "[all]");
- PERL_UNUSED_VAR(cv); /* -W */
- PERL_UNUSED_VAR(ax); /* -Wall */
- SP -= items;
-- {
-- SV * all;
-- regexp *re = PL_curpm ? PM_GETRE(PL_curpm) : NULL;
-- IV count = 0;
-+ REGEXP * rx = PL_curpm ? PM_GETRE(PL_curpm) : NULL;
-+ U32 flags;
-+ IV count = 0;
-
-- if (items < 1)
-- all = NULL;
-- else {
-- all = ST(0);
-- }
-- {
-- if (re && re->paren_names) {
-- HV *hv= re->paren_names;
-- (void)hv_iterinit(hv);
-- while (1) {
-- HE *temphe = hv_iternext_flags(hv,0);
-- if (temphe) {
-- IV i;
-- IV parno = 0;
-- SV* sv_dat = HeVAL(temphe);
-- I32 *nums = (I32*)SvPVX(sv_dat);
-- for ( i = 0; i < SvIVX(sv_dat); i++ ) {
-- if ((I32)(re->lastcloseparen) >= nums[i] &&
-- re->offs[nums[i]].start != -1 &&
-- re->offs[nums[i]].end != -1)
-- {
-- parno = nums[i];
-- break;
-- }
-- }
-- if (parno || (all && SvTRUE(all))) {
-- STRLEN len;
-- char *pv = HePV(temphe, len);
-- if ( GIMME_V == G_ARRAY )
-- XPUSHs(newSVpvn(pv,len));
-- count++;
-- }
-- } else {
-+ if (!rx)
-+ XSRETURN_UNDEF;
-+
-+ if (items == 1 && SvTRUE(ST(0))) {
-+ flags = 1;
-+ } else {
-+ flags = 0;
-+ }
-+
-+ if (rx && rx->paren_names) {
-+ HV *hv= rx->paren_names;
-+ (void)hv_iterinit(hv);
-+ while (1) {
-+ HE *temphe = hv_iternext_flags(hv,0);
-+ if (temphe) {
-+ IV i;
-+ IV parno = 0;
-+ SV* sv_dat = HeVAL(temphe);
-+ I32 *nums = (I32*)SvPVX(sv_dat);
-+ for ( i = 0; i < SvIVX(sv_dat); i++ ) {
-+ if ((I32)(rx->lastcloseparen) >= nums[i] &&
-+ rx->offs[nums[i]].start != -1 &&
-+ rx->offs[nums[i]].end != -1)
-+ {
-+ parno = nums[i];
- break;
- }
- }
-+ if (parno || flags) {
-+ STRLEN len;
-+ char *pv = HePV(temphe, len);
-+ if ( GIMME_V == G_ARRAY )
-+ XPUSHs(newSVpvn(pv,len));
-+ count++;
-+ }
-+ } else {
-+ break;
- }
-- if ( GIMME_V == G_ARRAY )
-- XSRETURN(count);
-- else
-- XSRETURN_UNDEF;
-- }
-- PUTBACK;
-- return;
-+ }
- }
-+
-+ if ( GIMME_V == G_ARRAY )
-+ XSRETURN(count);
-+ else
-+ XSRETURN_UNDEF;
- }
-
--
--XS(XS_re_regnames_iterinit)
-+XS(XS_Tie_Hash_NamedCapture_FETCH)
- {
-- dVAR;
-+ dVAR;
- dXSARGS;
-- if (items != 0)
-- Perl_croak(aTHX_ "Usage: re::regnames_iterinit()");
-- PERL_UNUSED_VAR(cv); /* -W */
-- PERL_UNUSED_VAR(ax); /* -Wall */
-+ REGEXP * rx = PL_curpm ? PM_GETRE(PL_curpm) : NULL;
-+ U32 flags;
-+ SV * ret;
-+
-+ if (items != 2)
-+ Perl_croak(aTHX_ "Usage: Tie::Hash::NamedCapture::STORE($key, $flags)");
-+
-+ if (!rx)
-+ XSRETURN_UNDEF;
-+
- SP -= items;
-- {
-- regexp *re = PL_curpm ? PM_GETRE(PL_curpm) : NULL;
-- if (re && re->paren_names) {
-- (void)hv_iterinit(re->paren_names);
-- XPUSHs(newSViv(HvTOTALKEYS(re->paren_names)));
-- } else {
-+
-+ flags = (U32)INT2PTR(IV,SvIV(SvRV((SV*)ST(0))));
-+ ret = CALLREG_NAMEDBUF_FETCH(rx, ST(1), flags);
-+
-+ SPAGAIN;
-+
-+ if (ret) {
-+ if (SvROK(ret))
-+ XPUSHs(ret);
-+ else
-+ XPUSHs(SvREFCNT_inc(ret));
-+ PUTBACK;
-+ return;
-+ }
-+ XSRETURN_UNDEF;
-+}
-+
-+XS(XS_Tie_Hash_NamedCapture_STORE)
-+{
-+ dVAR;
-+ dXSARGS;
-+ REGEXP * rx = PL_curpm ? PM_GETRE(PL_curpm) : NULL;
-+ U32 flags;
-+
-+ if (items != 3)
-+ Perl_croak(aTHX_ "Usage: Tie::Hash::NamedCapture::STORE($key, $value, $flags)");
-+
-+ if (!rx) {
-+ if (!PL_localizing)
-+ Perl_croak(aTHX_ PL_no_modify);
-+ else
- XSRETURN_UNDEF;
-- }
-- PUTBACK;
-- return;
- }
-+
-+ SP -= items;
-+
-+ flags = (U32)INT2PTR(IV,SvIV(SvRV((SV*)ST(0))));
-+ CALLREG_NAMEDBUF_STORE(rx,ST(1), ST(2), flags);
- }
-
-+XS(XS_Tie_Hash_NamedCapture_DELETE)
-+{
-+ dVAR;
-+ dXSARGS;
-+ REGEXP * rx = PL_curpm ? PM_GETRE(PL_curpm) : NULL;
-+ U32 flags;
-
--XS(XS_re_regnames_iternext)
-+ if (items != 2)
-+ Perl_croak(aTHX_ "Usage: Tie::Hash::NamedCapture::DELETE($key, $flags)");
-+
-+ if (!rx)
-+ Perl_croak(aTHX_ PL_no_modify);
-+
-+ SP -= items;
-+
-+ flags = (U32)INT2PTR(IV,SvIV(SvRV((SV*)ST(0))));
-+ CALLREG_NAMEDBUF_DELETE(rx, ST(1), flags);
-+}
-+
-+XS(XS_Tie_Hash_NamedCapture_CLEAR)
- {
-- dVAR;
-+ dVAR;
- dXSARGS;
-- if (items < 0 || items > 1)
-- Perl_croak(aTHX_ "Usage: %s(%s)", "re::regnames_iternext", "[all]");
-- PERL_UNUSED_VAR(cv); /* -W */
-- PERL_UNUSED_VAR(ax); /* -Wall */
-+ REGEXP * rx = PL_curpm ? PM_GETRE(PL_curpm) : NULL;
-+ U32 flags;
-+
-+ if (items != 1)
-+ Perl_croak(aTHX_ "Usage: Tie::Hash::NamedCapture::CLEAR($flags)");
-+
-+ if (!rx)
-+ Perl_croak(aTHX_ PL_no_modify);
-+
- SP -= items;
-- {
-- SV * all;
-- regexp *re = PL_curpm ? PM_GETRE(PL_curpm) : NULL;
-
-- if (items < 1)
-- all = NULL;
-- else {
-- all = ST(0);
-- }
-- if (re && re->paren_names) {
-- HV *hv= re->paren_names;
-- while (1) {
-- HE *temphe = hv_iternext_flags(hv,0);
-- if (temphe) {
-- IV i;
-- IV parno = 0;
-- SV* sv_dat = HeVAL(temphe);
-- I32 *nums = (I32*)SvPVX(sv_dat);
-- for ( i = 0; i < SvIVX(sv_dat); i++ ) {
-- if ((I32)(re->lastcloseparen) >= nums[i] &&
-- re->offs[nums[i]].start != -1 &&
-- re->offs[nums[i]].end != -1)
-- {
-- parno = nums[i];
-- break;
-- }
-- }
-- if (parno || (all && SvTRUE(all))) {
-- STRLEN len;
-- char *pv = HePV(temphe, len);
-- XPUSHs(newSVpvn(pv,len));
-- XSRETURN(1);
-- }
-- } else {
-- break;
-- }
-- }
-- }
-+ flags = (U32)INT2PTR(IV,SvIV(SvRV((SV*)ST(0))));
-+ CALLREG_NAMEDBUF_CLEAR(rx, flags);
-+}
-+
-+XS(XS_Tie_Hash_NamedCapture_EXISTS)
-+{
-+ dVAR;
-+ dXSARGS;
-+ REGEXP * rx = PL_curpm ? PM_GETRE(PL_curpm) : NULL;
-+ U32 flags;
-+ bool exists;
-+
-+ if (items != 2)
-+ Perl_croak(aTHX_ "Usage: Tie::Hash::NamedCapture::EXISTS($key, $flags)");
-+
-+ if (!rx)
- XSRETURN_UNDEF;
-- PUTBACK;
-- return;
-+
-+ SP -= items;
-+
-+ flags = (U32)INT2PTR(IV,SvIV(SvRV((SV*)ST(0))));
-+ exists = CALLREG_NAMEDBUF_EXISTS(rx, ST(1), flags);
-+
-+ SPAGAIN;
-+
-+ if (exists) {
-+ XSRETURN_YES;
-+ } else {
-+ XSRETURN_NO;
- }
- }
-
-+XS(XS_Tie_Hash_NamedCapture_FIRSTKEY)
-+{
-+ dVAR;
-+ dXSARGS;
-+ REGEXP * rx = PL_curpm ? PM_GETRE(PL_curpm) : NULL;
-+ U32 flags;
-+ SV * ret;
-
--XS(XS_re_regnames_count)
-+ if (items != 1)
-+ Perl_croak(aTHX_ "Usage: Tie::Hash::NamedCapture::FIRSTKEY()");
-+
-+ if (!rx)
-+ XSRETURN_UNDEF;
-+
-+ SP -= items;
-+
-+ flags = (U32)INT2PTR(IV,SvIV(SvRV((SV*)ST(0))));
-+ ret = CALLREG_NAMEDBUF_FIRSTKEY(rx, flags);
-+
-+ SPAGAIN;
-+
-+ if (ret) {
-+ XPUSHs(SvREFCNT_inc(ret));
-+ PUTBACK;
-+ } else {
-+ XSRETURN_UNDEF;
-+ }
-+
-+}
-+
-+XS(XS_Tie_Hash_NamedCapture_NEXTKEY)
- {
-- regexp *re = PL_curpm ? PM_GETRE(PL_curpm) : NULL;
-- dVAR;
-+ dVAR;
- dXSARGS;
-+ REGEXP * rx = PL_curpm ? PM_GETRE(PL_curpm) : NULL;
-+ U32 flags;
-+ SV * ret;
-+
-+ if (items != 2)
-+ Perl_croak(aTHX_ "Usage: Tie::Hash::NamedCapture::NEXTKEY($lastkey)");
-+
-+ if (!rx)
-+ XSRETURN_UNDEF;
-
-- if (items != 0)
-- Perl_croak(aTHX_ "Usage: %s(%s)", "re::regnames_count", "");
-- PERL_UNUSED_VAR(cv); /* -W */
-- PERL_UNUSED_VAR(ax); /* -Wall */
- SP -= items;
--
-- if (re && re->paren_names) {
-- XPUSHs(newSViv(HvTOTALKEYS(re->paren_names)));
-+
-+ flags = (U32)INT2PTR(IV,SvIV(SvRV((SV*)ST(0))));
-+ ret = CALLREG_NAMEDBUF_NEXTKEY(rx, ST(1), flags);
-+
-+ SPAGAIN;
-+
-+ if (ret) {
-+ XPUSHs(ret);
- } else {
- XSRETURN_UNDEF;
- }
- PUTBACK;
-- return;
-+}
-+
-+XS(XS_Tie_Hash_NamedCapture_SCALAR)
-+{
-+ dVAR;
-+ dXSARGS;
-+ REGEXP * rx = PL_curpm ? PM_GETRE(PL_curpm) : NULL;
-+ U32 flags;
-+ SV * ret;
-+
-+ if (items != 1)
-+ Perl_croak(aTHX_ "Usage: Tie::Hash::NamedCapture::SCALAR()");
-+
-+ if (!rx)
-+ XSRETURN_UNDEF;
-+
-+ SP -= items;
-+
-+ flags = (U32)INT2PTR(IV,SvIV(SvRV((SV*)ST(0))));
-+ ret = CALLREG_NAMEDBUF_SCALAR(rx, flags);
-+
-+ SPAGAIN;
-+
-+ if (ret) {
-+ XPUSHs(ret);
-+ PUTBACK;
-+ return;
-+ } else {
-+ XSRETURN_UNDEF;
-+ }
- }
-
-
+++ /dev/null
-package Example;
-use strict;
-
-# Note the (), doesn't call ->import
-use re::engine::Plugin ();
-
-sub import {
- # Populates %^H with re::engine::Plugin hooks
- re::engine::Plugin->import(
- exec => \&exec,
- );
-}
-
-*unimport = \&re::engine::Plugin::unimport;
-
-sub exec
-{
- my ($re, $str) = @_;
-
- $re->num_captures(
- FETCH => sub {
- my ($re, $paren) = @_;
-
- $str . "_" . $paren;
- }
- );
-
- 1;
-}
-
-1;
+++ /dev/null
-use strict;
-use lib 't';
-use Test::More tests => 1;
-
-use Example;
-
-"str" =~ /pattern/;
-
-is($1, "str_1");
+++ /dev/null
-=pod
-
-Test the B<captures> method
-
-=cut
-
-use strict;
-
-use feature ':5.10';
-
-#use Test::More tests => 1;
-use Test::More skip_all => 'TODO: implement';
-
-use re::engine::Plugin (
- comp => sub {
- my $re = shift;
- },
- exec => sub {
- my ($re, $str) = @_;
-
- #
- #$re->captures( [ 1 .. 4 ] );
- #$re->captures( sub {} );
-
- $re->named_captures( );
-
- 1; # matched
- }
-);
-
-if ("string" =~ /./g) {
- cmp_ok $1, '==', 1337;
- cmp_ok $+{named}, '==', 5;
-}
+++ /dev/null
-=pod
-
-Test the B<flags> method
-
-=cut
-
-use strict;
-
-use feature ':5.10';
-
-use Test::More tests => 28;
-
-my @tests = (
- sub { cmp_ok shift, 'eq', '', => 'no flags' },
- sub { like shift, qr/c/ => '/c' },
- sub { cmp_ok shift, 'eq', 'g' => '/g' },
- sub { cmp_ok shift, 'eq', 'i' => '/i' },
- sub { cmp_ok shift, 'eq', 'm' => '/m' },
- sub { cmp_ok shift, 'eq', '' => '/o' },
- sub { cmp_ok shift, 'eq', 's' => '/s' },
- sub { cmp_ok shift, 'eq', 'x' => '/x' },
- sub { cmp_ok shift, 'eq', 'p' => '/p' },
- sub { like $_[0], qr/$_/ => "/$_ in $_[0]" for unpack "(A)*", "xi" },
- sub { like $_[0], qr/$_/ => "/$_ in $_[0]" for unpack "(A)*", "xs" },
- sub { like $_[0], qr/$_/ => "/$_ in $_[0]" for unpack "(A)*", "cgimsxp" },
- sub { like $_[0], qr/$_/ => "/$_ in $_[0]" for unpack "(A)*", "e" },
- sub { like $_[0], qr/$_/ => "/$_ in $_[0]" for unpack "(A)*", "egimsxp" },
-);
-
-use re::engine::Plugin (
- exec => sub {
- my ($re, $str) = @_;
-
- my $t = shift @tests;
-
- $t->($re->flags);
- }
-);
-
-# Provide a pattern that can match to avoid running into regexp
-# optimizations that won't call exec on C<"" =~ //>;
-
-"" =~ /x/;
-"" =~ /x/cg; # meaningless without /g
-"" =~ /x/g;
-"" =~ /x/i;
-"" =~ /x/m;
-"" =~ /x/o;
-"" =~ /x/s;
-"" =~ /x/x;
-"" =~ /x/p;
-"" =~ /x/xi;
-"" =~ /x/xs;
-"" =~ /x/cgimosxp;
-
-my $_ = "";
-
-$_ =~ s/1/2/e;
-$_ =~ s/1/2/egimosxp;
+++ /dev/null
-use strict;
-
-use Test::More tests => 2;
-
-use re::engine::Plugin (
- comp => sub {
- my $re = shift;
- $re->minlen(2);
- },
- exec => sub {
- my $re = shift;
- my $minlen = $re->minlen;
- cmp_ok $minlen, '==', 2, 'minlen accessor';
- },
-);
-
-pass "making match";
-"str" =~ /pattern/;
+++ /dev/null
-use strict;
-
-use Test::More tests => 1;
-
-use re::engine::Plugin (
- comp => sub {
- my $re = shift;
- $re->minlen(length("str") + 1); # make "str" too short
- },
- exec => sub { fail "exec called" },
-);
-
-pass "making match";
-"str" =~ /pattern/;
+++ /dev/null
-use strict;
-use Test::More tests => 6;
-
-use re::engine::Plugin (
- exec => sub {
- my $re = shift;
-
- $re->stash( [
- { flags => 0 },
- { flags => 0 },
- { flags => 0 },
- { flags => 1 },
- { flags => 1 },
- { flags => 1 },
- ] );
-
- $re->named_captures(
- CLEAR => sub {
- my ($re, $flags) = @_;
- my $hv = shift @{ $re->stash };
-
- is($flags, $hv->{flags}, "flags == $flags");
- },
- );
-
- 1;
- },
-);
-
-"a" =~ /a/;
-%+ = ();
-%+ = (a => 1);
-undef %+;
-%- = ();
-%- = (b => 1);
-undef %-;
-
-
+++ /dev/null
-use strict;
-use Test::More tests => 4;
-
-use re::engine::Plugin (
- exec => sub {
- my $re = shift;
-
- $re->stash( [
- {
- key => 'one',
- flags => 0,
- },
- {
- key => 'two',
- flags => 1,
- },
- ] );
-
- $re->named_captures(
- DELETE => sub {
- my ($re, $key, $flags) = @_;
- my $hv = shift @{ $re->stash };
-
- is($key, $hv->{key}, "key eq $key");
- is($flags, $hv->{flags}, "flags == $flags");
- },
- );
-
- 1;
- },
-);
-
-"a" =~ /a/;
-delete $+{one};
-delete $-{two};
-
-
+++ /dev/null
-use strict;
-use Test::More tests => 6;
-
-use re::engine::Plugin (
- exec => sub {
- my $re = shift;
-
- $re->stash( [
- { key => "boob", flags => 0, ret => 1 },
- { key => "ies", flags => 1, ret => 0 },
- ] );
-
- $re->named_captures(
- EXISTS => sub {
- my ($re, $key, $flags) = @_;
- my $hv = shift @{ $re->stash };
-
- is($key, $hv->{key}, "key == $key");
- is($flags, $hv->{flags}, "flags == $flags");
- return $hv->{ret};
- },
- );
-
- 1;
- },
-);
-
-"a" =~ /a/;
-ok(exists $+{boob});
-ok(!exists $-{ies});;
-
+++ /dev/null
-use strict;
-use Test::More tests => 16;
-
-use re::engine::Plugin (
- exec => sub {
- my $re = shift;
-
- $re->stash( [
- {
- key => "a",
- flags => 0,
- ret => "b",
- },
- {
- key => "c",
- flags => 0,
- ret => "d",
- },
- {
- key => "e",
- flags => 1,
- ret => "f",
- },
- {
- key => "g",
- flags => 1,
- ret => \%ENV,
- },
- ] );
-
- $re->named_captures(
- FETCH => sub {
- my ($re, $key, $flags) = @_;
- my $hv = shift @{ $re->stash };
-
- is($key, $hv->{key}, "key == $key");
- is($flags, $hv->{flags}, "flags == $flags");
- is($hv->{ret}, $hv->{ret}, "ret = $hv->{ret}");
- return $hv->{ret};
- },
- );
-
- 1;
- },
-);
-
-"a" =~ /a/;
-cmp_ok($+{a}, 'eq', "b");
-cmp_ok($+{c}, 'eq', "d");
-cmp_ok($-{e}, 'eq', "f");
-cmp_ok($-{g}, '==', \%ENV);
+++ /dev/null
-use strict;
-use Test::More tests => 10;
-
-use re::engine::Plugin (
- exec => sub {
- my $re = shift;
-
- my $stash = 0;
- my @stash = (
- {
- key => "a",
- flags => 0,
- ret => "b",
- },
- {
- key => "c",
- flags => 1,
- ret => "d",
- },
- );
-
- $re->named_captures(
- FIRSTKEY => sub {
- my ($re, $flags) = @_;
- my $hv = $stash[$stash];
-
- return $hv->{key};
- },
- FETCH => sub {
- my ($re, $key, $flags) = @_;
- my $hv = $stash[$stash++];
-
- is($key, $hv->{key}, "key == $key");
- is($flags, $hv->{flags}, "flags == $flags");
- is($hv->{ret}, $hv->{ret}, "ret = $hv->{ret}");
- return $hv->{ret};
- },
- );
-
- 1;
- },
-);
-
-"a" =~ /a/;
-my ($k, $v);
-
-($k, $v) = each %+;
-is($k, "a");
-is($v, "b");
-
-($k, $v) = each %-;
-is($k, "c");
-is($v, "d");
+++ /dev/null
-use strict;
-use Test::More tests => 6;
-
-use re::engine::Plugin (
- exec => sub {
- my $re = shift;
-
- my @keys = ("a" .. "f");
-
- $re->named_captures(
- FIRSTKEY => sub { shift @keys },
- NEXTKEY => sub {
- my ($re, $lastkey, $flag) = @_;
- my $key = shift @keys;
-
- is(chr(ord($key)-1), $lastkey, "$lastkey value makes sense")
- if defined $key;
-
- return $key;
- },
- );
-
- 1;
- },
-);
-
-"a" =~ /a/;
-my $key = join "|", keys %+;
-is($key, "a|b|c|d|e|f", "key row correct");
+++ /dev/null
-use strict;
-use Test::More tests => 6;
-
-use re::engine::Plugin (
- exec => sub {
- my ($re) = @_;
-
- my @stash = (
- { flags => 0, ret => "ook" },
- { flags => 1, ret => "eek" },
- );
-
- $re->named_captures(
- SCALAR => sub {
- my ($re, $flags) = @_;
- my $hv = shift @stash;
-
- is($flags, $hv->{flags}, "flags == $flags");
- ok($hv->{ret}, "ret == $hv->{ret}");
-
- return $hv->{ret};
- },
- );
-
- 1;
- },
-);
-
-"a" =~ /a/;
-is(scalar %+, "ook");
-is(scalar %-, "eek");
+++ /dev/null
-use strict;
-use Test::More tests => 12;
-
-use re::engine::Plugin (
- exec => sub {
- my $re = shift;
-
- $re->stash( [
- {
- key => 'one',
- value => 'a',
- flags => 0,
- },
- {
- key => 'two',
- value => 'b',
- flags => 0,
- },
- {
- key => 'three',
- value => 'c',
- flags => 1,
- },
- {
- key => 'four',
- value => 'd',
- flags => 1,
- },
- ] );
-
- $re->named_captures(
- STORE => sub {
- my ($re, $key, $value, $flags) = @_;
- my $hv = shift @{ $re->stash };
-
- is($key, $hv->{key}, "key eq $key");
- is($value, $hv->{value}, "value eq $value");
- is($flags, $hv->{flags}, "flags == $flags");
- },
- );
-
- 1;
- },
-);
-
-"a" =~ /a/;
-$+{one} = "a";
-$+{two} = "b";
-$-{three} = "c";
-$-{four} = "d";
-
-