diff options
author | Nicholas Clark <nick@ccl4.org> | 2010-11-25 17:08:18 +0000 |
---|---|---|
committer | Nicholas Clark <nick@ccl4.org> | 2010-11-25 17:10:56 +0000 |
commit | 88e9444c4ef58850472b05bba333f4072222d0da (patch) | |
tree | d9b48abc5e3966428d539fe5780b71ab3382ef8c /op.c | |
parent | b19934fbc3c981a7e4bb888f0d6a20f926a0bc17 (diff) | |
download | perl-88e9444c4ef58850472b05bba333f4072222d0da.tar.gz |
Make BEGIN {require 5.12.0} behave as documented.
Previously in a BEGIN block, require was behaving identically to use 5.12.0 -
ie erroneously executing the use feature ':5.12.0'; and use strict;
use warnings behaviour, which only use was documented to provide.
Diffstat (limited to 'op.c')
-rw-r--r-- | op.c | 25 |
1 files changed, 24 insertions, 1 deletions
@@ -4222,6 +4222,7 @@ Perl_utilize(pTHX_ int aver, I32 floor, OP *version, OP *idop, OP *arg) #ifdef PERL_MAD OP *pegop = newOP(OP_NULL,0); #endif + SV *use_version = NULL; PERL_ARGS_ASSERT_UTILIZE; @@ -4268,7 +4269,9 @@ Perl_utilize(pTHX_ int aver, I32 floor, OP *version, OP *idop, OP *arg) } else if (SvNIOKp(((SVOP*)idop)->op_sv)) { imop = NULL; /* use 5.0; */ - if (!aver) + if (aver) + use_version = ((SVOP*)idop)->op_sv; + else idop->op_private |= OPpCONST_NOVER; } else { @@ -4300,6 +4303,26 @@ Perl_utilize(pTHX_ int aver, I32 floor, OP *version, OP *idop, OP *arg) newSTATEOP(0, NULL, veop)), newSTATEOP(0, NULL, imop) )); + if (use_version) { + /* If we request a version >= 5.9.5, load feature.pm with the + * feature bundle that corresponds to the required version. */ + use_version = sv_2mortal(new_version(use_version)); + + if (vcmp(use_version, + sv_2mortal(upg_version(newSVnv(5.009005), FALSE))) >= 0) { + SV *const importsv = vnormal(use_version); + *SvPVX_mutable(importsv) = ':'; + ENTER_with_name("load_feature"); + Perl_load_module(aTHX_ 0, newSVpvs("feature"), NULL, importsv, NULL); + LEAVE_with_name("load_feature"); + } + /* If a version >= 5.11.0 is requested, strictures are on by default! */ + if (vcmp(use_version, + sv_2mortal(upg_version(newSVnv(5.011000), FALSE))) >= 0) { + PL_hints |= (HINT_STRICT_REFS | HINT_STRICT_SUBS | HINT_STRICT_VARS); + } + } + /* The "did you use incorrect case?" warning used to be here. * The problem is that on case-insensitive filesystems one * might get false positives for "use" (and "require"): |