Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
replace 'sigilled' with 'sigiled'
This PR is a very rough draft to fix #2660.
Feedback welcome.
  • Loading branch information
kawaii committed Mar 12, 2019
1 parent abbb9b5 commit 7bfdd2c
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions doc/Language/hashmap.pod6
Expand Up @@ -71,7 +71,7 @@ able to use dates (or a part of them) as keys. Since we are parameterizing
C<Associative> to those particular classes, C<of> will return the value type we
have used, C<Cool> in this case (we can log lists or strings only). Mixing the C<Associative>
role gives it the right to use the C<%> sigil; binding is needed in the definition since
C<%>-sigilled variables get by default the C<Hash> type.
C<%>-sigiled variables get by default the C<Hash> type.
This log is going to be append-only, that is why we escape the associative array
metaphor to use a C<log> method to add new events to the log. Once they have
Expand Down Expand Up @@ -156,7 +156,7 @@ or
my $h = { a => 'b', c => 'd', e => 'f'};
Please note that curly braces are used only in the case that we are not
assigning it to a C<%>-sigilled variable; in case we use it for a C<%>-sigilled
assigning it to a C<%>-sigiled variable; in case we use it for a C<%>-sigiled
variable we will get an C<Potential difficulties:␤ Useless use of hash
composer on right side of hash assignment; did you mean := instead?> error. As
this error indicates, however, we can use curly braces as long as we use also
Expand Down Expand Up @@ -269,7 +269,7 @@ instead:
Note: Rakudo implementation currently erroneously applies L<the same
rules|/routine/{ }#(Operators)_term_{_}> for C<:{ }> as it does for C<{ }> and
can construct a L<Block|/type/Block> in certain circumstances. To avoid that, you can
instantiate a parameterized Hash directly. Parameterization of C<%>-sigilled
instantiate a parameterized Hash directly. Parameterization of C<%>-sigiled
variables is also supported:
my Num %foo1 = "0" => 0e0; # Str keys and Num values
Expand Down
16 changes: 8 additions & 8 deletions doc/Language/terms.pod6
Expand Up @@ -244,7 +244,7 @@ by default.
I<NOTE: if you're using the Rakudo compiler, you need version 2018.08 or
newer for type constraints and auto-coercion on constants to be
available. Auto-coercion on %-sigilled constants requires 6.d language,
available. Auto-coercion on %-sigiled constants requires 6.d language,
preview version of which can be enabled with the C«use v6.d.PREVIEW»
pragma>
Expand All @@ -260,11 +260,11 @@ our Int constant bar = 42;
=end code
Unlike L<variables|/language/variables>, you cannot parameterize C<@>-,
C<%>-, and C<&>-sigilled constants by specifying the parameterization
C<%>-, and C<&>-sigiled constants by specifying the parameterization
type in the declarator itself:
=begin code :skip-test<showcasing deliberate compile-time error>
# !!WRONG!! cannot parameterize @-sigilled constant with Int
# !!WRONG!! cannot parameterize @-sigiled constant with Int
our Int constant @foo = 42;
# OK: parameterized types as values are fine
Expand All @@ -276,13 +276,13 @@ sigils default to L<List|/type/List> and L<Map|/type/Map> types, which cannot be
parameterized. To keep things simple and consistent, parameterization
was simply disallowed in these constructs.
The C<@>-, C<%>-, and C<&>-sigilled constants specify implied typecheck
The C<@>-, C<%>-, and C<&>-sigiled constants specify implied typecheck
of the given value for L<Positional|/type/Positional>, L<Associative|/type/Associative>, and L<Callable|/type/Callable>
roles respectively. The C<@>-sigilled constants—and as of C<6.d>
language version, the C<%>-sigilled constants as well—perform
roles respectively. The C<@>-sigiled constants—and as of C<6.d>
language version, the C<%>-sigiled constants as well—perform
auto-coercion of the value if it does not pass the implied typecheck.
The C<@>-sigilled constants will coerce using method L<cache|/routine/cache> and
C<%>-sigilled constants coerce using method L<Map|/type/Map>.
The C<@>-sigiled constants will coerce using method L<cache|/routine/cache> and
C<%>-sigiled constants coerce using method L<Map|/type/Map>.
=begin code
constant @foo = 42;
Expand Down
2 changes: 1 addition & 1 deletion doc/Type/Any.pod6
Expand Up @@ -392,7 +392,7 @@ Defined as:
multi method hash(Any:D:)
When called on a type object, returns an empty L<Hash|/type/Hash>. On instances,
it is equivalent to assigning the invocant to a C<%->sigilled variable and
it is equivalent to assigning the invocant to a C<%->sigiled variable and
returning that.
Subclasses of C<Any> may choose to return any I<core> type that does the
Expand Down
3 changes: 2 additions & 1 deletion xt/word-variants.t
Expand Up @@ -24,7 +24,8 @@ my %variants = %( filehandle => 'file [\s+|\-] handle',
NYI => 'niy',
metaoperator => 'meta [\s+|\-] operator',
semicolon => 'semi [\s+|\-] colon',
metadata => 'meta [\s+|\+] data'
metadata => 'meta [\s+|\+] data',
sigiled => 'sigiled',
);
# zero-width in particular has several unicode documentation variants we allow

Expand Down
1 change: 0 additions & 1 deletion xt/words.pws
Expand Up @@ -1170,7 +1170,6 @@ sigbus
sighup
sigil
sigiled
sigilled
sigilless
sigils
sigint
Expand Down

0 comments on commit 7bfdd2c

Please sign in to comment.