Refactoring the /Can't return (?:array|hash) to scalar context/ croak

[perl5.git] / lib / English.pm

diff --git a/lib/English.pm b/lib/English.pm
index 77f27c5..c11fbed 100644 (file)
--- a/lib/English.pm
+++ b/lib/English.pm
@@ -1,9 +1,9 @@
 package English;
 
-our $VERSION = '1.00';
+our $VERSION = '1.04';
 
 require Exporter;
-@ISA = (Exporter);
+@ISA = qw(Exporter);
 
 =head1 NAME
 
@@ -58,13 +58,13 @@ sub import {
         $globbed_match ||= (
            eval q{
                *MATCH                          = *&    ;
-               *PREMATCH                               = *`    ;
-               *POSTMATCH                              = *'    ;
+               *PREMATCH                       = *`    ;
+               *POSTMATCH                      = *'    ;
                1 ;
               }
            || do {
                require Carp ;
-               Carp::croak "Can't create English for match leftovers: $@" ;
+               Carp::croak("Can't create English for match leftovers: $@") ;
            }
        ) ;
     }
@@ -114,6 +114,7 @@ sub import {
        *PROGRAM_NAME
        *PERL_VERSION
        *ACCUMULATOR
+       *COMPILING
        *DEBUGGING
        *SYSTEM_FD_MAX
        *INPLACE_EDIT
@@ -124,6 +125,7 @@ sub import {
        *OSNAME
        *LAST_REGEXP_CODE_RESULT
        *EXCEPTIONS_BEING_CAUGHT
+       *LAST_SUBMATCH_RESULT
        @LAST_MATCH_START
        @LAST_MATCH_END
 );
@@ -144,6 +146,7 @@ sub import {
 # Matching.
 
        *LAST_PAREN_MATCH                       = *+    ;
+       *LAST_SUBMATCH_RESULT                   = *^N ;
        *LAST_MATCH_START                       = *-{ARRAY} ;
        *LAST_MATCH_END                         = *+{ARRAY} ;
 
@@ -183,6 +186,8 @@ sub import {
        *CHILD_ERROR                            = *?    ;
        *OS_ERROR                               = *!    ;
            *ERRNO                              = *!    ;
+       *OS_ERROR                               = *!    ;
+           *ERRNO                              = *!    ;
        *EXTENDED_OS_ERROR                      = *^E   ;
        *EVAL_ERROR                             = *@    ;
 
@@ -220,7 +225,6 @@ sub import {
 
 #      *ARRAY_BASE                             = *[    ;
 #      *OFMT                                   = *#    ;
-#      *MULTILINE_MATCHING                     = **    ;
 #      *OLD_PERL_VERSION                       = *]    ;
 
 1;