This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
.pm: rename variables to reflect expanded usage
authorKarl Williamson <public@khwilliamson.com>
Sun, 26 Dec 2010 17:28:31 +0000 (10:28 -0700)
committerKarl Williamson <public@khwilliamson.com>
Sun, 16 Jan 2011 23:36:43 +0000 (16:36 -0700)
Certain variables have /dul in their names.  /a is about to be added;
and maybe more, so give a more generic name to avoid future confusion

ext/re/re.pm
op.c

index 13f2de6..886f0a2 100644 (file)
@@ -142,24 +142,24 @@ sub bits {
            re->export_to_level(2, 're', $s);
        } elsif ($s =~ s/^\///) {
            my $reflags = $^H{reflags} || 0;
-           my $seen_dul;
+           my $seen_charset;
            for(split//, $s) {
                if (/[dul]/) {
                    if ($on) {
-                       if ($seen_dul && $seen_dul ne $_) {
+                       if ($seen_charset && $seen_charset ne $_) {
                            require Carp;
                            Carp::carp(
-                             qq 'The "$seen_dul" and "$_" flags '
+                             qq 'The "$seen_charset" and "$_" flags '
                             .qq 'are exclusive'
                            );
                        }
-                       $^H{reflags_dul} = $reflags{$_};
-                       $seen_dul = $_;
+                       $^H{reflags_charset} = $reflags{$_};
+                       $seen_charset = $_;
                    }
                    else {
-                       delete $^H{reflags_dul}
-                        if  defined $^H{reflags_dul}
-                         && $^H{reflags_dul} == $reflags{$_};
+                       delete $^H{reflags_charset}
+                        if  defined $^H{reflags_charset}
+                         && $^H{reflags_charset} == $reflags{$_};
                    }
                } elsif (exists $reflags{$_}) {
                    $on
@@ -173,7 +173,7 @@ sub bits {
                    next ARG;
                }
            }
-           ($^H{reflags} = $reflags or defined $^H{reflags_dul})
+           ($^H{reflags} = $reflags or defined $^H{reflags_charset})
             ? $^H |= $flags_hint
             : ($^H &= ~$flags_hint);
        } else {
diff --git a/op.c b/op.c
index 236d4fe..371c1e6 100644 (file)
--- a/op.c
+++ b/op.c
@@ -3789,7 +3789,7 @@ Perl_newPMOP(pTHX_ I32 type, I32 flags)
         );
         if (reflags && SvOK(reflags)) pmop->op_pmflags |= SvIV(reflags);
         reflags = Perl_refcounted_he_fetch_pvn(aTHX_
-         PL_compiling.cop_hints_hash, STR_WITH_LEN("reflags_dul"), 0, 0
+         PL_compiling.cop_hints_hash, STR_WITH_LEN("reflags_charset"), 0, 0
         );
         if (reflags && SvOK(reflags)) {
             pmop->op_pmflags &= ~(RXf_PMf_LOCALE|RXf_PMf_UNICODE);