Change 33122 by [EMAIL PROTECTED] on 2008/01/30 11:24:19
Integrate:
[ 32648]
Make -E require 5.11 features
[ 32744]
"Automate" change 32648 (ensure that -E always loads the latest
features)
Affected files ...
... //depot/maint-5.10/perl/lib/feature.pm#2 integrate
... //depot/maint-5.10/perl/toke.c#2 integrate
Differences ...
==== //depot/maint-5.10/perl/lib/feature.pm#2 (text) ====
Index: perl/lib/feature.pm
--- perl/lib/feature.pm#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/lib/feature.pm 2008-01-30 03:24:19.000000000 -0800
@@ -9,6 +9,8 @@
state => "feature_state",
);
+# NB. the latest bundle must be loaded by the -E switch (see toke.c)
+
my %feature_bundle = (
"5.10.0" => [qw(switch say state)],
);
==== //depot/maint-5.10/perl/toke.c#2 (text) ====
Index: perl/toke.c
--- perl/toke.c#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/toke.c 2008-01-30 03:24:19.000000000 -0800
@@ -3654,7 +3654,8 @@
}
}
if (PL_minus_E)
- sv_catpvs(PL_linestr,"use feature ':5.10';");
+ sv_catpvs(PL_linestr,
+ "use feature ':5." STRINGIFY(PERL_VERSION) "';");
sv_catpvs(PL_linestr, "\n");
PL_oldoldbufptr = PL_oldbufptr = s = PL_linestart =
SvPVX(PL_linestr);
PL_bufend = SvPVX(PL_linestr) + SvCUR(PL_linestr);
End of Patch.
