X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fvars.pm;h=020568e9e059cb92578fdc11ef0db911c901f3c1;hb=3ca7705ebd432c2fb3599731fec8760f14fddd0f;hp=a051ba128a1f08057f2e1a2182d23ac08f6b8244;hpb=3b825e419da1c361eab06a1e6d287276c0aef241;p=p5sagit%2Fp5-mst-13.2.git diff --git a/lib/vars.pm b/lib/vars.pm index a051ba1..020568e 100644 --- a/lib/vars.pm +++ b/lib/vars.pm @@ -12,6 +12,10 @@ sub import { my ($pack, @imports) = @_; my ($sym, $ch); foreach (@imports) { + # TODO: UTF-8 names: (the unpack is quite wrong, + # /^(.)(.*)/ would probably be better.) While you + # are at it, until declaring empty package is made + # to work the * is too lenient. ($ch, $sym) = unpack('a1a*', $_); if ($sym =~ tr/A-Za-z_0-9//c) { # time for a more-detailed check-up @@ -20,8 +24,11 @@ sub import { Carp::croak("Can't declare individual elements of hash or array"); } elsif (warnings::enabled() and length($sym) == 1 and $sym !~ tr/a-zA-Z//) { warnings::warn("No need to declare built-in vars"); - } elsif ( $^H &= strict::bits('vars') ) { - Carp::croak("'$_' is not a valid variable name under strict vars"); + } elsif (($^H &= strict::bits('vars'))) { + # TODO: UTF-8 names: be careful to load the UTF-8 + # machinery only if the symbol requires it. + require Carp; + Carp::croak("'$_' is not a valid variable name under strict vars"); } } $sym = "${callpack}::$sym" unless $sym =~ /::/; @@ -72,6 +79,8 @@ outside of the package), it can act as an acceptable substitute by pre-declaring global symbols, ensuring their availability to the later-loaded routines. +The C does not work for UTF-8 variable names. + See L. =cut