Perl 5.001perl-5.001

[See the Changes file for a list of changes]

1 files changed, 106 insertions, 100 deletions

diff --git a/lib/English.pm b/lib/English.pm
index b203721a52..d40d28af7d 100644
--- a/lib/English.pm
+++ b/lib/English.pm
@@ -3,59 +3,65 @@ package English;
 require Exporter;
 @ISA = (Exporter);
 
-local($^W) = 0;
+local $^W = 0;
+
+# Grandfather $NAME import
+sub import {
+    my $this = shift;
+    my @list = @_;
+    local $Exporter::ExportLevel = 1;
+    Exporter::import($this,grep {s/^\$/*/} @list);
+}
 
 @EXPORT = qw(
 	*ARG
-	$MATCH
-	$PREMATCH
-	$POSTMATCH
-	$LAST_PAREN_MATCH
-	$INPUT_LINE_NUMBER
-	$NR
-	$INPUT_RECORD_SEPARATOR
-	$RS
-	$OUTPUT_AUTOFLUSH
-	$OUTPUT_FIELD_SEPARATOR
-	$OFS
-	$OUTPUT_RECORD_SEPARATOR
-	$ORS
-	$LIST_SEPARATOR
-	$SUBSCRIPT_SEPARATOR
-	$SUBSEP
-	$FORMAT_PAGE_NUMBER
-	$FORMAT_LINES_PER_PAGE
-	$FORMAT_LINES_LEFT
-	$FORMAT_NAME
-	$FORMAT_TOP_NAME
-	$FORMAT_LINE_BREAK_CHARACTERS
-	$FORMAT_FORMFEED
-	$CHILD_ERROR
-	$OS_ERROR
-	$ERRNO
-	$EVAL_ERROR
-	$PROCESS_ID
-	$PID
-	$REAL_USER_ID
-	$UID
-	$EFFECTIVE_USER_ID
-	$EUID
-	$REAL_GROUP_ID
-	$GID
-	$EFFECTIVE_GROUP_ID
-	$EGID
-	$PROGRAM_NAME
-	$PERL_VERSION
-	$DEBUGGING
-	$SYSTEM_FD_MAX
-	$INPLACE_EDIT
-	$PERLDB
-	$BASETIME
-	$WARNING
-	$EXECUTABLE_NAME
-	$ARRAY_BASE
-	$OFMT
-	$MULTILINE_MATCHING
+	*MATCH
+	*PREMATCH
+	*POSTMATCH
+	*LAST_PAREN_MATCH
+	*INPUT_LINE_NUMBER
+	*NR
+	*INPUT_RECORD_SEPARATOR
+	*RS
+	*OUTPUT_AUTOFLUSH
+	*OUTPUT_FIELD_SEPARATOR
+	*OFS
+	*OUTPUT_RECORD_SEPARATOR
+	*ORS
+	*LIST_SEPARATOR
+	*SUBSCRIPT_SEPARATOR
+	*SUBSEP
+	*FORMAT_PAGE_NUMBER
+	*FORMAT_LINES_PER_PAGE
+	*FORMAT_LINES_LEFT
+	*FORMAT_NAME
+	*FORMAT_TOP_NAME
+	*FORMAT_LINE_BREAK_CHARACTERS
+	*FORMAT_FORMFEED
+	*CHILD_ERROR
+	*OS_ERROR
+	*ERRNO
+	*EVAL_ERROR
+	*PROCESS_ID
+	*PID
+	*REAL_USER_ID
+	*UID
+	*EFFECTIVE_USER_ID
+	*EUID
+	*REAL_GROUP_ID
+	*GID
+	*EFFECTIVE_GROUP_ID
+	*EGID
+	*PROGRAM_NAME
+	*PERL_VERSION
+	*ACCUMULATOR
+	*DEBUGGING
+	*SYSTEM_FD_MAX
+	*INPLACE_EDIT
+	*PERLDB
+	*BASETIME
+	*WARNING
+	*EXECUTABLE_NAME
 );
 
 # The ground of all being.
@@ -64,79 +70,79 @@ local($^W) = 0;
 
 # Matching.
 
-	*MATCH					= \$&	;
-	*PREMATCH				= \$`	;
-	*POSTMATCH				= \$'	;
-	*LAST_PAREN_MATCH			= \$+	;
+	*MATCH					= *&	;
+	*PREMATCH				= *`	;
+	*POSTMATCH				= *'	;
+	*LAST_PAREN_MATCH			= *+	;
 
 # Input.
 
-	*INPUT_LINE_NUMBER			= \$.	;
-	    *NR					= \$.	;
-	*INPUT_RECORD_SEPARATOR			= \$/	;
-	    *RS					= \$/	;
+	*INPUT_LINE_NUMBER			= *.	;
+	    *NR					= *.	;
+	*INPUT_RECORD_SEPARATOR			= */	;
+	    *RS					= */	;
 
 # Output.
 
-	*OUTPUT_AUTOFLUSH			= \$|	;
-	*OUTPUT_FIELD_SEPARATOR			= \$,	;
-	    *OFS				= \$,	;
-	*OUTPUT_RECORD_SEPARATOR		= \$\	;
-	    *ORS				= \$\	;
+	*OUTPUT_AUTOFLUSH			= *|	;
+	*OUTPUT_FIELD_SEPARATOR			= *,	;
+	    *OFS				= *,	;
+	*OUTPUT_RECORD_SEPARATOR		= *\	;
+	    *ORS				= *\	;
 
 # Interpolation "constants".
 
-	*LIST_SEPARATOR				= \$"	;
-	*SUBSCRIPT_SEPARATOR			= \$;	;
-	    *SUBSEP				= \$;	;
+	*LIST_SEPARATOR				= *"	;
+	*SUBSCRIPT_SEPARATOR			= *;	;
+	    *SUBSEP				= *;	;
 
 # Formats
 
-	*FORMAT_PAGE_NUMBER			= \$%	;
-	*FORMAT_LINES_PER_PAGE			= \$=	;
-	*FORMAT_LINES_LEFT			= \$-	;
-	*FORMAT_NAME				= \$~	;
-	*FORMAT_TOP_NAME			= \$^	;
-	*FORMAT_LINE_BREAK_CHARACTERS		= \$:	;
-	*FORMAT_FORMFEED			= \$^L	;
+	*FORMAT_PAGE_NUMBER			= *%	;
+	*FORMAT_LINES_PER_PAGE			= *=	;
+	*FORMAT_LINES_LEFT			= *-	;
+	*FORMAT_NAME				= *~	;
+	*FORMAT_TOP_NAME			= *^	;
+	*FORMAT_LINE_BREAK_CHARACTERS		= *:	;
+	*FORMAT_FORMFEED			= *^L	;
 
 # Error status.
 
-	*CHILD_ERROR				= \$?	;
-	*OS_ERROR				= \$!	;
-	    *ERRNO				= \$!	;
-	*EVAL_ERROR				= \$@	;
+	*CHILD_ERROR				= *?	;
+	*OS_ERROR				= *!	;
+	    *ERRNO				= *!	;
+	*EVAL_ERROR				= *@	;
 
 # Process info.
 
-	*PROCESS_ID				= \$$	;
-	    *PID				= \$$	;
-	*REAL_USER_ID				= \$<	;
-	    *UID				= \$<	;
-	*EFFECTIVE_USER_ID			= \$>	;
-	    *EUID				= \$>	;
-	*REAL_GROUP_ID				= \$(	;
-	    *GID				= \$(	;
-	*EFFECTIVE_GROUP_ID			= \$)	;
-	    *EGID				= \$)	;
-	*PROGRAM_NAME				= \$0	;
+	*PROCESS_ID				= *$	;
+	    *PID				= *$	;
+	*REAL_USER_ID				= *<	;
+	    *UID				= *<	;
+	*EFFECTIVE_USER_ID			= *>	;
+	    *EUID				= *>	;
+	*REAL_GROUP_ID				= *(	;
+	    *GID				= *(	;
+	*EFFECTIVE_GROUP_ID			= *)	;
+	    *EGID				= *)	;
+	*PROGRAM_NAME				= *0	;
 
 # Internals.
 
-	*PERL_VERSION				= \$]	;
-	*ACCUMULATOR				= \$^A	;
-	*DEBUGGING				= \$^D	;
-	*SYSTEM_FD_MAX				= \$^F	;
-	*INPLACE_EDIT				= \$^I	;
-	*PERLDB					= \$^P	;
-	*BASETIME				= \$^T	;
-	*WARNING				= \$^W	;
-	*EXECUTABLE_NAME			= \$^X	;
+	*PERL_VERSION				= *]	;
+	*ACCUMULATOR				= *^A	;
+	*DEBUGGING				= *^D	;
+	*SYSTEM_FD_MAX				= *^F	;
+	*INPLACE_EDIT				= *^I	;
+	*PERLDB					= *^P	;
+	*BASETIME				= *^T	;
+	*WARNING				= *^W	;
+	*EXECUTABLE_NAME			= *^X	;
 
 # Deprecated.
 
-#	*ARRAY_BASE				= \$[	;
-#	*OFMT					= \$#	;
-#	*MULTILINE_MATCHING			= \$*	;
+#	*ARRAY_BASE				= *[	;
+#	*OFMT					= *#	;
+#	*MULTILINE_MATCHING			= **	;
 
 1;