summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Signes <rjbs@semiotic.systems>2021-10-09 17:12:31 -0400
committerRicardo Signes <rjbs@semiotic.systems>2021-11-02 14:19:43 -0400
commitcdba169fcf0819be8f02efe3edc7aac796fb9433 (patch)
tree190c00bf8c027ae42a05669251bd0c4cca71b2b0
parent731a976bef573afb7b94562b4b34473f6b714d5d (diff)
downloadperl-cdba169fcf0819be8f02efe3edc7aac796fb9433.tar.gz
feature: remove indirect and multidimensional in v5.36
-rw-r--r--feature.h4
-rw-r--r--lib/feature.pm9
-rwxr-xr-xregen/feature.pl7
3 files changed, 11 insertions, 9 deletions
diff --git a/feature.h b/feature.h
index 23cc5f3d31..0c157f7364 100644
--- a/feature.h
+++ b/feature.h
@@ -113,7 +113,7 @@
#define FEATURE_INDIRECT_IS_ENABLED \
( \
- CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_535 \
+ CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_527 \
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
FEATURE_IS_ENABLED_MASK(FEATURE_INDIRECT_BIT)) \
)
@@ -178,7 +178,7 @@
#define FEATURE_MULTIDIMENSIONAL_IS_ENABLED \
( \
- CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_535 \
+ CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_527 \
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
FEATURE_IS_ENABLED_MASK(FEATURE_MULTIDIMENSIONAL_BIT)) \
)
diff --git a/lib/feature.pm b/lib/feature.pm
index fc1d984d3e..181eb42e3a 100644
--- a/lib/feature.pm
+++ b/lib/feature.pm
@@ -5,7 +5,7 @@
package feature;
-our $VERSION = '1.68';
+our $VERSION = '1.69';
our %feature = (
fc => 'feature_fc',
@@ -35,7 +35,7 @@ our %feature_bundle = (
"5.15" => [qw(bareword_filehandles current_sub evalbytes fc indirect multidimensional say state switch unicode_eval unicode_strings)],
"5.23" => [qw(bareword_filehandles current_sub evalbytes fc indirect multidimensional postderef_qq say state switch unicode_eval unicode_strings)],
"5.27" => [qw(bareword_filehandles bitwise current_sub evalbytes fc indirect multidimensional postderef_qq say state switch unicode_eval unicode_strings)],
- "5.35" => [qw(bareword_filehandles bitwise current_sub evalbytes fc indirect multidimensional postderef_qq say state unicode_eval unicode_strings)],
+ "5.35" => [qw(bareword_filehandles bitwise current_sub evalbytes fc postderef_qq say state unicode_eval unicode_strings)],
"all" => [qw(bareword_filehandles bitwise current_sub declared_refs defer evalbytes fc indirect isa multidimensional postderef_qq refaliasing say signatures state switch try unicode_eval unicode_strings)],
"default" => [qw(bareword_filehandles indirect multidimensional)],
);
@@ -511,9 +511,8 @@ The following feature bundles are available:
unicode_strings
:5.36 bareword_filehandles bitwise current_sub
- evalbytes fc indirect multidimensional
- postderef_qq say state unicode_eval
- unicode_strings
+ evalbytes fc postderef_qq say state
+ unicode_eval unicode_strings
The C<:default> bundle represents the feature set that is enabled before
any C<use feature> or C<no feature> declaration.
diff --git a/regen/feature.pl b/regen/feature.pl
index a07986e38a..a0595f2f5d 100755
--- a/regen/feature.pl
+++ b/regen/feature.pl
@@ -56,7 +56,10 @@ use constant V5_11 => sort ( +V5_9_5, qw{unicode_strings} );
use constant V5_15 => sort ( +V5_11, qw{unicode_eval evalbytes current_sub fc} );
use constant V5_23 => sort ( +V5_15, qw{postderef_qq} );
use constant V5_27 => sort ( +V5_23, qw{bitwise} );
-use constant V5_35 => sort ( grep {; $_ ne 'switch' } +V5_27);
+
+use constant V5_35 => sort grep {; $_ ne 'switch'
+ && $_ ne 'indirect'
+ && $_ ne 'multidimensional' } +V5_27;
my %feature_bundle = (
all => [ sort keys %feature ],
@@ -482,7 +485,7 @@ read_only_bottom_close_and_rename($h);
__END__
package feature;
-our $VERSION = '1.68';
+our $VERSION = '1.69';
FEATURES