Skip to content

Commit 58ea8e9

Browse files
committed
Clean up my terminonology and whitspace from a few previous commits
1 parent 68edd4d commit 58ea8e9

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

lib/Language/functions.pod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ argument list of a function call, some special syntax is supported:
107107
f :35named # A named argument using abbreviated adverb form
108108
f 'named' => 35 # Not a named argument, a Pair in a positional argument
109109
f |$c # Merge the contents of Capture $c as if they were supplied
110-
110+
111111
Arguments passed to a function are conceptually first collected in a
112112
C<Capture> container. Details about the syntax and use of these
113113
containers can be found in the L<documentation on the C<Capture> class|Capture>.
@@ -118,7 +118,7 @@ one to skip commas between named arguments.
118118
f :dest</tmp/foo> :src</tmp/bar> :lines(512)
119119
f :32x :50y :110z # This flavor of "adverb" works, too
120120
f :a:b:c # The spaces are also optional.
121-
121+
122122
=head2 Multi-dispatch
123123
124124
Perl 6 allows you to write several routines with the same name, but different

lib/Language/traps.pod

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,22 +132,23 @@ Ways to match whitespace:
132132
133133
=head1 Captures
134134
135-
=head2 Variables versus values/expressions in a Capture
135+
=head2 Containers versus values in a Capture
136136
137137
Beginners might expect a variable in a C<Capture> to supply its current
138138
value when that C<Capture> is later used. For example:
139139
140140
$perl6 -e 'my $a = 2; say($a, ++$a)'
141141
33
142142
143-
Here the C<Capture> contained the B<variable> C<$a> and the B<value> of the result
144-
of the expression C<++$a>. Since the C<Capture> must be reified before C<&say> can
145-
use it, the C<++$a> may happen before C<&say> gets C<$a>, and so it may already
146-
be incremented.
143+
Here the C<Capture> contained the B<container> pointed to by C<$a> and the
144+
B<value> of the result of the expression C<++$a>. Since the C<Capture> must
145+
be reified before C<&say> can use it, the C<++$a> may happen before
146+
C<&say> looks inside the container in C<$a>, and so it may already be
147+
incremented.
147148
148149
Instead, use an expression that produces a value when you want a value.
149150
150151
$perl6 -e 'my $a = 2; say(+$a, ++$a)'
151152
23
152-
153+
153154
=end pod

lib/Type/Capture.pod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ into that parameter.
5353
# c is \(2, 3, a => 4, b => 5)
5454
}
5555
56-
Note that Captures are still Lists in that they may contain variables, not just
57-
values:
56+
Note that Captures are still Lists in that they may contain containers, not
57+
just values:
5858
5959
my $b = 1;
6060
my $c = \(4,2,$b,3);

0 commit comments

Comments
 (0)