From da5b542134ae843ebd50725db33b1ce6d82af1c1 Mon Sep 17 00:00:00 2001 From: Father Chrysostomos Date: Sat, 25 Feb 2012 14:26:13 -0800 Subject: =?UTF-8?q?Don=E2=80=99t=20=E2=80=98normalise=E2=80=99=20hints=20f?= =?UTF-8?q?or=20bare=20=E2=80=98no=20feature=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ‘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. --- lib/feature.pm | 10 +++++----- regen/feature.pl | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/feature.pm b/lib/feature.pm index 33f48dc021..58380e9db6 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 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/regen/feature.pl b/regen/feature.pl index 0844e44575..aaac912ca2 100755 --- a/regen/feature.pl +++ b/regen/feature.pl @@ -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 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 ":") { -- cgit v1.2.1