Change name of /d to DEPENDS

I much prefer David Golden's name for /d whose meaning 'depends' on
circumstances, instead of 'dual' meaning it could be one or another.
Change it before this gets out in a stable release, and we're stuck with
the old name.

diff --git a/regcomp.c b/regcomp.c
index c57256d..7d9e573 100644 (file)
--- a/regcomp.c
+++ b/regcomp.c
@@ -4478,7 +4478,7 @@ Perl_re_compile(pTHX_ SV * const pattern, U32 orig_pm_flags)
 #endif
 
     /* Set to use unicode semantics if the pattern is in utf8 and has the
-     * 'dual' charset specified, as it means unicode when utf8  */
+     * 'depends' charset specified, as it means unicode when utf8  */
     pm_flags = orig_pm_flags;
 
     if (RExC_utf8 && get_regex_charset(pm_flags) == REGEX_DEPENDS_CHARSET) {
@@ -6335,7 +6335,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp,U32 depth)
                        cs = REGEX_UNICODE_CHARSET;
                         has_charset_modifier = 1;
                         break;
-                    case DUAL_PAT_MOD:
+                    case DEPENDS_PAT_MOD:
                         if (has_use_defaults
                             || has_charset_modifier
                             || flagsp == &negflags)

diff --git a/regexp.h b/regexp.h
index b6dec71..d677ae8 100644 (file)
--- a/regexp.h
+++ b/regexp.h
@@ -257,7 +257,7 @@ and check for NULL.
 #define NONDESTRUCT_PAT_MOD  'r'
 #define LOCALE_PAT_MOD       'l'
 #define UNICODE_PAT_MOD      'u'
-#define DUAL_PAT_MOD         'd'
+#define DEPENDS_PAT_MOD      'd'
 
 #define ONCE_PAT_MODS        "o"
 #define KEEPCOPY_PAT_MODS    "p"
@@ -266,7 +266,7 @@ and check for NULL.
 #define NONDESTRUCT_PAT_MODS "r"
 #define LOCALE_PAT_MODS      "l"
 #define UNICODE_PAT_MODS     "u"
-#define DUAL_PAT_MODS        "d"
+#define DEPENDS_PAT_MODS     "d"
 
 /* This string is expected by regcomp.c to be ordered so that the first
  * character is the flag in bit RXf_PMf_STD_PMMOD_SHIFT of extflags; the next
@@ -311,7 +311,7 @@ get_regex_charset_name(const U32 flags, STRLEN* const lenp)
 
     *lenp = 1;
     switch (get_regex_charset(flags)) {
-        case REGEX_DEPENDS_CHARSET: return DUAL_PAT_MODS;
+        case REGEX_DEPENDS_CHARSET: return DEPENDS_PAT_MODS;
         case REGEX_LOCALE_CHARSET:  return LOCALE_PAT_MODS;
         case REGEX_UNICODE_CHARSET: return UNICODE_PAT_MODS;
     }