From: Jarkko Hietaniemi Date: Tue, 8 Aug 2000 18:28:13 +0000 (+0000) Subject: Do away with array context, from Daniel Chetlin X-Git-Tag: accepted/trunk/20130322.191538~34628 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=91e74348ab129f737e0d9da75481cd4eb7414ba4;p=platform%2Fupstream%2Fperl.git Do away with array context, from Daniel Chetlin (either perlbug or p5p ate the original), plus regen perlapi and perltoc. p4raw-id: //depot/perl@6553 --- diff --git a/Changes b/Changes index 2a5f261..e1ab521 100644 --- a/Changes +++ b/Changes @@ -2394,7 +2394,7 @@ ____________________________________________________________________________ ! t/op/grent.t t/op/pwent.t ____________________________________________________________________________ [ 6049] By: jhi on 2000/05/02 19:06:02 - Log: Test both the scalar and array contexts. + Log: Test both the scalar and list contexts. Branch: cfgperl ! t/op/grent.t t/op/pwent.t ____________________________________________________________________________ diff --git a/Changes5.004 b/Changes5.004 index d060166..2d578b4 100644 --- a/Changes5.004 +++ b/Changes5.004 @@ -8031,7 +8031,7 @@ This release is beta candidate #5: Our last, best hope for a beta. From: Chip Salzenberg Files: pp_hot.c - Title: "Fix grep() with refs in array context" + Title: "Fix grep() with refs in list context" From: Chip Salzenberg Files: pp.c diff --git a/README.Y2K b/README.Y2K index 378db15..be7ff51 100644 --- a/README.Y2K +++ b/README.Y2K @@ -21,7 +21,7 @@ Long answer: The question belies a true understanding of the localtime) supply adequate information to determine the year well beyond 2000 (2038 is when trouble strikes for 32-bit machines). The year returned by these functions - when used in an array context is the year minus 1900. For + when used in a list context is the year minus 1900. For years between 1910 and 1999 this happens to be a 2-digit decimal number. To avoid the year 2000 problem simply do not treat the year as a 2-digit number. It isn't. diff --git a/cop.h b/cop.h index 4584a96..4fbcf26 100644 --- a/cop.h +++ b/cop.h @@ -393,7 +393,7 @@ Used to indicate scalar context. See C, C, and L. =for apidoc AmU||G_ARRAY -Used to indicate array context. See C, C and +Used to indicate list context. See C, C and L. =for apidoc AmU||G_VOID diff --git a/emacs/cperl-mode.el b/emacs/cperl-mode.el index c6fa46c..383d164 100644 --- a/emacs/cperl-mode.el +++ b/emacs/cperl-mode.el @@ -7364,7 +7364,7 @@ $~ The name of the current report format. ?PATTERN? One-time pattern match. @ARGV Command line arguments (not including the command name - see $0). @INC List of places to look for perl scripts during do/include/use. -@_ Parameter array for subroutines. Also used by split unless in array context. +@_ Parameter array for subroutines. Also used by split unless in list context. \\ Creates reference to what follows, like \$var, or quotes non-\w in strings. \\0 Octal char, e.g. \\033. \\E Case modification terminator. See \\Q, \\L, and \\U. diff --git a/ext/B/ramblings/flip-flop b/ext/B/ramblings/flip-flop index e0cb8ff..e08333d 100644 --- a/ext/B/ramblings/flip-flop +++ b/ext/B/ramblings/flip-flop @@ -9,13 +9,13 @@ PP(pp_range) } pp_range is a LOGOP. -In array context, it just returns op_next. +In list context, it just returns op_next. In scalar context it checks the truth of targ and returns op_other if true, op_next if false. flip is an UNOP. It "looks after" its child which is always a pp_range LOGOP. -In array context, it just returns the child's op_other. +In list context, it just returns the child's op_other. In scalar context, there are three possible outcomes: (1) set child's targ to 1, our targ to 1 and return op_next. (2) set child's targ to 1, our targ to 0, sp-- and return child's op_other. diff --git a/ext/Data/Dumper/Dumper.pm b/ext/Data/Dumper/Dumper.pm index 93b87f9..0ff48e6 100644 --- a/ext/Data/Dumper/Dumper.pm +++ b/ext/Data/Dumper/Dumper.pm @@ -685,7 +685,7 @@ the last. Returns the stringified form of the values stored in the object (preserving the order in which they were supplied to C), subject to the -configuration options below. In an array context, it returns a list +configuration options below. In a list context, it returns a list of strings corresponding to the supplied values. The second form, for convenience, simply calls the C method on its @@ -701,7 +701,7 @@ dumping subroutine references. Expects a anonymous hash of name => value pairs. Same rules apply for names as in C. If no argument is supplied, will return the "seen" list of -name => value pairs, in an array context. Otherwise, returns the object +name => value pairs, in a list context. Otherwise, returns the object itself. =item I<$OBJ>->Values(I<[ARRAYREF]>) @@ -732,7 +732,7 @@ itself. Returns the stringified form of the values in the list, subject to the configuration options below. The values will be named C<$VAR>I in the output, where I is a numeric suffix. Will return a list of strings -in an array context. +in a list context. =back diff --git a/ext/IO/lib/IO/Handle.pm b/ext/IO/lib/IO/Handle.pm index 930df55..9d84206 100644 --- a/ext/IO/lib/IO/Handle.pm +++ b/ext/IO/lib/IO/Handle.pm @@ -115,13 +115,13 @@ Returns true if the object is currently a valid file descriptor. =item $io->getline This works like <$io> described in L -except that it's more readable and can be safely called in an -array context but still returns just one line. +except that it's more readable and can be safely called in a +list context but still returns just one line. =item $io->getlines -This works like <$io> when called in an array context to -read all the remaining lines in a file, except that it's more readable. +This works like <$io> when called in a list context to read all +the remaining lines in a file, except that it's more readable. It will also croak() if accidentally called in a scalar context. =item $io->ungetc ( ORD ) diff --git a/ext/IO/lib/IO/Socket.pm b/ext/IO/lib/IO/Socket.pm index 6884f02..b8da092 100644 --- a/ext/IO/lib/IO/Socket.pm +++ b/ext/IO/lib/IO/Socket.pm @@ -361,7 +361,7 @@ perform the system call C on the socket and return a new object. The new object will be created in the same class as the listen socket, unless C is specified. This object can be used to communicate with the client that was trying to connect. In a scalar context the new socket is returned, -or undef upon failure. In an array context a two-element array is returned +or undef upon failure. In a list context a two-element array is returned containing the new socket and the peer address; the list will be empty upon failure. diff --git a/ext/Socket/Socket.pm b/ext/Socket/Socket.pm index 025888d..b4a0419 100644 --- a/ext/Socket/Socket.pm +++ b/ext/Socket/Socket.pm @@ -111,7 +111,7 @@ to inet_aton('255.255.255.255'). =item sockaddr_in SOCKADDR_IN -In an array context, unpacks its SOCKADDR_IN argument and returns an array +In a list context, unpacks its SOCKADDR_IN argument and returns an array consisting of (PORT, ADDRESS). In a scalar context, packs its (PORT, ADDRESS) arguments as a SOCKADDR_IN and returns it. If this is confusing, use pack_sockaddr_in() and unpack_sockaddr_in() explicitly. @@ -135,7 +135,7 @@ Will croak if the structure does not have AF_INET in the right place. =item sockaddr_un SOCKADDR_UN -In an array context, unpacks its SOCKADDR_UN argument and returns an array +In a list context, unpacks its SOCKADDR_UN argument and returns an array consisting of (PATHNAME). In a scalar context, packs its PATHNAME arguments as a SOCKADDR_UN and returns it. If this is confusing, use pack_sockaddr_un() and unpack_sockaddr_un() explicitly. diff --git a/lib/CGI.pm b/lib/CGI.pm index 6380554..8b7568a 100644 --- a/lib/CGI.pm +++ b/lib/CGI.pm @@ -3678,13 +3678,13 @@ the keys are the names of the CGI parameters, and the values are the parameters' values. The Vars() method does this. Called in a scalar context, it returns the parameter list as a tied hash reference. Changing a key changes the value of the parameter in the underlying -CGI parameter list. Called in an array context, it returns the +CGI parameter list. Called in a list context, it returns the parameter list as an ordinary hash. This allows you to read the contents of the parameter list, but not to change it. When using this, the thing you must watch out for are multivalued CGI parameters. Because a hash cannot distinguish between scalar and -array context, multivalued parameters will be returned as a packed +list context, multivalued parameters will be returned as a packed string, separated by the "\0" (null) character. You must split this packed string in order to get at the individual values. This is the convention introduced long ago by Steve Brenner in his cgi-lib.pl diff --git a/lib/CGI/Cookie.pm b/lib/CGI/Cookie.pm index 9e5a14b..575ae79 100644 --- a/lib/CGI/Cookie.pm +++ b/lib/CGI/Cookie.pm @@ -382,7 +382,7 @@ Get or set the cookie's value. Example: $value = $c->value; @new_value = $c->value(['a','b','c','d']); -B is context sensitive. In an array context it will return +B is context sensitive. In a list context it will return the current value of the cookie as an array. In a scalar context it will return the B value of a multivalued cookie. diff --git a/lib/File/Temp.pm b/lib/File/Temp.pm index aac8b7a..48b1184 100644 --- a/lib/File/Temp.pm +++ b/lib/File/Temp.pm @@ -1314,7 +1314,7 @@ exits. No access to the filename is provided. sub tmpfile { - # Simply call tmpnam() in an array context + # Simply call tmpnam() in a list context my ($fh, $file) = tmpnam(); # Make sure file is removed when filehandle is closed diff --git a/lib/FileHandle.pm b/lib/FileHandle.pm index 34c3475..5eb3a89 100644 --- a/lib/FileHandle.pm +++ b/lib/FileHandle.pm @@ -238,12 +238,12 @@ See L. =item $fh->getline This works like <$fh> described in L -except that it's more readable and can be safely called in an -array context but still returns just one line. +except that it's more readable and can be safely called in a +list context but still returns just one line. =item $fh->getlines -This works like <$fh> when called in an array context to +This works like <$fh> when called in a list context to read all the remaining lines in a file, except that it's more readable. It will also croak() if accidentally called in a scalar context. diff --git a/lib/Pod/Functions.pm b/lib/Pod/Functions.pm index 03cbf71..44619d5 100644 --- a/lib/Pod/Functions.pm +++ b/lib/Pod/Functions.pm @@ -296,7 +296,7 @@ values HASH return a list of the values in a hash vec Binary test or set particular bits in a string wait Process wait for any child process to die waitpid Process wait for a particular child process to die -wantarray Misc,Flow get list vs array context of current subroutine call +wantarray Misc,Flow get void vs scalar vs list context of current subroutine call warn I/O print debugging info write I/O print a picture record y/// String transliterate a string diff --git a/lib/Pod/InputObjects.pm b/lib/Pod/InputObjects.pm index 849182b..6bc329b 100644 --- a/lib/Pod/InputObjects.pm +++ b/lib/Pod/InputObjects.pm @@ -393,7 +393,7 @@ sub parse_tree { my $position = $pod_para->file_line(); Returns the current filename and line number for the paragraph -object. If called in an array context, it returns a list of two +object. If called in a list context, it returns a list of two elements: first the filename, then the line number. If called in a scalar context, it returns a string containing the filename, followed by a colon (':'), followed by the line number. @@ -686,7 +686,7 @@ sub parse_tree { my $position = $pod_seq->file_line(); Returns the current filename and line number for the interior sequence -object. If called in an array context, it returns a list of two +object. If called in a list context, it returns a list of two elements: first the filename, then the line number. If called in a scalar context, it returns a string containing the filename, followed by a colon (':'), followed by the line number. diff --git a/lib/Pod/LaTeX.pm b/lib/Pod/LaTeX.pm index 8adb589..208a113 100644 --- a/lib/Pod/LaTeX.pm +++ b/lib/Pod/LaTeX.pm @@ -675,7 +675,7 @@ pushed onto this stack. When the list context ends, it is popped from the stack. The array will be empty if no lists are active. -Returns array of list information in array context +Returns array of list information in list context Returns array ref in scalar context =cut diff --git a/lib/Text/Soundex.pm b/lib/Text/Soundex.pm index 3079b90..d588764 100644 --- a/lib/Text/Soundex.pm +++ b/lib/Text/Soundex.pm @@ -108,7 +108,7 @@ many people seem to prefer an I value like C can be assigned to C<$soundex_nocode>. In scalar context C returns the soundex code of its first -argument, and in array context a list is returned in which each element is the +argument, and in list context a list is returned in which each element is the soundex code for the corresponding argument passed to C e.g. @codes = soundex qw(Mike Stok); diff --git a/lib/perl5db.pl b/lib/perl5db.pl index 7257aa9..e68c13e 100644 --- a/lib/perl5db.pl +++ b/lib/perl5db.pl @@ -2160,8 +2160,8 @@ B Delete all watch-expressions. B [I [I]] List some (default all) variables in package (default current). Use B<~>I and BI for positive and negative regexps. B [I] Same as \"B I [I]\". -B I Evals expression in array context, dumps the result. -B I Evals expression in array context, prints methods callable +B I Evals expression in list context, dumps the result. +B I Evals expression in list context, prints methods callable on the first element of the result. B I Prints methods callable via the given class. @@ -2256,7 +2256,7 @@ I B List break/watch/act B<|>[B<|>]I Send output to pager B<$psh>\[B<$psh>\] I Run cmd in a subprocess B or B<^D> Quit B Attempt a restart I B Execute perl code, also see: B,B,B I - B|B I Evals expr in array context, dumps the result or lists methods. + B|B I Evals expr in list context, dumps the result or lists methods. B

I Print expression (uses script's current package). B [[B]I] List subroutine names [not] matching pattern B [I [I]] List Variables in Package. Vars can be ~pattern or !pattern. diff --git a/op.h b/op.h index 86f2a0b..110fbef 100644 --- a/op.h +++ b/op.h @@ -55,7 +55,7 @@ typedef U32 PADOFFSET; /* =for apidoc Amn|U32|GIMME_V The XSUB-writer's equivalent to Perl's C. Returns C, -C or C for void, scalar or array context, +C or C for void, scalar or list context, respectively. =for apidoc Amn|U32|GIMME diff --git a/opcode.pl b/opcode.pl index ab98824..d138917 100755 --- a/opcode.pl +++ b/opcode.pl @@ -321,7 +321,7 @@ sub tab { # trans not OK (dTARG; TARG = sv_newmortal();) # ucfirst etc not OK: TMP arg processed inplace # quotemeta not OK (unsafe when TARG == arg) -# each repeat not OK too due to array context +# each repeat not OK too due to list context # pack split - unknown whether they are safe # sprintf: is calling do_sprintf(TARG,...) which can act on TARG # before other args are processed. diff --git a/perlapi.c b/perlapi.c index f7b16cd..2fca6bc 100644 --- a/perlapi.c +++ b/perlapi.c @@ -829,6 +829,13 @@ Perl_gv_efullname3(pTHXo_ SV* sv, GV* gv, const char* prefix) ((CPerlObj*)pPerl)->Perl_gv_efullname3(sv, gv, prefix); } +#undef Perl_gv_efullname4 +void +Perl_gv_efullname4(pTHXo_ SV* sv, GV* gv, const char* prefix, bool keepmain) +{ + ((CPerlObj*)pPerl)->Perl_gv_efullname4(sv, gv, prefix, keepmain); +} + #undef Perl_gv_fetchfile GV* Perl_gv_fetchfile(pTHXo_ const char* name) @@ -878,6 +885,13 @@ Perl_gv_fullname3(pTHXo_ SV* sv, GV* gv, const char* prefix) ((CPerlObj*)pPerl)->Perl_gv_fullname3(sv, gv, prefix); } +#undef Perl_gv_fullname4 +void +Perl_gv_fullname4(pTHXo_ SV* sv, GV* gv, const char* prefix, bool keepmain) +{ + ((CPerlObj*)pPerl)->Perl_gv_fullname4(sv, gv, prefix, keepmain); +} + #undef Perl_gv_init void Perl_gv_init(pTHXo_ GV* gv, HV* stash, const char* name, STRLEN len, int multi) diff --git a/pod/perlapi.pod b/pod/perlapi.pod index 4a7573b..3eda765 100644 --- a/pod/perlapi.pod +++ b/pod/perlapi.pod @@ -1941,7 +1941,8 @@ Found in file sv.h =item SvLEN -Returns the size of the string buffer in the SV. See C. +Returns the size of the string buffer in the SV, not including any part +attributable to C. See C. STRLEN SvLEN(SV* sv) diff --git a/pod/perltoc.pod b/pod/perltoc.pod index 74c1f4e..bbd842a 100644 --- a/pod/perltoc.pod +++ b/pod/perltoc.pod @@ -585,26 +585,25 @@ import, index STR,SUBSTR,POSITION, index STR,SUBSTR, int EXPR, int, ioctl FILEHANDLE,FUNCTION,SCALAR, join EXPR,LIST, keys HASH, kill SIGNAL, LIST, last LABEL, last, lc EXPR, lc, lcfirst EXPR, lcfirst, length EXPR, length, link OLDFILE,NEWFILE, listen SOCKET,QUEUESIZE, local EXPR, localtime EXPR, -lock, log EXPR, log, lstat FILEHANDLE, lstat EXPR, lstat, m//, map BLOCK -LIST, map EXPR,LIST, mkdir FILENAME,MASK, mkdir FILENAME, msgctl -ID,CMD,ARG, msgget KEY,FLAGS, msgrcv ID,VAR,SIZE,TYPE,FLAGS, msgsnd -ID,MSG,FLAGS, my EXPR, my EXPR : ATTRIBUTES, next LABEL, next, no Module -LIST, oct EXPR, oct, open FILEHANDLE,MODE,LIST, open FILEHANDLE,EXPR, open -FILEHANDLE, opendir DIRHANDLE,EXPR, ord EXPR, ord, our EXPR, pack -TEMPLATE,LIST, package, package NAMESPACE, pipe READHANDLE,WRITEHANDLE, pop -ARRAY, pop, pos SCALAR, pos, print FILEHANDLE LIST, print LIST, print, -printf FILEHANDLE FORMAT, LIST, printf FORMAT, LIST, prototype FUNCTION, -push ARRAY,LIST, q/STRING/, qq/STRING/, qr/STRING/, qx/STRING/, qw/STRING/, -quotemeta EXPR, quotemeta, rand EXPR, rand, read -FILEHANDLE,SCALAR,LENGTH,OFFSET, read FILEHANDLE,SCALAR,LENGTH, readdir -DIRHANDLE, readline EXPR, readlink EXPR, readlink, readpipe EXPR, recv -SOCKET,SCALAR,LENGTH,FLAGS, redo LABEL, redo, ref EXPR, ref, rename -OLDNAME,NEWNAME, require VERSION, require EXPR, require, reset EXPR, reset, -return EXPR, return, reverse LIST, rewinddir DIRHANDLE, rindex -STR,SUBSTR,POSITION, rindex STR,SUBSTR, rmdir FILENAME, rmdir, s///, scalar -EXPR, seek FILEHANDLE,POSITION,WHENCE, seekdir DIRHANDLE,POS, select -FILEHANDLE, select, select RBITS,WBITS,EBITS,TIMEOUT, semctl -ID,SEMNUM,CMD,ARG, semget KEY,NSEMS,FLAGS, semop KEY,OPSTRING, send +lock, log EXPR, log, lstat EXPR, lstat, m//, map BLOCK LIST, map EXPR,LIST, +mkdir FILENAME,MASK, mkdir FILENAME, msgctl ID,CMD,ARG, msgget KEY,FLAGS, +msgrcv ID,VAR,SIZE,TYPE,FLAGS, msgsnd ID,MSG,FLAGS, my EXPR, my EXPR : +ATTRIBUTES, next LABEL, next, no Module LIST, oct EXPR, oct, open +FILEHANDLE,MODE,LIST, open FILEHANDLE,EXPR, open FILEHANDLE, opendir +DIRHANDLE,EXPR, ord EXPR, ord, our EXPR, pack TEMPLATE,LIST, package, +package NAMESPACE, pipe READHANDLE,WRITEHANDLE, pop ARRAY, pop, pos SCALAR, +pos, print FILEHANDLE LIST, print LIST, print, printf FILEHANDLE FORMAT, +LIST, printf FORMAT, LIST, prototype FUNCTION, push ARRAY,LIST, q/STRING/, +qq/STRING/, qr/STRING/, qx/STRING/, qw/STRING/, quotemeta EXPR, quotemeta, +rand EXPR, rand, read FILEHANDLE,SCALAR,LENGTH,OFFSET, read +FILEHANDLE,SCALAR,LENGTH, readdir DIRHANDLE, readline EXPR, readlink EXPR, +readlink, readpipe EXPR, recv SOCKET,SCALAR,LENGTH,FLAGS, redo LABEL, redo, +ref EXPR, ref, rename OLDNAME,NEWNAME, require VERSION, require EXPR, +require, reset EXPR, reset, return EXPR, return, reverse LIST, rewinddir +DIRHANDLE, rindex STR,SUBSTR,POSITION, rindex STR,SUBSTR, rmdir FILENAME, +rmdir, s///, scalar EXPR, seek FILEHANDLE,POSITION,WHENCE, seekdir +DIRHANDLE,POS, select FILEHANDLE, select, select RBITS,WBITS,EBITS,TIMEOUT, +semctl ID,SEMNUM,CMD,ARG, semget KEY,NSEMS,FLAGS, semop KEY,OPSTRING, send SOCKET,MSG,FLAGS,TO, send SOCKET,MSG,FLAGS, setpgrp PID,PGRP, setpriority WHICH,WHO,PRIORITY, setsockopt SOCKET,LEVEL,OPTNAME,OPTVAL, shift ARRAY, shift, shmctl ID,CMD,ARG, shmget KEY,SIZE,FLAGS, shmread ID,VAR,POS,SIZE, @@ -960,7 +959,7 @@ OS/2, MS-DOS, Win95/NT, Macintosh, VMS =item Command Switches -B<-0>[I], B<-a>, B<-C>, B<-c>, B<-d>, B<-d:>I, +B<-0>[I], B<-a>, B<-C>, B<-c>, B<-d>, B<-d:>I, B<-D>I, B<-D>I, B<-e> I, B<-F>I, B<-h>, B<-i>[I], B<-I>I, B<-l>[I], B<-m>[B<->]I, B<-M>[B<->]I, B<-M>[B<->]I<'module ...'>, @@ -3770,6 +3769,8 @@ A, p, d, s, n, r, f, m, o, j, x =over +=item Formatted Printing of IVs and UVs + =item Source Documentation =back diff --git a/t/lib/dosglob.t b/t/lib/dosglob.t index ea537bf..91aa6cc 100755 --- a/t/lib/dosglob.t +++ b/t/lib/dosglob.t @@ -39,7 +39,7 @@ while (defined($_ = <*/a*.t>)) { print "not " if @r != $r; print "ok 4\n"; -# check if array context works +# check if list context works @r = (); for (<*/a*.t>) { print "# $_\n"; diff --git a/t/lib/ftmp-posix.t b/t/lib/ftmp-posix.t index 6802374..8c9fd55 100755 --- a/t/lib/ftmp-posix.t +++ b/t/lib/ftmp-posix.t @@ -25,11 +25,11 @@ ok( !(-e $tmpnam )); print "# TMPNAM file name: $tmpnam\n"; -# TMPNAM array context +# TMPNAM list context # Not strict posix behaviour (my $fh, $tmpnam) = tmpnam(); -print "# TMPNAM: in array context: $fh $tmpnam\n"; +print "# TMPNAM: in list context: $fh $tmpnam\n"; # File is opened - make sure it exists ok( (-e $tmpnam )); diff --git a/t/lib/glob-global.t b/t/lib/glob-global.t index 9d273bd..0045f89 100755 --- a/t/lib/glob-global.t +++ b/t/lib/glob-global.t @@ -56,7 +56,7 @@ while (defined($_ = <*/*.t>)) { print "not " if @r != $r; print "ok 5\n"; -# check if array context works +# check if list context works @r = (); for (<*/*.t>) { #print "# $_\n"; diff --git a/t/op/grent.t b/t/op/grent.t index f2b5b9c..27c9427 100755 --- a/t/op/grent.t +++ b/t/op/grent.t @@ -140,7 +140,7 @@ print "ok ", $tst++; print "\t# (not necessarily serious: run t/op/grent.t by itself)" if $not; print "\n"; -# Test both the scalar and array contexts. +# Test both the scalar and list contexts. my @gr1; diff --git a/t/op/pwent.t b/t/op/pwent.t index c09d7c2..ea89505 100755 --- a/t/op/pwent.t +++ b/t/op/pwent.t @@ -137,7 +137,7 @@ print "ok ", $tst++; print "\t# (not necessarily serious: run t/op/pwent.t by itself)" if $not; print "\n"; -# Test both the scalar and array contexts. +# Test both the scalar and list contexts. my @pw1; diff --git a/vms/ext/DCLsym/DCLsym.pm b/vms/ext/DCLsym/DCLsym.pm index 7989cee..99adb94 100644 --- a/vms/ext/DCLsym/DCLsym.pm +++ b/vms/ext/DCLsym/DCLsym.pm @@ -215,7 +215,7 @@ C described above. If called in a scalar context, C returns the value of the symbol whose name is given as the argument to the call, or C if no such symbol exists. Symbols in the local symbol table are always used in preference to -symbols in the global symbol table. If called in an array context, C +symbols in the global symbol table. If called in a list context, C returns a two-element list, whose first element is the value of the symbol, and whose second element is the string 'GLOBAL' or 'LOCAL', indicating the table from which the symbol's value was read.