Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove confusing . from error messages, PerlJam++
  • Loading branch information
@lizmat
lizmat committed Jul 15, 2015
1 parent cadee02 commit 648a585
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 24 deletions.
6 changes: 3 additions & 3 deletions src/core/Array.pm
View file
Expand Up @@ -287,7 +287,7 @@ class Array { # declared in BOOTSTRAP
}

multi method push(Array:D: *@values) {
fail X::Cannot::Infinite.new(:action<.push>, :what(self.^name))
fail X::Cannot::Infinite.new(:action<push>, :what(self.^name))
if @values.infinite;
nqp::p6listitems(self);
my $elems = self.gimme(*);
Expand All @@ -308,7 +308,7 @@ class Array { # declared in BOOTSTRAP

multi method unshift(Array:D: \value) {
if nqp::iscont(value) || nqp::not_i(nqp::istype(value, Iterable)) && nqp::not_i(nqp::istype(value, Parcel)) {
fail X::Cannot::Infinite.new(:action<.push to>)
fail X::Cannot::Infinite.new(:action<push to>)
if self.infinite;
self.gimme(*);
nqp::p6listitems(self);
Expand All @@ -324,7 +324,7 @@ class Array { # declared in BOOTSTRAP
}

multi method unshift(Array:D: *@values) {
fail X::Cannot::Infinite.new(:action<.push>, :what(self.^name))
fail X::Cannot::Infinite.new(:action<push>, :what(self.^name))
if @values.infinite;
nqp::p6listitems(self);
my $elems = self.gimme(*);
Expand Down
4 changes: 2 additions & 2 deletions src/core/Baggy.pm
View file
Expand Up @@ -229,7 +229,7 @@ my role Baggy does QuantHash {

proto method classify-list(|) { * }
multi method classify-list( &test, *@list ) {
fail X::Cannot::Infinite.new(:action<.classify>) if @list.infinite;
fail X::Cannot::Infinite.new(:action<classify>) if @list.infinite;
if @list {

# multi-level classify
Expand Down Expand Up @@ -259,7 +259,7 @@ my role Baggy does QuantHash {

proto method categorize-list(|) { * }
multi method categorize-list( &test, *@list ) {
fail X::Cannot::Infinite.new(:action<.categorize>) if @list.infinite;
fail X::Cannot::Infinite.new(:action<categorize>) if @list.infinite;
if @list {

# multi-level categorize
Expand Down
2 changes: 1 addition & 1 deletion src/core/Buf.pm
View file
Expand Up @@ -281,7 +281,7 @@ my role Buf[::T = uint8] does Blob[T] is repr('VMArray') is array_type(T) {
}

multi method push(Buf:D: @values is copy) {
fail X::Cannot::Infinite.new(:action<.push>, :what(self.^name))
fail X::Cannot::Infinite.new(:action<push>, :what(self.^name))
if @values.infinite;

my int $length = nqp::elems(self);
Expand Down
6 changes: 3 additions & 3 deletions src/core/Hash.pm
View file
Expand Up @@ -107,7 +107,7 @@ my class Hash { # declared in BOOTSTRAP
}

method push(*@values) {
fail X::Cannot::Infinite.new(:action<.push>, :what(self.^name))
fail X::Cannot::Infinite.new(:action<push>, :what(self.^name))
if @values.infinite;
my $previous;
my $has_previous;
Expand All @@ -130,7 +130,7 @@ my class Hash { # declared in BOOTSTRAP

proto method classify-list(|) { * }
multi method classify-list( &test, @list, :&as ) {
fail X::Cannot::Infinite.new(:action<.classify>) if @list.infinite;
fail X::Cannot::Infinite.new(:action<classify>) if @list.infinite;
if @list {

# multi-level classify
Expand Down Expand Up @@ -178,7 +178,7 @@ my class Hash { # declared in BOOTSTRAP

proto method categorize-list(|) { * }
multi method categorize-list( &test, @list, :&as ) {
fail X::Cannot::Infinite.new(:action<.categorize>) if @list.infinite;
fail X::Cannot::Infinite.new(:action<categorize>) if @list.infinite;
if @list {

# multi-level categorize
Expand Down
14 changes: 7 additions & 7 deletions src/core/List.pm
View file
Expand Up @@ -247,14 +247,14 @@ my class List does Positional { # declared in BOOTSTRAP
fail X::Cannot::Infinite.new(:action('.pop from')) if $!nextiter.defined;
$elems > 0
?? nqp::pop($!items)
!! fail X::Cannot::Empty.new(:action<.pop>, :what(self.^name));
!! fail X::Cannot::Empty.new(:action<pop>, :what(self.^name));
}

method shift() is parcel is nodal {
# make sure we have at least one item, then shift+return it
nqp::islist($!items) && nqp::existspos($!items, 0) || self.gimme(1)
?? nqp::shift($!items)
!! fail X::Cannot::Empty.new(:action<.shift>, :what(self.^name));
!! fail X::Cannot::Empty.new(:action<shift>, :what(self.^name));
}

multi method push(List:D: \value) {
Expand All @@ -272,7 +272,7 @@ my class List does Positional { # declared in BOOTSTRAP
}

multi method push(List:D: *@values) {
fail X::Cannot::Infinite.new(:action<.push>, :what(self.^name))
fail X::Cannot::Infinite.new(:action<push>, :what(self.^name))
if @values.infinite;
nqp::p6listitems(self);
my $elems = self.gimme(*);
Expand All @@ -299,7 +299,7 @@ my class List does Positional { # declared in BOOTSTRAP
}

multi method unshift(List:D: *@values) {
fail X::Cannot::Infinite.new(:action<.unshift>, :what(self.^name))
fail X::Cannot::Infinite.new(:action<unshift>, :what(self.^name))
if @values.infinite;
nqp::p6listitems(self);
nqp::unshift($!items, @values.pop) while @values;
Expand Down Expand Up @@ -361,7 +361,7 @@ my class List does Positional { # declared in BOOTSTRAP

method reverse() is nodal {
self.gimme(*);
fail X::Cannot::Infinite.new(:action<.reverse>) if $!nextiter.defined;
fail X::Cannot::Infinite.new(:action<reverse>) if $!nextiter.defined;
my Mu $rev := nqp::list();
my Mu $orig := nqp::clone($!items);
nqp::push($rev, nqp::pop($orig)) while $orig;
Expand All @@ -372,7 +372,7 @@ my class List does Positional { # declared in BOOTSTRAP

method rotate(Int $n is copy = 1) is nodal {
self.gimme(*);
fail X::Cannot::Infinite.new(:action<.rotate>) if $!nextiter.defined;
fail X::Cannot::Infinite.new(:action<rotate>) if $!nextiter.defined;
my $items = nqp::p6box_i(nqp::elems($!items));
return self if !$items;

Expand Down Expand Up @@ -456,7 +456,7 @@ my class List does Positional { # declared in BOOTSTRAP
}

method sort($by = &infix:<cmp>) is nodal {
fail X::Cannot::Infinite.new(:action<.sort>) if self.infinite; #MMD?
fail X::Cannot::Infinite.new(:action<sort>) if self.infinite; #MMD?

# Instead of sorting elements directly, we sort a Parcel of
# indices from 0..^$list.elems, then use that Parcel as
Expand Down
16 changes: 8 additions & 8 deletions src/core/native_array.pm
View file
Expand Up @@ -71,7 +71,7 @@ class array is Iterable is repr('VMArray') {
self
}
multi method push(array:D: @values) {
fail X::Cannot::Infinite.new(:action<.push>, :what(self.^name))
fail X::Cannot::Infinite.new(:action<push>, :what(self.^name))
if @values.infinite;
nqp::push_i(self, $_) for flat @values;
self
Expand All @@ -80,13 +80,13 @@ class array is Iterable is repr('VMArray') {
method pop(array:D:) returns int {
nqp::elems(self) > 0
?? nqp::pop_i(self)
!! die X::Cannot::Empty.new(:action<.pop>, :what(self.^name));
!! die X::Cannot::Empty.new(:action<pop>, :what(self.^name));
}

method shift() returns int {
nqp::elems(self) > 0
?? nqp::shift_i(self)
!! die X::Cannot::Empty.new(:action<.shift>, :what(self.^name));
!! die X::Cannot::Empty.new(:action<shift>, :what(self.^name));
}

multi method unshift(array:D: int $value) {
Expand All @@ -98,7 +98,7 @@ class array is Iterable is repr('VMArray') {
self
}
multi method unshift(array:D: @values) {
fail X::Cannot::Infinite.new(:action<.unshift>, :what(self.^name))
fail X::Cannot::Infinite.new(:action<unshift>, :what(self.^name))
if @values.infinite;
nqp::unshift_i(self, @values.pop) while @values;
self
Expand Down Expand Up @@ -277,7 +277,7 @@ class array is Iterable is repr('VMArray') {
self
}
multi method push(array:D: @values) {
fail X::Cannot::Infinite.new(:action<.push>, :what(self.^name))
fail X::Cannot::Infinite.new(:action<push>, :what(self.^name))
if @values.infinite;
nqp::push_n(self, $_) for flat @values;
self
Expand All @@ -286,13 +286,13 @@ class array is Iterable is repr('VMArray') {
method pop(array:D:) returns num {
nqp::elems(self) > 0
?? nqp::pop_n(self)
!! die X::Cannot::Empty.new(:action<.pop>, :what(self.^name));
!! die X::Cannot::Empty.new(:action<pop>, :what(self.^name));
}

method shift() returns num {
nqp::elems(self) > 0
?? nqp::shift_n(self)
!! die X::Cannot::Empty.new(:action<.shift>, :what(self.^name));
!! die X::Cannot::Empty.new(:action<shift>, :what(self.^name));
}

multi method unshift(array:D: num $value) {
Expand All @@ -304,7 +304,7 @@ class array is Iterable is repr('VMArray') {
self
}
multi method unshift(array:D: @values) {
fail X::Cannot::Infinite.new(:action<.unshift>, :what(self.^name))
fail X::Cannot::Infinite.new(:action<unshift>, :what(self.^name))
if @values.infinite;
nqp::unshift_n(self, @values.pop) while @values;
self
Expand Down

0 comments on commit 648a585

Please sign in to comment.