Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fixed spello as diakopter++ pointed out
  • Loading branch information
@FROGGS
FROGGS committed Mar 24, 2013
1 parent 221a95f commit b972ca3
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 22 deletions.
22 changes: 11 additions & 11 deletions src/Perl6/Actions.pm
View file
Expand Up @@ -222,7 +222,7 @@ class Perl6::Actions is HLL::Actions does STDActions {
make $name;
}
else {
make $*W.disect_deflongname($/).name(
make $*W.dissect_deflongname($/).name(
:dba("$*IN_DECL declaration"),
:decl<routine>,
);
Expand Down Expand Up @@ -962,7 +962,7 @@ class Perl6::Actions is HLL::Actions does STDActions {
method statement_control:sym<require>($/) {
my $past := QAST::Stmts.new(:node($/));
my $name_past := $<module_name>
?? $*W.disect_longname($<module_name><longname>).name_past()
?? $*W.dissect_longname($<module_name><longname>).name_past()
!! $<EXPR>[0].ast;

$past.push(QAST::Op.new(
Expand Down Expand Up @@ -1317,7 +1317,7 @@ class Perl6::Actions is HLL::Actions does STDActions {
else {
my $indirect;
if $<desigilname> && $<desigilname><longname> {
my $longname := $*W.disect_longname($<desigilname><longname>);
my $longname := $*W.dissect_longname($<desigilname><longname>);
if $longname.contains_indirect_lookup() {
if $*IN_DECL {
$*W.throw($/, ['X', 'Syntax', 'Variable', 'IndirectDeclaration']);
Expand Down Expand Up @@ -2357,7 +2357,7 @@ class Perl6::Actions is HLL::Actions does STDActions {

my $name;
if $<longname> {
my $longname := $*W.disect_longname($<longname>);
my $longname := $*W.dissect_longname($<longname>);
$name := $longname.name(:dba('method name'),
:decl<routine>, :with_adverbs);
}
Expand Down Expand Up @@ -2778,7 +2778,7 @@ class Perl6::Actions is HLL::Actions does STDActions {

# Get, or find, enumeration base type and create type object with
# correct base type.
my $longname := $<longname> ?? $*W.disect_longname($<longname>) !! 0;
my $longname := $<longname> ?? $*W.dissect_longname($<longname>) !! 0;
my $name := $<longname> ?? $longname.name() !! $<variable><desigilname>;

my $type_obj;
Expand Down Expand Up @@ -2925,7 +2925,7 @@ class Perl6::Actions is HLL::Actions does STDActions {
QAST::Op.new( :op('p6bool'), QAST::IVal.new( :value(1) ) ));

# Create the meta-object.
my $longname := $<longname> ?? $*W.disect_longname($<longname>[0]) !! 0;
my $longname := $<longname> ?? $*W.dissect_longname($<longname>[0]) !! 0;
my $subset := $<longname> ??
$*W.create_subset(%*HOW<subset>, $refinee, $refinement, :name($longname.name())) !!
$*W.create_subset(%*HOW<subset>, $refinee, $refinement);
Expand Down Expand Up @@ -3426,7 +3426,7 @@ class Perl6::Actions is HLL::Actions does STDActions {

# If we have a type name then we need to dispatch with that type; otherwise
# we need to dispatch with it as a named argument.
my @name := $*W.disect_longname($<longname>).components();
my @name := $*W.dissect_longname($<longname>).components();
if $*W.is_name(@name) {
my $trait := $*W.find_symbol(@name);
make -> $declarand {
Expand Down Expand Up @@ -3529,7 +3529,7 @@ class Perl6::Actions is HLL::Actions does STDActions {
# runs after CHECK time.
my $past := $<methodop>.ast;
if $<methodop><longname> {
my @parts := $*W.disect_longname($<methodop><longname>).components();
my @parts := $*W.dissect_longname($<methodop><longname>).components();
my $name := @parts.pop;
if @parts {
my $methpkg := $*W.find_symbol(@parts);
Expand Down Expand Up @@ -3572,7 +3572,7 @@ class Perl6::Actions is HLL::Actions does STDActions {
if $<longname> {
# May just be .foo, but could also be .Foo::bar. Also handle the
# macro-ish cases.
my @parts := $*W.disect_longname($<longname>).components();
my @parts := $*W.dissect_longname($<longname>).components();
my $name := @parts.pop;
if +@parts {
$past.unshift($*W.symbol_lookup(@parts, $/));
Expand Down Expand Up @@ -4980,7 +4980,7 @@ class Perl6::Actions is HLL::Actions does STDActions {
# GenericHOW, though whether/how it's used depends on context.
if $<longname> {
if nqp::substr(~$<longname>, 0, 2) ne '::' {
my $longname := $*W.disect_longname($<longname>);
my $longname := $*W.dissect_longname($<longname>);
my $type := $*W.find_symbol($longname.type_name_parts('type name'));
if $<arglist> {
$type := $*W.parameterize_type($type, $<arglist>, $/);
Expand Down Expand Up @@ -6065,7 +6065,7 @@ class Perl6::RegexActions is QRegex::P6Regex::Actions does STDActions {
}

method assertion:sym<name>($/) {
my @parts := $*W.disect_longname($<longname>).components();
my @parts := $*W.dissect_longname($<longname>).components();
my $name := @parts.pop();
my $qast;
if $<assertion> {
Expand Down
16 changes: 8 additions & 8 deletions src/Perl6/Grammar.pm
View file
Expand Up @@ -1127,7 +1127,7 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
<module_name> [ <.spacey> <arglist> ]? <.ws>
:my $*HAS_SELF := '';
{
my $longname := $*W.disect_longname($<module_name><longname>);
my $longname := $*W.dissect_longname($<module_name><longname>);
my $module;
my $found := 0;
try { $module := $*W.find_symbol($longname.components()); $found := 1; }
Expand Down Expand Up @@ -1773,7 +1773,7 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
{ unless $*SCOPE { $*SCOPE := 'our'; } }

[
[ <longname> { $longname := $*W.disect_longname($<longname>[0]); } ]?
[ <longname> { $longname := $*W.dissect_longname($<longname>[0]); } ]?
<.newpad>

[ :dba('generic role')
Expand Down Expand Up @@ -2248,7 +2248,7 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
| [ <param_var> | <named_param> ] $<quant>=['?'|'!'|<?>]
| <longname>
{
my $name := $*W.disect_longname($<longname>);
my $name := $*W.dissect_longname($<longname>);
$*W.throw($/, ['X', 'Parameter', 'InvalidType'],
:typename($name.name),
:suggestions($*W.suggest_typename($name.name)));
Expand Down Expand Up @@ -2401,7 +2401,7 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
[
| <longname>
{
my $longname := $*W.disect_longname($<longname>);
my $longname := $*W.dissect_longname($<longname>);
my @name := $longname.type_name_parts('enum name', :decl(1));
if $*W.already_declared($*SCOPE, $*PACKAGE, $*W.cur_lexpad(), @name) {
$*W.throw($/, ['X', 'Redeclaration'],
Expand All @@ -2427,7 +2427,7 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
[
<longname>
{
my $longname := $*W.disect_longname($<longname>[0]);
my $longname := $*W.dissect_longname($<longname>[0]);
my @name := $longname.type_name_parts('subset name', :decl(1));
if $*W.already_declared($*SCOPE, $*PACKAGE, $*W.cur_lexpad(), @name) {
$*W.throw($/, ['X', 'Redeclaration'],
Expand Down Expand Up @@ -2556,7 +2556,7 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
token term:sym<name> {
<longname>
:my $*longname;
{ $*longname := $*W.disect_longname($<longname>) }
{ $*longname := $*W.dissect_longname($<longname>) }
[
|| <?{ nqp::substr($<longname>.Str, 0, 2) eq '::' || $*W.is_name($*longname.components()) }>
<.unsp>?
Expand Down Expand Up @@ -2684,7 +2684,7 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
| '::?'<identifier> <colonpair>* # parse ::?CLASS as special case
| <longname>
<?{
my $longname := $*W.disect_longname($<longname>);
my $longname := $*W.dissect_longname($<longname>);
nqp::substr(~$<longname>, 0, 2) eq '::' ??
1 !! # ::T introduces a type, so always is one
$*W.is_name($longname.type_name_parts('type name'))
Expand All @@ -2699,7 +2699,7 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
token typo_typename {
<longname>
{
my $longname := $*W.disect_longname($<longname>);
my $longname := $*W.dissect_longname($<longname>);
my @suggestions := $*W.suggest_typename($longname.name);
$/.CURSOR.typed_sorry('X::Undeclared',
what => "Type",
Expand Down
6 changes: 3 additions & 3 deletions src/Perl6/World.pm
View file
Expand Up @@ -1903,7 +1903,7 @@ class Perl6::World is HLL::World {

# Takes a longname and turns it into an object representing the
# name.
method disect_longname($longname) {
method dissect_longname($longname) {
# Set up basic info about the long name.
my $result := nqp::create(LongName);
nqp::bindattr($result, LongName, '$!match', $longname);
Expand Down Expand Up @@ -1952,9 +1952,9 @@ class Perl6::World is HLL::World {

$result
}
method disect_deflongname($deflongname) {
method dissect_deflongname($deflongname) {
# deflongname has the same capture structure as longname
self.disect_longname($deflongname);
self.dissect_longname($deflongname);
}

# Checks if a name starts with a pseudo-package.
Expand Down

0 comments on commit b972ca3

Please sign in to comment.