Skip to content
Permalink
Browse files

Revert original fix for R#2681

Which should at least unbreak R#2687 and associated
  • Loading branch information...
lizmat committed Feb 12, 2019
1 parent 5e5c909 commit 30fc5146ca875a289774c4ce1f0c43c6204b921c
Showing with 3 additions and 3 deletions.
  1. +3 −3 lib/NativeCall/Types.pm6
@@ -92,7 +92,7 @@ our class Pointer is repr('CPointer') {
our class CArray is repr('CArray') is array_type(Pointer) {
method AT-POS(::?CLASS:D: $pos) { die "CArray cannot be used without a type" }

my role IntTypedCArray[::TValue] does Iterable does Positional[TValue] is array_type(TValue) {
my role IntTypedCArray[::TValue] does Positional[TValue] is array_type(TValue) {
multi method AT-POS(::?CLASS:D \arr: $pos) is raw {
nqp::atposref_i(nqp::decont(arr), $pos);
}
@@ -124,7 +124,7 @@ our class CArray is repr('CArray') is array_type(Pointer) {
}
}

my role NumTypedCArray[::TValue] does Iterable does Positional[TValue] is array_type(TValue) {
my role NumTypedCArray[::TValue] does Positional[TValue] is array_type(TValue) {
multi method AT-POS(::?CLASS:D \arr: $pos) is raw {
nqp::atposref_n(nqp::decont(arr), $pos);
}
@@ -156,7 +156,7 @@ our class CArray is repr('CArray') is array_type(Pointer) {
}
}

my role TypedCArray[::TValue] does Iterable does Positional[TValue] is array_type(TValue) {
my role TypedCArray[::TValue] does Positional[TValue] is array_type(TValue) {
multi method AT-POS(::?CLASS:D \arr: $pos) is rw {
Proxy.new:
FETCH => method () {

5 comments on commit 30fc514

@MasterDuke17

This comment has been minimized.

Copy link
Contributor

replied Feb 12, 2019

Isn't this pretty much a revert of 5e5c909?

@lizmat

This comment has been minimized.

Copy link
Contributor Author

replied Feb 12, 2019

Yup.

@lizmat

This comment has been minimized.

Copy link
Contributor Author

replied Feb 12, 2019

Except for the original change?

@MasterDuke17

This comment has been minimized.

Copy link
Contributor

replied Feb 12, 2019

I guess I was confused by the commit message. Wasn't the original fix for #2681 (adding does Iterable to CArray) reverted in 5e5c909? So now we're back to where things were before aaa116e?

@lizmat

This comment has been minimized.

Copy link
Contributor Author

replied Feb 12, 2019

Yes, basically all of ada116e was reverted in the end

Please sign in to comment.
You can’t perform that action at this time.