This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Remove union _xivu from struct regexp - replace it with a non-union paren_names.
authorNicholas Clark <nick@ccl4.org>
Tue, 26 Jan 2010 16:28:59 +0000 (16:28 +0000)
committerNicholas Clark <nick@ccl4.org>
Fri, 21 May 2010 06:03:52 +0000 (07:03 +0100)
This was the only user of xivu_hv in union _xivu, so remove that too.

regexp.h
sv.h

index 5d84358..502259f 100644 (file)
--- a/regexp.h
+++ b/regexp.h
@@ -70,6 +70,7 @@ typedef struct regexp_paren_pair {
         /* 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 */ \
@@ -103,14 +104,10 @@ typedef struct regexp_paren_pair {
 
 typedef struct regexp {
        _XPV_HEAD;
-       union _xivu xiv_u;
        _REGEXP_COMMON;
 } regexp;
 
-/*        HV *paren_names;      Optional hash of paren names
-         now stored in the IV union */
-
-#define RXp_PAREN_NAMES(rx)    ((rx)->xiv_u.xivu_hv)
+#define RXp_PAREN_NAMES(rx)    ((rx)->paren_names)
 
 /* used for high speed searches */
 typedef struct re_scream_pos_data_s
diff --git a/sv.h b/sv.h
index 7793e29..d5872c9 100644 (file)
--- a/sv.h
+++ b/sv.h
@@ -420,7 +420,6 @@ union _xivu {
     UV     xivu_uv;
     I32            xivu_i32;
     HEK *   xivu_namehek;      /* xpvlv, xpvgv: GvNAME */
-    HV *    xivu_hv;           /* regexp: paren_names */
 };
 
 union _xmgu {