From: Vincent Pit Date: Wed, 1 Oct 2014 23:12:59 +0000 (+0200) Subject: Inline Plugin.h inside Plugin.xs X-Git-Tag: v0.10~4 X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Fre-engine-Plugin.git;a=commitdiff_plain;h=1563077bd33bb07b7ef50968c22739c722452769 Inline Plugin.h inside Plugin.xs Plugin.h is removed. --- diff --git a/MANIFEST b/MANIFEST index 23d61a0..ef1f393 100644 --- a/MANIFEST +++ b/MANIFEST @@ -3,7 +3,6 @@ MANIFEST MANIFEST.SKIP META.yml Makefile.PL -Plugin.h Plugin.pm Plugin.pod Plugin.xs diff --git a/Plugin.h b/Plugin.h deleted file mode 100644 index aad712e..0000000 --- a/Plugin.h +++ /dev/null @@ -1,97 +0,0 @@ -#define GET_SELF_FROM_PPRIVATE(pprivate) \ - re__engine__Plugin self; \ - SELF_FROM_PPRIVATE(self,pprivate); - -/* re__engine__Plugin self; SELF_FROM_PPRIVATE(self,rx->pprivate) */ -#define SELF_FROM_PPRIVATE(self, pprivate) \ - if (sv_isobject(pprivate)) { \ - SV * ref = SvRV((SV*)pprivate); \ - IV tmp = SvIV((SV*)ref); \ - self = INT2PTR(re__engine__Plugin,tmp); \ - } else { \ - Perl_croak(aTHX_ "Not an object"); \ - } - -START_EXTERN_C -EXTERN_C const regexp_engine engine_plugin; -#if PERL_VERSION <= 10 -EXTERN_C REGEXP * Plugin_comp(pTHX_ const SV * const, const U32); -#else -EXTERN_C REGEXP * Plugin_comp(pTHX_ SV * const, U32); -#endif -EXTERN_C I32 Plugin_exec(pTHX_ REGEXP * const, char *, char *, - char *, I32, SV *, void *, U32); -EXTERN_C char * Plugin_intuit(pTHX_ REGEXP * const, SV *, char *, - char *, U32, re_scream_pos_data *); -EXTERN_C SV * Plugin_checkstr(pTHX_ REGEXP * const); -EXTERN_C void Plugin_free(pTHX_ REGEXP * const); -EXTERN_C void * Plugin_dupe(pTHX_ REGEXP * const, CLONE_PARAMS *); -EXTERN_C void Plugin_numbered_buff_FETCH(pTHX_ REGEXP * const, - const I32, SV * const); -EXTERN_C void Plugin_numbered_buff_STORE(pTHX_ REGEXP * const, - const I32, SV const * const); -EXTERN_C I32 Plugin_numbered_buff_LENGTH(pTHX_ REGEXP * const, - const SV * const, const I32); -EXTERN_C SV * Plugin_named_buff (pTHX_ REGEXP * const, SV * const, - SV * const, const U32); -EXTERN_C SV * Plugin_named_buff_iter (pTHX_ REGEXP * const, const SV * const, - const U32); -EXTERN_C SV * Plugin_package(pTHX_ REGEXP * const); -#ifdef USE_ITHREADS -EXTERN_C void * Plugin_dupe(pTHX_ REGEXP * const, CLONE_PARAMS *); -#endif -END_EXTERN_C - -START_EXTERN_C -EXTERN_C const regexp_engine engine_plugin; -END_EXTERN_C - -#define RE_ENGINE_PLUGIN (&engine_plugin) -const regexp_engine engine_plugin = { - Plugin_comp, - Plugin_exec, - Plugin_intuit, - Plugin_checkstr, - Plugin_free, - Plugin_numbered_buff_FETCH, - Plugin_numbered_buff_STORE, - Plugin_numbered_buff_LENGTH, - Plugin_named_buff, - Plugin_named_buff_iter, - Plugin_package, -#if defined(USE_ITHREADS) - Plugin_dupe, -#endif -}; - -typedef struct replug { - /* Pointer back to the containing regexp struct so that accessors - * can modify nparens, gofs etc. */ - struct regexp * rx; - - /* A copy of the pattern given to comp, for ->pattern */ - SV * pattern; - - /* A copy of the string being matched against, for ->str */ - SV * str; - - /* The ->stash */ - SV * stash; - - /* Callbacks */ - SV * cb_exec; - SV * cb_free; - - /* ->num_captures */ - SV * cb_num_capture_buff_FETCH; - SV * cb_num_capture_buff_STORE; - SV * cb_num_capture_buff_LENGTH; -} *re__engine__Plugin; - -#if PERL_VERSION >= 11 -# define rxREGEXP(RX) (SvANY(RX)) -# define newREGEXP(RX) ((RX) = ((REGEXP*) newSV_type(SVt_REGEXP))) -#else -# define rxREGEXP(RX) (RX) -# define newREGEXP(RX) (Newxz((RX), 1, struct regexp)) -#endif diff --git a/Plugin.xs b/Plugin.xs index b7dd1d3..5095c73 100644 --- a/Plugin.xs +++ b/Plugin.xs @@ -6,8 +6,6 @@ #include "perl.h" #include "XSUB.h" -#include "Plugin.h" - #define __PACKAGE__ "re::engine::Plugin" #define __PACKAGE_LEN__ (sizeof(__PACKAGE__)-1) @@ -294,6 +292,106 @@ STATIC const rep_hint_t *rep_hint(pTHX) { return rep_detag(hint); } +/* --- Custom regexp engine ------------------------------------------------ */ + +#define GET_SELF_FROM_PPRIVATE(pprivate) \ + re__engine__Plugin self; \ + SELF_FROM_PPRIVATE(self,pprivate); + +/* re__engine__Plugin self; SELF_FROM_PPRIVATE(self,rx->pprivate) */ +#define SELF_FROM_PPRIVATE(self, pprivate) \ + if (sv_isobject(pprivate)) { \ + SV * ref = SvRV((SV*)pprivate); \ + IV tmp = SvIV((SV*)ref); \ + self = INT2PTR(re__engine__Plugin,tmp); \ + } else { \ + Perl_croak(aTHX_ "Not an object"); \ + } + +START_EXTERN_C +EXTERN_C const regexp_engine engine_plugin; +#if PERL_VERSION <= 10 +EXTERN_C REGEXP * Plugin_comp(pTHX_ const SV * const, const U32); +#else +EXTERN_C REGEXP * Plugin_comp(pTHX_ SV * const, U32); +#endif +EXTERN_C I32 Plugin_exec(pTHX_ REGEXP * const, char *, char *, + char *, I32, SV *, void *, U32); +EXTERN_C char * Plugin_intuit(pTHX_ REGEXP * const, SV *, char *, + char *, U32, re_scream_pos_data *); +EXTERN_C SV * Plugin_checkstr(pTHX_ REGEXP * const); +EXTERN_C void Plugin_free(pTHX_ REGEXP * const); +EXTERN_C void * Plugin_dupe(pTHX_ REGEXP * const, CLONE_PARAMS *); +EXTERN_C void Plugin_numbered_buff_FETCH(pTHX_ REGEXP * const, + const I32, SV * const); +EXTERN_C void Plugin_numbered_buff_STORE(pTHX_ REGEXP * const, + const I32, SV const * const); +EXTERN_C I32 Plugin_numbered_buff_LENGTH(pTHX_ REGEXP * const, + const SV * const, const I32); +EXTERN_C SV * Plugin_named_buff (pTHX_ REGEXP * const, SV * const, + SV * const, const U32); +EXTERN_C SV * Plugin_named_buff_iter (pTHX_ REGEXP * const, const SV * const, + const U32); +EXTERN_C SV * Plugin_package(pTHX_ REGEXP * const); +#ifdef USE_ITHREADS +EXTERN_C void * Plugin_dupe(pTHX_ REGEXP * const, CLONE_PARAMS *); +#endif +END_EXTERN_C + +START_EXTERN_C +EXTERN_C const regexp_engine engine_plugin; +END_EXTERN_C + +#define RE_ENGINE_PLUGIN (&engine_plugin) +const regexp_engine engine_plugin = { + Plugin_comp, + Plugin_exec, + Plugin_intuit, + Plugin_checkstr, + Plugin_free, + Plugin_numbered_buff_FETCH, + Plugin_numbered_buff_STORE, + Plugin_numbered_buff_LENGTH, + Plugin_named_buff, + Plugin_named_buff_iter, + Plugin_package, +#if defined(USE_ITHREADS) + Plugin_dupe, +#endif +}; + +typedef struct replug { + /* Pointer back to the containing regexp struct so that accessors + * can modify nparens, gofs etc. */ + struct regexp * rx; + + /* A copy of the pattern given to comp, for ->pattern */ + SV * pattern; + + /* A copy of the string being matched against, for ->str */ + SV * str; + + /* The ->stash */ + SV * stash; + + /* Callbacks */ + SV * cb_exec; + SV * cb_free; + + /* ->num_captures */ + SV * cb_num_capture_buff_FETCH; + SV * cb_num_capture_buff_STORE; + SV * cb_num_capture_buff_LENGTH; +} *re__engine__Plugin; + +#if PERL_VERSION >= 11 +# define rxREGEXP(RX) (SvANY(RX)) +# define newREGEXP(RX) ((RX) = ((REGEXP*) newSV_type(SVt_REGEXP))) +#else +# define rxREGEXP(RX) (RX) +# define newREGEXP(RX) (Newxz((RX), 1, struct regexp)) +#endif + REGEXP * #if PERL_VERSION <= 10 Plugin_comp(pTHX_ const SV * const pattern, const U32 flags)