In perl.git, the branch blead has been updated

<https://perl5.git.perl.org/perl.git/commitdiff/e1168c111a3dbbf8383f433d611b13168096d280?hp=49ea76a70e8a4984b7d555bfbac872c0624b858c>

- Log -----------------------------------------------------------------
commit e1168c111a3dbbf8383f433d611b13168096d280
Author: David Mitchell <da...@iabyn.com>
Date:   Tue Mar 6 15:50:21 2018 +0000

    eliminate _REGEXP_COMMON macro from regexp.h
    
    It is used in only one place now, so its better to expand it out rather
    than having a complex struct's fields defined using a huge macro.
    
    No functional changes, but I did take the opportunity to tidy up the
    formatting of the code comments for each struct field

-----------------------------------------------------------------------

Summary of changes:
 regexp.h | 106 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 58 insertions(+), 48 deletions(-)

diff --git a/regexp.h b/regexp.h
index b22ada5c6b..c7112d3f58 100644
--- a/regexp.h
+++ b/regexp.h
@@ -105,57 +105,67 @@ struct reg_code_blocks {
   regexp's data array based on the data item's type.
 */
 
-#define _REGEXP_COMMON                                                 \
-        /* what engine created this regexp? */                         \
-       const struct regexp_engine* engine;                             \
-       REGEXP *mother_re; /* what re is this a lightweight copy of? */ \
-       HV *paren_names;   /* Optional hash of paren names */           \
-        /*--------------------------------------------------------*/    \
-       /* Information about the match that the perl core uses to */    \
-       /* manage things */                                             \
-       U32 extflags;   /* Flags used both externally and internally */ \
-       SSize_t minlen; /* mininum possible number of chars in string to match 
*/\
-       SSize_t minlenret; /* mininum possible number of chars in $& */         
\
-       STRLEN gofs;    /* chars left of pos that we search from */     \
-       /* substring data about strings that must appear in the */      \
-       /* final match, used for optimisations */                       \
-       struct reg_substr_data *substrs;                                \
-       U32 nparens;    /* number of capture buffers */                 \
-       /* private engine specific data */                              \
-       U32 intflags;   /* Engine Specific Internal flags */            \
-       void *pprivate; /* Data private to the regex engine which */    \
-                       /* created this object. */                      \
-        /*--------------------------------------------------------*/    \
-       /* Data about the last/current match. These are modified */     \
-       /* during matching */                                           \
-       U32 lastparen;                  /* last open paren matched */   \
-       U32 lastcloseparen;             /* last close paren matched */  \
-       /* Array of offsets for (@-) and (@+) */                        \
-       regexp_paren_pair *offs;                                        \
-        char **recurse_locinput; /* used to detect infinite recursion, XXX: 
move to internal */ \
-        /*--------------------------------------------------------*/    \
-       /* saved or original string so \digit works forever. */         \
-       char *subbeg;                                                   \
-       SV_SAVED_COPY   /* If non-NULL, SV which is COW from original */\
-       SSize_t sublen; /* Length of string pointed by subbeg */        \
-       SSize_t suboffset; /* byte offset of subbeg from logical start of str 
*/ \
-       SSize_t subcoffset; /* suboffset equiv, but in chars (for @-/@+) */ \
-       /* Information about the match that isn't often used */         \
-        SSize_t maxlen;        /* mininum possible number of chars in string 
to match */\
-        /*--------------------------------------------------------*/    \
-       /* offset from wrapped to the start of precomp */               \
-       PERL_BITFIELD32 pre_prefix:4;                                   \
-        /* original flags used to compile the pattern, may differ */    \
-        /* from extflags in various ways */                             \
-        PERL_BITFIELD32 compflags:9;                                    \
-        /*--------------------------------------------------------*/    \
-       CV *qr_anoncv   /* the anon sub wrapped round qr/(?{..})/ */
-
 typedef struct regexp {
-       _XPV_HEAD;
-       _REGEXP_COMMON;
+    _XPV_HEAD;
+    const struct regexp_engine* engine; /* what engine created this regexp? */
+    REGEXP *mother_re; /* what re is this a lightweight copy of? */
+    HV *paren_names;   /* Optional hash of paren names */
+
+    /*----------------------------------------------------------------------
+     * Information about the match that the perl core uses to manage things
+     */
+
+    U32 extflags;      /* Flags used both externally and internally */
+    SSize_t minlen;    /* minimum possible number of chars in string to match 
*/
+    SSize_t minlenret; /* mininum possible number of chars in $& */
+    STRLEN gofs;       /* chars left of pos that we search from */
+                       /* substring data about strings that must appear in
+                        * the final match, used for optimisations */
+    struct reg_substr_data *substrs;
+    U32 nparens;       /* number of capture buffers */
+
+    /* private engine specific data */
+
+    U32 intflags;      /* Engine Specific Internal flags */
+    void *pprivate;    /* Data private to the regex engine which
+                        * created this object. */
+
+    /*----------------------------------------------------------------------
+     * Data about the last/current match. These are modified during matching
+     */
+
+    U32 lastparen;           /* last open paren matched */
+    U32 lastcloseparen;      /* last close paren matched */
+    regexp_paren_pair *offs; /* Array of offsets for (@-) and (@+) */
+    char **recurse_locinput; /* used to detect infinite recursion, XXX: move 
to internal */
+
+    /*---------------------------------------------------------------------- */
+
+    char *subbeg;       /* saved or original string so \digit works forever. */
+    SV_SAVED_COPY       /* If non-NULL, SV which is COW from original */
+    SSize_t sublen;     /* Length of string pointed by subbeg */
+    SSize_t suboffset;  /* byte offset of subbeg from logical start of str */
+    SSize_t subcoffset; /* suboffset equiv, but in chars (for @-/@+) */
+
+    /* Information about the match that isn't often used */
+
+    SSize_t maxlen;  /* minimum possible number of chars in string to match */
+
+    /*---------------------------------------------------------------------- */
+
+    /* offset from wrapped to the start of precomp */
+    PERL_BITFIELD32 pre_prefix:4;
+
+    /* original flags used to compile the pattern, may differ from
+     * extflags in various ways */
+    PERL_BITFIELD32 compflags:9;
+
+    /*---------------------------------------------------------------------- */
+
+    CV *qr_anoncv;      /* the anon sub wrapped round qr/(?{..})/ */
 } regexp;
 
+
 #define RXp_PAREN_NAMES(rx)    ((rx)->paren_names)
 
 /* used for high speed searches */

-- 
Perl5 Master Repository

Reply via email to