Skip to content

Commit

Permalink
Merge branch 'master' into spellcheck
Browse files Browse the repository at this point in the history
  • Loading branch information
coke committed Oct 13, 2016
2 parents f2752d4 + 0bd5849 commit a0c737b
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion doc/Language/concurrency.pod6
Expand Up @@ -645,7 +645,7 @@ the thread completes:
$thread.finish;
Beyond that there are no further facilities for synchronization or resource
sharing which is largely why it should be emphasised that threads are unlikely
sharing which is largely why it should be emphasized that threads are unlikely
to be useful directly in user code.
=head2 Schedulers
Expand Down
2 changes: 1 addition & 1 deletion doc/Language/nativecall.pod6
Expand Up @@ -464,7 +464,7 @@ Note that at the moment it's not as tested and developed as C support.
=head1 Helper Functions
The C<NativeCall> library exports several subroutines to help you work with
data fron native libraries.
data from native libraries.
=head2 sub X<nativecast|sub>
Expand Down
2 changes: 1 addition & 1 deletion doc/Language/quoting.pod6
Expand Up @@ -148,7 +148,7 @@ You can also use unicode names with C<\c[]>.
OUTPUT«Str $s = "Str $s = "Camelia 💔 my ❤!"␤»
Interpolation of undefined values will raise a control exception that can be
cought in the current block with
caught in the current block with
L<CONTROL|https://docs.perl6.org/syntax/CONTROL>.
sub niler {Nil};
Expand Down
2 changes: 1 addition & 1 deletion doc/Language/rb-nutshell.pod6
Expand Up @@ -921,7 +921,7 @@ will be available
If you tries to use C<baz> an "Undeclared routine" error is raised at compile time.
Some modules allow for selectively importing funcitons, which would look like:
Some modules allow for selectively importing functions, which would look like:
use Bar <foo>; # Import only foo
foo(1); #=> "foo 1"
Expand Down
2 changes: 1 addition & 1 deletion doc/Language/traps.pod6
Expand Up @@ -457,7 +457,7 @@ can be shortened to just
for 1..8 { say $^a + $^b; }
The trouble arises when a person wants to use more complex names for the variables, instead of just one letter. The C<^> twigil is able to have the positional variables be out of order and named whatever you want, but assigns values based on the variable's Unicode ordering. In the above example, we can have C<$^a> and C<$^b> switch places, and those variables will keep their positional values. This is beacuse the Unicode character 'a' comes before the character 'b'. For example:
The trouble arises when a person wants to use more complex names for the variables, instead of just one letter. The C<^> twigil is able to have the positional variables be out of order and named whatever you want, but assigns values based on the variable's Unicode ordering. In the above example, we can have C<$^a> and C<$^b> switch places, and those variables will keep their positional values. This is because the Unicode character 'a' comes before the character 'b'. For example:
#In order
sub f1 { say "$^first $^second"; }
Expand Down
4 changes: 2 additions & 2 deletions doc/Language/typesystem.pod6
Expand Up @@ -39,7 +39,7 @@ L<Nil|/type/Nil> and L<Failure|/type/Failure>. Please note that any object is
able to overload C<.defined> and as such can carry additional information.
Also, Perl 6 makes a clear distinction between definedness and trueness. Many
values are defined even though they carry the meaning of wrongness or
emtpyness. Such values are C<0>, L<Bool::False|/type/Bool>,
emptiness. Such values are C<0>, L<Bool::False|/type/Bool>,
L<()|/language/operators#term_(_)> (empty list) and L<NaN|/type/Num#NaN>.
Values can become undefined at runtime via L<mixin|/language/operators#infix_but>.
Expand Down Expand Up @@ -214,7 +214,7 @@ C<:&attr-with-code-in-it>, and so on.
=head4 trait C<is nodal>
Mark a method for hyperoperators as to be avoided for decending into.
Mark a method for hyperoperators as to be avoided for descending into.
dd [[1,2,3],[4,5]]>>.elems;
# OUTPUT«(3, 2)␤»
Expand Down
4 changes: 2 additions & 2 deletions doc/Type/Signature.pod6
Expand Up @@ -195,8 +195,8 @@ use the C<:D> type constraint.
sub limit-lines(Str:D $s, Int $limit) { };
say limit-lines Str, 3;
CATCH { default { put .^name, .Str } };
# OUTPUT«X::AdHocParameter '$s' requires an instance of type Str, but a
CATCH { default { put .^name ~ '--' ~~ .Str } };
# OUTPUT«X::AdHoc--Parameter '$s' requires an instance of type Str, but a
# type object was passed. Did you forget a .new?»
This is much better than the way the program failed before, since here the
Expand Down
2 changes: 1 addition & 1 deletion doc/Type/X/Proc/Async.pod6
Expand Up @@ -12,7 +12,7 @@ All exceptions thrown by L<Proc::Async> do this common role.
=head2 method proc
method fproc(X::Proc::Async:D) returns Proc::Async
method proc(X::Proc::Async:D) returns Proc::Async
Returns the object that threw the exception.
Expand Down

0 comments on commit a0c737b

Please sign in to comment.