From: Ævar Arnfjörð Bjarmason Date: Sun, 18 Feb 2007 19:49:00 +0000 (+0000) Subject: Importing re-engine-Plugin-0.01.tar.gz X-Git-Tag: v0.01^0 X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Fre-engine-Plugin.git;a=commitdiff_plain;h=def98fc0d7f5e9527b28af6b90d4ddb07fbc845c Importing re-engine-Plugin-0.01.tar.gz --- def98fc0d7f5e9527b28af6b90d4ddb07fbc845c diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ae275c8 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +^\.git \ No newline at end of file diff --git a/Changes b/Changes new file mode 100644 index 0000000..f0f3903 --- /dev/null +++ b/Changes @@ -0,0 +1,4 @@ +Revision history for Perl extension re::engine::Plugin + +0.01 Sun Feb 18 2007 + - Initial release, incomplete \ No newline at end of file diff --git a/MANIFEST b/MANIFEST new file mode 100644 index 0000000..fbce7f8 --- /dev/null +++ b/MANIFEST @@ -0,0 +1,31 @@ +Changes +contrib/capture_hook.patch +inc/Module/AutoInstall.pm +inc/Module/Install.pm +inc/Module/Install/AutoInstall.pm +inc/Module/Install/Base.pm +inc/Module/Install/Can.pm +inc/Module/Install/Fetch.pm +inc/Module/Install/Include.pm +inc/Module/Install/Makefile.pm +inc/Module/Install/Makefile/Version.pm +inc/Module/Install/Metadata.pm +inc/Module/Install/Win32.pm +inc/Module/Install/WriteAll.pm +Makefile.PL +MANIFEST This list of files +META.yml +Plugin.pm +Plugin.pod +Plugin.xs +t/00-compile.t +t/captures.t +t/eval-comp.t +t/eval-exec.t +t/flags.t +t/import.t +t/methods.t +t/minlen-get.t +t/minlen-set.t +TODO +typemap diff --git a/META.yml b/META.yml new file mode 100644 index 0000000..dd487cd --- /dev/null +++ b/META.yml @@ -0,0 +1,15 @@ +abstract: Pure-Perl regular expression engine plugin interface +author: "\xC3\x86var Arnfj\xC3\xB6r\xC3\xB0 Bjarmason " +build_requires: + Test::More: 0 +distribution_type: module +generated_by: Module::Install version 0.64 +license: perl +name: re-engine-Plugin +no_index: + directory: + - inc + - t +requires: + perl: 5.9.5 +tests: t/*.t diff --git a/Makefile.PL b/Makefile.PL new file mode 100644 index 0000000..6da951b --- /dev/null +++ b/Makefile.PL @@ -0,0 +1,29 @@ + +=pod + +L file for L. M::I knows how to +build our XS stuff automatically. + +=cut + +use strict; +use inc::Module::Install; + +name 're-engine-Plugin'; + +# Requires the unreleased match vars features in (as of writing) +# unreleased 5.9.6, but 5.9.5 is the version of blead +perl_version '5.009005'; + +author 'Ævar Arnfjörð Bjarmason '; + +abstract_from 'Plugin.pod'; +license_from 'Plugin.pod'; + +# t/ +build_requires 'Test::More' => 0; # 5.007003 + +tests 't/*.t'; + +auto_install; +WriteAll; diff --git a/Plugin.pm b/Plugin.pm new file mode 100644 index 0000000..ec4ea06 --- /dev/null +++ b/Plugin.pm @@ -0,0 +1,91 @@ +# See Plugin.pod for documentation +package re::engine::Plugin; +use 5.009005; +use strict; +use Carp 'croak'; +use Scalar::Util 'weaken'; +use XSLoader (); + +our $VERSION = '0.01'; + +XSLoader::load __PACKAGE__, $VERSION; + +my $RE_ENGINE_PLUGIN = get_engine_plugin(); +my $NULL = 0; + +# How many? Used to cheat %^H +my $callback = 0; +# Valid callbacks +my @callback = qw(comp exec intuit checkstr free dupe); +# Where we store our CODE refs +my %callback; + +sub import +{ + my ($pkg, %sub) = @_; + + #$sub{$_} = sub {} + + for (@callback) { + next unless exists $sub{$_}; + my $cb = delete $sub{$_}; + + # Convert "package::sub" to CODE if it isn't CODE already + unless (ref $cb eq 'CODE') { + no strict 'refs'; + $cb = *{$cb}{CODE}; + } + + # Whine if we don't get a CODE ref or a valid package::sub name + croak "'$_' is not CODE and neither is the *{$cb}{CODE} fallback" + unless ref $cb eq 'CODE'; + + # Get an ID to use + my $id = $callback ++; + + # Insert into our callback storage, + $callback{$_}->{$id} = $cb; + + # Weaken it so we don't end up hanging on to something the + # caller doesn't care about anymore + #weaken($callback{$_}->{$id}); # EEK, too weak! + + # Instert into our cache with a key we can retrive later + # knowing the ID in %^H and what callback we're getting + my $key = callback_key($_); + $^H{$key} = $id; + } + + $^H{regcomp} = $RE_ENGINE_PLUGIN; +} + +sub unimport +{ + my ($pkg) = @_; + + # Delete the regcomp hook + delete $^H{regcomp} if $^H{regcomp} == $RE_ENGINE_PLUGIN; +} + +sub callback_key +{ + my ($name) = @_; + + sprintf "rep_%s", $name; +} + +# Minimal function to be called from the XS +sub get_callback +{ + my ($name) = @_; # 'comp', 'exec', ... + + my $key = callback_key($name); + my $h = (caller(0))[10]; + my $id = $h->{$key}; + + my $cb = defined $id ? $callback{$name}->{$id} : 0; + + return $cb; +} + +1; diff --git a/Plugin.pod b/Plugin.pod new file mode 100644 index 0000000..a076caa --- /dev/null +++ b/Plugin.pod @@ -0,0 +1,208 @@ +=head1 NAME + +re::engine::Plugin - Pure-Perl regular expression engine plugin interface + +=head1 SYNOPSIS + + use feature ':5.10'; + use re::engine::Plugin ( + comp => sub { + my ($re) = @_; # A re::engine::Plugin object + + # return value ignored + }, + exec => sub { + my ($re, $str) = @_; + + # We always like ponies! + return 1 if $str eq 'pony'; + return; + } + ); + + "pony" =~ /yummie/; + +=head1 DESCRIPTION + +As of perl 5.9.5 it's possible lexically replace perl's built-in +regular expression engine (see L). This module provides glue for writing such a wrapper in +Perl instead of the provided C/XS interface. + +B: This module is a development release that does not work with +any version of perl other than the current (as of February 2007) +I. The provided interface is not a complete wrapper around the +native interface (yet!) but the parts that are left can be implemented +with additional methods so the completed API shouldn't have any major +changes. + +=head1 METHODS + +=head2 import + +Takes a list of key-value pairs with the only mandatory pair being +L and its callback routine. Both subroutine references and the +string name of a subroutine (e.g. C<"main::exec">) can be +specified. The real CODE ref is currently looked up in the symbol +table in the latter case. + +=over 4 + +=item comp + +An optional sub to be called when a pattern is being compiled, note +that a single pattern may be compiled more than once by perl. + +The subroutine will be called with a regexp object (see L). The regexp object will be stored internally along with the +pattern and provided as the first argument for the other callback +routines (think of it as C<$self>). + +If your regex implementation needs to validate its pattern this is the +right place to B on an invalid one (but see L). + +The return value of this subroutine is discarded. + +=item exec + +Called when a given pattern is being executed, the first argument is +the regexp object and the second is the string being matched. The +routine should return true if the pattern matched and false if it +didn't. + +=item intuit + +TODO: implement + +=item checkstr + +TODO: implement + +=item free + +TODO: implement + +=item dupe + +TODO: implement + +=item numbered_buff_get + +TODO: implement + +=item named_buff_get + +TODO: implement + +=back + +=head2 flags + +L + +=head1 TODO + +=over + +=item * + +Provide an API for named (C<$+{name}>) and unnamed (C<$1, $2, ...>) +match variables, allow specifying both offsets into the pattern and +any given scalar. + +=item * + +Find some neat example for the L, suggestions welcome. + +=back + +=head1 BUGS + +Please report any bugs that aren't already listed at +L to +L + +=over 1 + +=item + +Calling C or anything that uses it (such as C) in the +L callback routines will not be trapped by an C block +that the pattern is in, i.e. + + use Carp qw(croak); + use re::engine::Plugin( + comp => sub { + my $re = shift; + croak "Your pattern is invalid" + unless $re->pattern =~ /pony/; + } + ); + + # Ignores the eval block + eval { /you die in C, you die for real/ }; + +Simply put this happens because the real subroutine call happens +indirectly and not in the scope of the C block. + +=back + +=head1 Regexp object + +The regexp object is passed around as the first argument to all the +callback routines, it supports the following method calls (with more +to come!). + +=over + +=item pattern + +Returns the pattern this regexp was compiled with. + +=item flags + +Returns a string of flags the pattern was compiled +with. (e.g. C<"xs">). The flags are not guarenteed to be in any +particular order, so don't depend on the current one. + +=item stash + +Returns or sets a user-defined stash that's passed around with the +pattern, this is useful for passing around an arbitary scalar between +callback routines, example: + + use re::engine::Plugin ( + comp => sub { $_[0]->stash( [ 1 .. 5 ] ) }, + comp => sub { $_[0]->stash }, # Get [ 1 .. 5] + ); + +=item minlen + +The minimum length a given string must be to match the pattern, set +this to an integer in B and perl will not call your B +routine unless the string being matched as at least that long. Returns +the currently set length if not called with any arguments or C +if no length has been set. + +=back + +=head1 SEE ALSO + +L + +=head1 THANKS + +Yves explaining why I made the regexp engine a sad panda. + +=head1 AUTHOR + +Evar ArnfjErE Bjarmason + +=head1 LICENSE + +This program is free software; you can redistribute it and/or modify it +under the same terms as Perl itself. + +Copyright 2007 Evar ArnfjErE Bjarmason. + +=cut diff --git a/Plugin.xs b/Plugin.xs new file mode 100644 index 0000000..07a73d2 --- /dev/null +++ b/Plugin.xs @@ -0,0 +1,394 @@ +#include "EXTERN.h" +#include "perl.h" +#include "XSUB.h" + +#define SAVEPVN(p,n) ((p) ? savepvn(p,n) : NULL) + +START_EXTERN_C + +EXTERN_C const regexp_engine engine_plugin; + +END_EXTERN_C + +/* + * Our struct which gets initiated and used as our object + * ($re). Since we can't count on the regexp structure provided by + * perl to be alive between comp/exec etc. we pull stuff from it and + * save it in our own structure. + * + * Besides, creating Perl accessors which directly muck with perl's + * own regexp structures in different phases of regex execution would + * be a little too evil. + */ +typedef struct replug { + SV * pattern; + char flags[sizeof("ecgimsxp")]; + + I32 minlen; + U32 gofs; + + SV * stash; + + U32 nparens; + AV * captures; /* Array of SV* that'll become $1, $2, ... */ +} *re__engine__Plugin; + +SV* +get_H_callback(const char* key) +{ + dVAR; + dSP; + + SV * callback; + + ENTER; + SAVETMPS; + + PUSHMARK(SP); + XPUSHs(sv_2mortal(newSVpv(key, 0))); + PUTBACK; + + call_pv("re::engine::Plugin::get_callback", G_SCALAR); + + SPAGAIN; + + callback = POPs; + SvREFCNT_inc(callback); + + if (!SvROK(callback)) { callback = NULL; }// croak("ret value not a ref"); } + + PUTBACK; + FREETMPS; + LEAVE; + + return callback; +} + +/* just learn to use gdb you lazy bum! */ +#if 0 +void +dump_r_info(const char* id, regexp *r) +{ + warn("%s:", id); + warn("\textflags = %d", r->extflags); + warn("\tminlen = %d", r->minlen); + warn("\tminlenren = %d", r->minlenret); + warn("\tgofs = %d", r->gofs); + warn("\tnparens = %d", r->nparens); + warn("\tpprivate = %p", r->pprivate); + warn("\tsubbeg = %s", r->subbeg); + warn("\tsublen = %d", r->sublen); + warn("\tprecomp = %s", r->precomp); + warn("\tprelen = %d", r->prelen); + warn("\twrapped = %s", r->wrapped); + warn("\twraplen = %d", r->wraplen); + warn("\tseen_evals = %d", r->seen_evals); + warn("\trefcnt = %d", r->refcnt); + +} +#endif + +regexp * +Plugin_comp(pTHX_ char *exp, char *xend, PMOP *pm) +{ + dSP; + register regexp *r; + int count; + + /* + * Allocate a new regexp struct, we must only write to the intflags, + * engine and private members and the others must be populated, + * internals expect the regex to have certain values least our code + * blow up + */ + + Newxz(r,1,regexp); + + /* Set up the regex to be handled by this plugin */ + r->engine = &engine_plugin; + + /* Store the initial flags */ + r->intflags = pm->op_pmflags; + r->pprivate = NULL; /* this is set to our object below */ + + /* + * Populate the regexp members for the engine + */ + + /* Ref count of the pattern */ + r->refcnt = 1; + + /* Preserve a copy of the original pattern */ + r->prelen = xend - exp; + r->precomp = SAVEPVN(exp, r->prelen); + + /* these may be changed by accessors */ + r->minlen = 0; + r->minlenret = 0; + r->gofs = 0; + r->nparens = 0; + + /* Store the flags as perl expects them */ + r->extflags = pm->op_pmflags & RXf_PMf_COMPILETIME; + + /* + * Construct a new B object that'll carry around + * our data inside C<< r->pprivate >>. The object is a blessed void* + * that points to our replug struct which holds any state we want to + * keep. + */ + re__engine__Plugin re; + Newz(0, re, 1, struct replug); + + SV *obj = newSV(0); + SvREFCNT_inc(obj); + + /* Bless into this package; TODO: make it subclassable */ + const char * pkg = "re::engine::Plugin"; + /* bless it */ + sv_setref_pv(obj, pkg, (void*)re); + + /* Store our private object */ + r->pprivate = obj; + + re->pattern = newSVpvn(SAVEPVN(exp, xend - exp), xend - exp); + SvREFCNT_inc(re->pattern); + + /* Concat [ec]gimosxp (egimosxp & cgimosxp into) the flags string as + * appropriate + */ + if (r->intflags & PMf_EVAL) { strcat(re->flags, "e"); } + if (r->intflags & PMf_CONTINUE) { strcat(re->flags, "c"); } + if (r->intflags & PMf_GLOBAL) { strcat(re->flags, "g"); } + if (r->intflags & PMf_FOLD) { strcat(re->flags, "i"); } + if (r->intflags & PMf_MULTILINE) { strcat(re->flags, "m"); } + if (r->intflags & PMf_ONCE) { strcat(re->flags, "o"); } + if (r->intflags & PMf_SINGLELINE) { strcat(re->flags, "s"); } + if (r->intflags & PMf_EXTENDED) { strcat(re->flags, "x"); } + if (((r->extflags & RXf_PMf_KEEPCOPY) == RXf_PMf_KEEPCOPY)) { + strcat(re->flags, "p"); + } + + /* + * Call our callback function if one was defined, if not we've + * already set up all the stuff we're going to to need for + * subsequent exec and other calls + */ + SV * callback = get_H_callback("comp"); + + if (callback) { + ENTER; + SAVETMPS; + + PUSHMARK(SP); + XPUSHs(obj); + XPUSHs(sv_2mortal(newSVpv(exp, xend - exp))); + + PUTBACK; + + call_sv(get_H_callback("comp"), G_DISCARD); + + FREETMPS; + LEAVE; + } + + /* If any of the comp-time accessors were called we'll have to + * update the regexp struct with the new info. + */ + if (re->minlen) r->minlen = re->minlen; + if (re->gofs) r->gofs = re->gofs; + if (re->gofs) r->gofs = re->gofs; + if (re->nparens) r->nparens = re->nparens; + + int buffers = r->nparens; + + //r->nparens = (buffers - 1); + Newxz(r->startp, buffers, I32); + Newxz(r->endp, buffers, I32); + + /* return the regexp */ + return r; +} + +I32 +Plugin_exec(pTHX_ register regexp *r, char *stringarg, register char *strend, + char *strbeg, I32 minend, SV *sv, void *data, U32 flags) +{ + dSP; + I32 rc; + int *ovector; + I32 i; + int count; + int ret; + + /*Newx(ovector,r->nparens,int);*/ + + SV* callback = get_H_callback("exec"); + + ENTER; + SAVETMPS; + + PUSHMARK(SP); + + XPUSHs(r->pprivate); + XPUSHs(sv); + + PUTBACK; + + count = call_sv(callback, G_ARRAY); + + SPAGAIN; + + SV * SvRet = POPs; + + if (SvTRUE(SvRet)) { + /* Match vars */ + + /* + r->sublen = strend-strbeg; + r->subbeg = savepvn(strbeg,r->sublen); + r->startp[1] = 0; + r->endp[1] = 5; + */ + + ret = 1; + } else { + ret = 0; + } + + PUTBACK; + FREETMPS; + LEAVE; + + return ret; +} + +char * +Plugin_intuit(pTHX_ regexp *prog, SV *sv, char *strpos, + char *strend, U32 flags, re_scream_pos_data *data) +{ + return NULL; +} + +SV * +Plugin_checkstr(pTHX_ regexp *prog) +{ + return NULL; +} + +void +Plugin_free(pTHX_ struct regexp *r) +{ + /*sv_2mortal(r->pprivate);*/ + /*PerlMemShared_free(r->pprivate);*/ +} + +void * +Plugin_dupe(pTHX_ const regexp *r, CLONE_PARAMS *param) +{ + return r->pprivate; +} + +SV* +Plugin_numbered_buff_get(pTHX_ const REGEXP * const rx, I32 paren, SV* usesv) +{ + return NULL; +} + +SV* +Plugin_named_buff_get(pTHX_ const REGEXP * const rx, SV* namesv, U32 flags) +{ + return NULL; +} + +/* + * The function pointers we're telling the regex engine to use + */ +const regexp_engine engine_plugin = { + Plugin_comp, + Plugin_exec, + Plugin_intuit, + Plugin_checkstr, + Plugin_free, + Plugin_numbered_buff_get, + Plugin_named_buff_get, +#if defined(USE_ITHREADS) + Plugin_dupe, +#endif +}; + +MODULE = re::engine::Plugin PACKAGE = re::engine::Plugin + +SV * +pattern(re::engine::Plugin self, ...) +CODE: + SvREFCNT_inc(self->pattern); + RETVAL = self->pattern; +OUTPUT: + RETVAL + +char* +flags(re::engine::Plugin self, ...) +CODE: + RETVAL = self->flags; +OUTPUT: + RETVAL + +SV * +stash(re::engine::Plugin self, ...) +PREINIT: + SV * stash; +CODE: + if (items > 1) { + self->stash = sv_mortalcopy(ST(1)); + SvREFCNT_inc(self->stash); + } + SvREFCNT_inc(self->stash); + RETVAL = self->stash; +OUTPUT: + RETVAL + +SV * +minlen(re::engine::Plugin self, ...) +CODE: + if (items > 1) { + self->minlen = (I32)SvIV(ST(1)); + } + + RETVAL = self->minlen ? newSViv(self->minlen) : &PL_sv_undef; +OUTPUT: + RETVAL + +SV * +gofs(re::engine::Plugin self, ...) +CODE: + if (items > 1) { + self->gofs = (U32)SvIV(ST(1)); + } + RETVAL = self->gofs ? newSVuv(self->gofs) : &PL_sv_undef; +OUTPUT: + RETVAL + +SV * +nparens(re::engine::Plugin self, ...) +CODE: + if (items > 1) { + self->nparens = (U32)SvIV(ST(1)); + } + RETVAL = self->gofs ? newSVuv(self->gofs) : &PL_sv_undef; +OUTPUT: + RETVAL + +void +captures(re::engine::Plugin self, ...) +PPCODE: + if (items > 1) { + self->minlen = (I32)SvIV(ST(1)); + } + XPUSHs(sv_2mortal(newSViv(5))); + XPUSHs(sv_2mortal(newSViv(10))); + +void +get_engine_plugin() +PPCODE: + XPUSHs(sv_2mortal(newSViv(PTR2IV(&engine_plugin)))); diff --git a/TODO b/TODO new file mode 100644 index 0000000..d06b5d3 --- /dev/null +++ b/TODO @@ -0,0 +1,19 @@ +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 diff --git a/contrib/capture_hook.patch b/contrib/capture_hook.patch new file mode 100644 index 0000000..effa781 --- /dev/null +++ b/contrib/capture_hook.patch @@ -0,0 +1,303 @@ +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; inparens) >= 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; inparens) >= 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 \ diff --git a/inc/Module/AutoInstall.pm b/inc/Module/AutoInstall.pm new file mode 100644 index 0000000..7efc552 --- /dev/null +++ b/inc/Module/AutoInstall.pm @@ -0,0 +1,768 @@ +#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() : == 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 () { 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 diff --git a/inc/Module/Install.pm b/inc/Module/Install.pm new file mode 100644 index 0000000..0330b0e --- /dev/null +++ b/inc/Module/Install.pm @@ -0,0 +1,281 @@ +#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.64'; +} + +# 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 ( ) { + $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; diff --git a/inc/Module/Install/AutoInstall.pm b/inc/Module/Install/AutoInstall.pm new file mode 100644 index 0000000..f36f564 --- /dev/null +++ b/inc/Module/Install/AutoInstall.pm @@ -0,0 +1,61 @@ +#line 1 +package Module::Install::AutoInstall; + +use strict; +use Module::Install::Base; + +use vars qw{$VERSION $ISCORE @ISA}; +BEGIN { + $VERSION = '0.64'; + $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; diff --git a/inc/Module/Install/Base.pm b/inc/Module/Install/Base.pm new file mode 100644 index 0000000..30a24ca --- /dev/null +++ b/inc/Module/Install/Base.pm @@ -0,0 +1,70 @@ +#line 1 +package Module::Install::Base; + +$VERSION = '0.64'; + +# 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 diff --git a/inc/Module/Install/Can.pm b/inc/Module/Install/Can.pm new file mode 100644 index 0000000..1c01e22 --- /dev/null +++ b/inc/Module/Install/Can.pm @@ -0,0 +1,82 @@ +#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.64'; + $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 diff --git a/inc/Module/Install/Fetch.pm b/inc/Module/Install/Fetch.pm new file mode 100644 index 0000000..24c0c02 --- /dev/null +++ b/inc/Module/Install/Fetch.pm @@ -0,0 +1,93 @@ +#line 1 +package Module::Install::Fetch; + +use strict; +use Module::Install::Base; + +use vars qw{$VERSION $ISCORE @ISA}; +BEGIN { + $VERSION = '0.64'; + $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; diff --git a/inc/Module/Install/Include.pm b/inc/Module/Install/Include.pm new file mode 100644 index 0000000..f4c83a3 --- /dev/null +++ b/inc/Module/Install/Include.pm @@ -0,0 +1,34 @@ +#line 1 +package Module::Install::Include; + +use strict; +use Module::Install::Base; + +use vars qw{$VERSION $ISCORE @ISA}; +BEGIN { + $VERSION = '0.64'; + $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; diff --git a/inc/Module/Install/Makefile.pm b/inc/Module/Install/Makefile.pm new file mode 100644 index 0000000..96c7e17 --- /dev/null +++ b/inc/Module/Install/Makefile.pm @@ -0,0 +1,208 @@ +#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.64'; + $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"; + } + + my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args; + if ($self->admin->preop) { + $args{dist} = $self->admin->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 $/; }; + 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 334 diff --git a/inc/Module/Install/Makefile/Version.pm b/inc/Module/Install/Makefile/Version.pm new file mode 100644 index 0000000..d5dc7e0 --- /dev/null +++ b/inc/Module/Install/Makefile/Version.pm @@ -0,0 +1,42 @@ +#line 1 +package Module::Install::Makefile::Version; + +use Module::Install::Base; +@ISA = qw(Module::Install::Base); + +$VERSION = '0.64'; + +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; diff --git a/inc/Module/Install/Metadata.pm b/inc/Module/Install/Metadata.pm new file mode 100644 index 0000000..6c80832 --- /dev/null +++ b/inc/Module/Install/Metadata.pm @@ -0,0 +1,315 @@ +#line 1 +package Module::Install::Metadata; + +use strict 'vars'; +use Module::Install::Base; + +use vars qw{$VERSION $ISCORE @ISA}; +BEGIN { + $VERSION = '0.64'; + $ISCORE = 1; + @ISA = qw{Module::Install::Base}; +} + +my @scalar_keys = qw{ + name module_name abstract author version license + distribution_type perl_version tests +}; + +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 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 $/; }; +} + +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}{<}g; + $author =~ s{E}{>}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', + ); + 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; diff --git a/inc/Module/Install/Win32.pm b/inc/Module/Install/Win32.pm new file mode 100644 index 0000000..2ec7d66 --- /dev/null +++ b/inc/Module/Install/Win32.pm @@ -0,0 +1,65 @@ +#line 1 +package Module::Install::Win32; + +use strict; +use Module::Install::Base; + +use vars qw{$VERSION $ISCORE @ISA}; +BEGIN { + $VERSION = '0.64'; + $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; diff --git a/inc/Module/Install/WriteAll.pm b/inc/Module/Install/WriteAll.pm new file mode 100644 index 0000000..3546e61 --- /dev/null +++ b/inc/Module/Install/WriteAll.pm @@ -0,0 +1,43 @@ +#line 1 +package Module::Install::WriteAll; + +use strict; +use Module::Install::Base; + +use vars qw{$VERSION $ISCORE @ISA}; +BEGIN { + $VERSION = '0.64'; + $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; diff --git a/t/00-compile.t b/t/00-compile.t new file mode 100644 index 0000000..f43f2dc --- /dev/null +++ b/t/00-compile.t @@ -0,0 +1,5 @@ +use strict; + +use Test::More tests => 1; + +use_ok 're::engine::Plugin'; diff --git a/t/captures.t b/t/captures.t new file mode 100644 index 0000000..0077b94 --- /dev/null +++ b/t/captures.t @@ -0,0 +1,34 @@ +=pod + +Test the B 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; +} diff --git a/t/eval-comp.t b/t/eval-comp.t new file mode 100644 index 0000000..deebdd3 --- /dev/null +++ b/t/eval-comp.t @@ -0,0 +1,29 @@ +=pod + +Having C catch C in one of the callbacks when called +indirectly as C doesn't work. This is not at all surprising +since the eventual call to the callback sub is not exectuted within +the context that C appeared in, but there's a test for it +anyway. + +The other eval tests are just copies of this one made because the +interpreter can only die so many times per process. + +=cut + +use strict; + +use Test::More skip_all => 'TODO: make this work'; +#use Test::More tests => 1; + +use re::engine::Plugin ( + comp => sub { die "died at comp time" }, + exec => sub { 1 }, +); + +eval { /noes/ }; + +TODO: { + local $TODO = 'passing tests for known bug with how we handle eval'; + pass; +} diff --git a/t/eval-exec.t b/t/eval-exec.t new file mode 100644 index 0000000..426be1e --- /dev/null +++ b/t/eval-exec.t @@ -0,0 +1,19 @@ +=pod + +Copy of F that tests another callback sub. + +=cut + +use strict; + +use Test::More tests => 1; + +use re::engine::Plugin ( + comp => sub {}, + exec => sub { die "died at exec time" }, +); + +eval { 'oh' =~ /noes/ }; +ok index($@ => 'at exec') => 'die in exec works'; + + diff --git a/t/flags.t b/t/flags.t new file mode 100644 index 0000000..7d04c32 --- /dev/null +++ b/t/flags.t @@ -0,0 +1,59 @@ +=pod + +Test the B 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; diff --git a/t/import.t b/t/import.t new file mode 100644 index 0000000..04cb7f2 --- /dev/null +++ b/t/import.t @@ -0,0 +1,62 @@ +=pod + +Test that lexical importing works, check BEGIN-ish stuff etc. + +=cut + +use strict; + +use Data::Dumper; + +use Test::More tests => 7; + +use re::engine::Plugin (); + +like "a", qr/^a$/, "import didn't run, perl's regex engine in effect"; + +BEGIN { + re::engine::Plugin->import( + comp => sub {}, # TODO: remove when this can be omitted + exec => sub { $_[0]->pattern eq $_[1] } + ); +} + +ok "^hello" =~ /^hello/ => "regex modified to match a literal pattern"; + +{ + BEGIN { + re::engine::Plugin->import( + comp => sub {}, # TODO: remove when this can be omitted + exec => sub { $_[0]->pattern ne $_[1] } + ); + } + + ok "^hello" !~ /^hello/ => "regex modified not to match a literal pattern"; + { + BEGIN { + re::engine::Plugin->import( + comp => sub {}, # TODO: remove when this can be omitted + exec => sub { $_[0]->pattern eq '^[abc]$' } + ); + } + ok "whatever" =~ /^[abc]$/ => "regex modified to match some exact nonsense"; + BEGIN { re::engine::Plugin->unimport }; + ok "whatever" !~ /^[abc]$/ => "regex modified to match some exact nonsense unimported"; + } + ok "^hello" !~ /^hello/ => "regex modified not to match a literal pattern"; +} + +ok "^hello" =~ /^hello/ => "regex modified to match a literal pattern"; + + + + + + + + + + + + + diff --git a/t/methods.t b/t/methods.t new file mode 100644 index 0000000..56de947 --- /dev/null +++ b/t/methods.t @@ -0,0 +1,62 @@ +=pod + +Tests methods on the re object + +=cut + +use strict; + +use feature ':5.10'; + +use Test::More 'no_plan';#tests => 6; + +use re::engine::Plugin ( + comp => sub { + my $re = shift; + + # Use a stash to pass a single scalar value to each executing + # routine, references work perfectly a reference to anything + # can be passed as well + $re->stash( { x => 5, y => sub { 6 } } ); + + # Return value not used for now.. + }, + exec => sub { + my ($re, $str) = @_; + + # pattern + cmp_ok($re->pattern, 'eq', ' foobar zoobar ' => '->pattern ok'); + + # flags + my $f = $re->flags; + like $f, qr/i/, 'str flags /i'; + like $f, qr/x/, 'str flags /x'; + like $f, qr/^[cgimosx]+$/, 'flags contain all-good characters'; + + # stash + cmp_ok($re->stash->{"x"}, '==', 5, "data correct in stash"); + cmp_ok(ref $re->stash->{"y"}, 'eq', 'CODE', "data correct in stash"); + cmp_ok(ref $re->stash->{"y"}, 'eq', 'CODE', "data correct in stash"); + cmp_ok($re->stash->{"y"}->(), '==', 6, "data correct in stash"); + + # This needs a less sucky name + # + # Pattern: ' foobar zoobar ', set $1 to "foobar" (if I counted this right:) +# $re->offset_captures( [1, 7], ... ); + + # This name sucks as well +# $re->named_captures2offset_captures( myNameIs => 0 ): # $+{myNameIs} = $1 + + # Pattern contains "foo", "bar" and "zoo", return a true + return $re->pattern =~ /zoo/; + } +); + +my $re = qr< foobar zoobar >xi; + +if ("input" =~ $re ) { + pass 'pattern matched'; +} else { + fail "pattern didn't match"; +} + diff --git a/t/minlen-get.t b/t/minlen-get.t new file mode 100644 index 0000000..f56e8ed --- /dev/null +++ b/t/minlen-get.t @@ -0,0 +1,18 @@ +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/; diff --git a/t/minlen-set.t b/t/minlen-set.t new file mode 100644 index 0000000..51fa823 --- /dev/null +++ b/t/minlen-set.t @@ -0,0 +1,14 @@ +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/; diff --git a/typemap b/typemap new file mode 100644 index 0000000..fc3a3fa --- /dev/null +++ b/typemap @@ -0,0 +1 @@ +re::engine::Plugin T_PTROBJ \ No newline at end of file