Author: larry
Date: Mon Aug 7 13:12:33 2006
New Revision: 10679
Modified:
doc/trunk/design/syn/S03.pod
doc/trunk/design/syn/S05.pod
doc/trunk/design/syn/S06.pod
Log:
Editing from agentzh++ and others++.
Modified: doc/trunk/design/syn/S03.pod
==
--- doc/trunk/design/syn/S03.pod(original)
+++ doc/trunk/design/syn/S03.podMon Aug 7 13:12:33 2006
@@ -12,9 +12,9 @@
Maintainer: Larry Wall <[EMAIL PROTECTED]>
Date: 8 Mar 2004
- Last Modified: 1 Aug 2006
+ Last Modified: 7 Aug 2006
Number: 3
- Version: 52
+ Version: 53
=head1 Changes to Perl 5 operators
@@ -1009,7 +1009,7 @@
=head1 Junctive operators
C<|>, C<&>, and C<^> are no longer bitwise operators (see
-L) but now serve a much higher cause:
+L) but now serve a much higher cause:
they are now the junction constructors.
A junction is a single value that is equivalent to multiple values. They
Modified: doc/trunk/design/syn/S05.pod
==
--- doc/trunk/design/syn/S05.pod(original)
+++ doc/trunk/design/syn/S05.podMon Aug 7 13:12:33 2006
@@ -650,7 +650,7 @@
-If the first character is a plus or minus, the initial identifier taken
+If the first character is a plus or minus, the initial identifier is taken
as a character class, so
Modified: doc/trunk/design/syn/S06.pod
==
--- doc/trunk/design/syn/S06.pod(original)
+++ doc/trunk/design/syn/S06.podMon Aug 7 13:12:33 2006
@@ -13,9 +13,9 @@
Maintainer: Larry Wall <[EMAIL PROTECTED]>
Date: 21 Mar 2003
- Last Modified: 26 July 2006
+ Last Modified: 7 Aug 2006
Number: 6
- Version: 42
+ Version: 43
This document summarizes Apocalypse 6, which covers subroutines and the
@@ -57,7 +57,7 @@
other constraints. They may have multliple invocants.
B (keyword: C) specify the commonalities (such
-as parameter names, fixity and associativity) shared by all multis
+as parameter names, fixity, and associativity) shared by all multis
of that name in the scope of the C declaration.
A modifier keyword may occur before the routine keyword in a named routine:
@@ -98,7 +98,7 @@
our RETTYPE sub ( PARAMS ) TRAITS {...} # means the same as "my" here
B is the name for a compile-time (C) property.
-See L<"Traits and Properties">
+See L<"Properties and traits">.
=head2 Perl5ish subroutine declarations
@@ -244,7 +244,7 @@
An operator name consists of a grammatical category name followed by
a single colon followed by an operator name specified as if it were
a hash subscript (but evaluated at compile time). So any of these
-indicate the same binary addition operator:
+indicates the same binary addition operator:
infix:<+>
infix:«+»
@@ -271,7 +271,7 @@
sub circumfix: ($contents) {...}
sub circumfix:{'LEFTDELIM','RIGHTDELIM'} ($contents) {...}
-Contrary to A6, there is no longer any rule about splitting an even
+Contrary to Apocalypse 6, there is no longer any rule about splitting an even
number of characters. You must use a two element slice. Such names
are canonicalized to a single form within the symbol table, so you
must use the canonical name if you wish to subscript the symbol table
@@ -367,9 +367,9 @@
Only bare keys with valid identifier names are recognized as named arguments:
doit when => 'now';# always a named arg
-doit 'when' => 'now'; # always a positonal arg
-doit 123 => 'now';# always a positonal arg
-doit :123;# always a positonal arg
+doit 'when' => 'now'; # always a positional arg
+doit 123 => 'now';# always a positional arg
+doit :123;# always a positional arg
Going the other way, pairs intended as named arguments that don't look
like pairs must be introduced with the C<[,]> reduction operator:
@@ -419,12 +419,13 @@
Ordinary hash notation will just pass the value of the hash entry as a
positional argument regardless of whether it is a pair or not.
-To pass both key and value out of hash as a positional pair, use C<:p>.
+To pass both key and value out of hash as a positional pair, use C<:p>
+instead:
doit %hash:p,1,2,3;
doit %hash{'b'}:p,1,2,3;
-instead.. (The C<:p> stands for "pairs", not "positional"--the
+(The C<:p> stands for "pairs", not "positional"--the
C<:p> adverb may be placed on any Hash objects to make it mean
"pairs" instead of "values".)
@@ -435,7 +436,7 @@
Because named and positional arguments can be freely mixed, the
programmer always needs to disambiguate pairs literals from named
-arguments with parenthesis or quotes:
+arguments with parentheses or quotes:
# Named argument "a"
push @array, 1, 2, :a;
@@ -453,7 +454,7 @@
fun( x => 1, x => 2 );
