In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/f828ccba708aa823170a00f5a5fb04a26c9283af?hp=19db9fb7213e8d346c88f2b573e378f35d81ffcf>

- Log -----------------------------------------------------------------
commit f828ccba708aa823170a00f5a5fb04a26c9283af
Author: Father Chrysostomos <spr...@cpan.org>
Date:   Sat Feb 25 14:39:49 2012 -0800

    Make CPAN upstream for File::Temp
    
    It was set to undef, which meant it hadn’t been discussed.  In actuality,
    it is actively maintained on CPAN.  See, for instance:
    
        https://rt.cpan.org/Ticket/Display.html?id=75077#txn-1038945
    
    So this brings Maintainers.pl closer in line with reality.

M       Porting/Maintainers.pl

commit da5b542134ae843ebd50725db33b1ce6d82af1c1
Author: Father Chrysostomos <spr...@cpan.org>
Date:   Sat Feb 25 14:26:13 2012 -0800

    Don’t ‘normalise’ hints for bare ‘no feature’
    
    ‘Normalise’ in this case means to set $^H to indicate that features
    are in %^H (FEATURE_BUNDLE_CUSTOM) and to make %^H contain the current
    feature set.
    
    Since ‘no feature’ sets the default feature bundle in $^H, this is
    unnecessary in that case.

M       lib/feature.pm
M       regen/feature.pl

commit 5d826eaef15535c7ea548c9031da0da0406c4941
Author: Father Chrysostomos <spr...@cpan.org>
Date:   Sat Feb 25 14:14:07 2012 -0800

    regen/feature.pl: Show perl.h line num in error msg

M       regen/feature.pl

commit 1b8bf4b95ca70500e1f934a23727e6fb49e6cbb9
Author: Father Chrysostomos <spr...@cpan.org>
Date:   Sat Feb 25 14:00:30 2012 -0800

    perlfunc: bad wording
    
    It is not features not in the current version, but those not in the
    requested version, that are disabled.

M       pod/perlfunc.pod

commit a7817fa3bc92202fa7b11fd83717c607b65b350e
Author: Father Chrysostomos <spr...@cpan.org>
Date:   Sat Feb 25 13:57:30 2012 -0800

    arybase.xs: Wrap PL_check safely

M       ext/arybase/arybase.xs

commit 841c0ede23566f9d4de8e23339bb9e9c45daa920
Author: Father Chrysostomos <spr...@cpan.org>
Date:   Sat Feb 25 13:54:51 2012 -0800

    Increase $arybase::VERSION to 0.05

M       ext/arybase/arybase.pm
-----------------------------------------------------------------------

Summary of changes:
 Porting/Maintainers.pl |    2 +-
 ext/arybase/arybase.pm |    2 +-
 ext/arybase/arybase.xs |    4 ++--
 lib/feature.pm         |   10 +++++-----
 pod/perlfunc.pod       |    2 +-
 regen/feature.pl       |   12 ++++++------
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 928dd63..ee8da8a 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -841,7 +841,7 @@ use File::Glob qw(:case);
                 misc/results.txt
                 ),
         ],
-        'UPSTREAM' => undef,
+        'UPSTREAM' => 'cpan',
     },
 
     'FileCache' => {
diff --git a/ext/arybase/arybase.pm b/ext/arybase/arybase.pm
index bab376c..1008684 100644
--- a/ext/arybase/arybase.pm
+++ b/ext/arybase/arybase.pm
@@ -1,6 +1,6 @@
 package arybase;
 
-our $VERSION = "0.04";
+our $VERSION = "0.05";
 
 require XSLoader;
 XSLoader::load(); # This returns true, which makes require happy.
diff --git a/ext/arybase/arybase.xs b/ext/arybase/arybase.xs
index 68b9cf9..cde9bb8 100644
--- a/ext/arybase/arybase.xs
+++ b/ext/arybase/arybase.xs
@@ -405,8 +405,8 @@ BOOT:
 #ifdef USE_ITHREADS
        MUTEX_INIT(&ab_op_map_mutex);
 #endif
-#define check(uc,lc,ck) ab_old_ck_##lc = PL_check[OP_##uc]; \
-                       PL_check[OP_##uc] = ab_ck_##ck
+#define check(uc,lc,ck) \
+               wrap_op_checker(OP_##uc, ab_ck_##ck, &ab_old_ck_##lc)
        check(SASSIGN,  sassign,  sassign);
        check(AASSIGN,  aassign,  aassign);
        check(AELEM,    aelem,    base);
diff --git a/lib/feature.pm b/lib/feature.pm
index 33f48dc..58380e9 100644
--- a/lib/feature.pm
+++ b/lib/feature.pm
@@ -348,17 +348,17 @@ sub import {
 sub unimport {
     my $class = shift;
 
-    if (my $features = current_bundle) {
-       # Features are enabled implicitly via bundle hints.
-       normalise_hints $features;
-    }
-
     # A bare C<no feature> should reset to the default bundle
     if (!@_) {
        $^H &= ~($hint_uni8bit|$hint_mask);
        return;
     }
 
+    if (my $features = current_bundle) {
+       # Features are enabled implicitly via bundle hints.
+       normalise_hints $features;
+    }
+
     while (@_) {
         my $name = shift;
         if (substr($name, 0, 1) eq ":") {
diff --git a/pod/perlfunc.pod b/pod/perlfunc.pod
index 80d564d..fcab06b 100644
--- a/pod/perlfunc.pod
+++ b/pod/perlfunc.pod
@@ -8427,7 +8427,7 @@ C<use>ing library modules that won't work with older 
versions of Perl.
 
 C<use VERSION> also enables all features available in the requested
 version as defined by the C<feature> pragma, disabling any features
-not in the current version's feature bundle.  See L<feature>.
+not in the requested version's feature bundle.  See L<feature>.
 Similarly, if the specified Perl version is greater than or equal to
 5.11.0, strictures are enabled lexically as
 with C<use strict>.  Any explicit use of
diff --git a/regen/feature.pl b/regen/feature.pl
index f362396..aaac912 100755
--- a/regen/feature.pl
+++ b/regen/feature.pl
@@ -106,7 +106,7 @@ while (readline "perl.h") {
            length sprintf "%b", scalar keys %UniqueBundles;
        $bits =~ /1{$bits_needed}/
            or die "Not enough bits (need $bits_needed)"
-                . " in $bits (binary for $hex):\n\n$_\n";
+                . " in $bits (binary for $hex):\n\n$_\n ";
     }
     if ($Uni8Bit && $HintMask) { last }
 }
@@ -632,17 +632,17 @@ sub import {
 sub unimport {
     my $class = shift;
 
-    if (my $features = current_bundle) {
-       # Features are enabled implicitly via bundle hints.
-       normalise_hints $features;
-    }
-
     # A bare C<no feature> should reset to the default bundle
     if (!@_) {
        $^H &= ~($hint_uni8bit|$hint_mask);
        return;
     }
 
+    if (my $features = current_bundle) {
+       # Features are enabled implicitly via bundle hints.
+       normalise_hints $features;
+    }
+
     while (@_) {
         my $name = shift;
         if (substr($name, 0, 1) eq ":") {

--
Perl5 Master Repository

Reply via email to