Skip to content

Commit

Permalink
Adjust to new naming of the Endian enum
Browse files Browse the repository at this point in the history
  • Loading branch information
@lizmat
lizmat committed Dec 12, 2018
1 parent efbceca commit 30d9c37
Show file tree
Hide file tree
Showing 2 changed files with 70 additions and 70 deletions.
120 changes: 60 additions & 60 deletions S03-buf/read-int.t
View file
Expand Up @@ -12,8 +12,8 @@ my @bufs = (
Buf[uint8].new((^256).roll(19)), 'Buf[uint8]-random',
);

my constant my-native-endian =
blob8.new(1,0).read-int16(0) == 1 ?? little-endian !! big-endian;
my constant my-NativeEndian =
blob8.new(1,0).read-int16(0) == 1 ?? LittleEndian !! BigEndian;

plan @bufs * 120;

Expand All @@ -28,62 +28,62 @@ sub make-uint(\buffer,*@index --> UInt) {
}

# helper subs for creating uints out of a buffer
multi sub make-uint16(\buffer,int $i,little-endian) {
multi sub make-uint16(\buffer,int $i,LittleEndian) {
make-uint(buffer, $i + 1, $i)
}
multi sub make-uint16(\buffer,int $i,big-endian) {
multi sub make-uint16(\buffer,int $i,BigEndian) {
make-uint(buffer, $i, $i + 1)
}
multi sub make-uint32(\buffer,int $i,little-endian) {
multi sub make-uint32(\buffer,int $i,LittleEndian) {
make-uint(buffer, [$i+3 ... $i] ) # not sure why the [] is needed
}
multi sub make-uint32(\buffer,int $i,big-endian) {
multi sub make-uint32(\buffer,int $i,BigEndian) {
make-uint(buffer, $i .. $i+3)
}
multi sub make-uint64(\buffer,int $i,little-endian) {
multi sub make-uint64(\buffer,int $i,LittleEndian) {
make-uint(buffer, [$i+7 ... $i] ) # not sure why the [] is needed
}
multi sub make-uint64(\buffer,int $i,big-endian) {
multi sub make-uint64(\buffer,int $i,BigEndian) {
make-uint(buffer, $i .. $i+7)
}
multi sub make-uint128(\buffer,int $i,little-endian) {
multi sub make-uint128(\buffer,int $i,LittleEndian) {
make-uint(buffer, [$i+15 ... $i] ) # not sure why the [] is needed
}
multi sub make-uint128(\buffer,int $i,big-endian) {
multi sub make-uint128(\buffer,int $i,BigEndian) {
make-uint(buffer, $i .. $i+15)
}

# helper subs for creating ints out of a buffer
multi sub make-int16(\buffer,int $i,little-endian) {
my \unsigned := make-uint16(buffer,$i,little-endian);
multi sub make-int16(\buffer,int $i,LittleEndian) {
my \unsigned := make-uint16(buffer,$i,LittleEndian);
unsigned >= 1 +< 15 ?? unsigned - 1 +< 16 !! unsigned
}
multi sub make-int16(\buffer,int $i,big-endian) {
my \unsigned := make-uint16(buffer,$i,big-endian);
multi sub make-int16(\buffer,int $i,BigEndian) {
my \unsigned := make-uint16(buffer,$i,BigEndian);
unsigned >= 1 +< 15 ?? unsigned - 1 +< 16 !! unsigned
}
multi sub make-int32(\buffer,int $i,little-endian) {
my \unsigned := make-uint32(buffer,$i,little-endian);
multi sub make-int32(\buffer,int $i,LittleEndian) {
my \unsigned := make-uint32(buffer,$i,LittleEndian);
unsigned >= 1 +< 31 ?? unsigned - 1 +< 32 !! unsigned
}
multi sub make-int32(\buffer,int $i,big-endian) {
my \unsigned := make-uint32(buffer,$i,big-endian);
multi sub make-int32(\buffer,int $i,BigEndian) {
my \unsigned := make-uint32(buffer,$i,BigEndian);
unsigned >= 1 +< 31 ?? unsigned - 1 +< 32 !! unsigned
}
multi sub make-int64(\buffer,int $i,little-endian) {
my \unsigned := make-uint64(buffer,$i,little-endian);
multi sub make-int64(\buffer,int $i,LittleEndian) {
my \unsigned := make-uint64(buffer,$i,LittleEndian);
unsigned >= 1 +< 63 ?? unsigned - 1 +< 64 !! unsigned
}
multi sub make-int64(\buffer,int $i,big-endian) {
my \unsigned := make-uint64(buffer,$i,big-endian);
multi sub make-int64(\buffer,int $i,BigEndian) {
my \unsigned := make-uint64(buffer,$i,BigEndian);
unsigned >= 1 +< 63 ?? unsigned - 1 +< 64 !! unsigned
}
multi sub make-int128(\buffer,int $i,little-endian) {
my \unsigned := make-uint128(buffer,$i,little-endian);
multi sub make-int128(\buffer,int $i,LittleEndian) {
my \unsigned := make-uint128(buffer,$i,LittleEndian);
unsigned >= 1 +< 127 ?? unsigned - 1 +< 128 !! unsigned
}
multi sub make-int128(\buffer,int $i,big-endian) {
my \unsigned := make-uint128(buffer,$i,big-endian);
multi sub make-int128(\buffer,int $i,BigEndian) {
my \unsigned := make-uint128(buffer,$i,BigEndian);
unsigned >= 1 +< 127 ?? unsigned - 1 +< 128 !! unsigned
}

Expand All @@ -100,7 +100,7 @@ for @bufs -> \buffer, $name {
is buffer.read-int8($i), $signed, "is $name int8 $i correct";

# endianness doesn't matter for byte sized reads
for native-endian, little-endian, big-endian -> $endian {
for NativeEndian, LittleEndian, BigEndian -> $endian {
is buffer.read-uint8($i,$endian), $unsigned,
"is $name uint8 $i $endian correct";
is buffer.read-int8($i,$endian), $signed,
Expand All @@ -111,7 +111,7 @@ for @bufs -> \buffer, $name {
dies-ok { buffer.read-int8(-1) }, "does $name int8 -1 die";
dies-ok { buffer.read-uint8($elems) }, "does $name uint8 $elems die";
dies-ok { buffer.read-int8($elems) }, "does $name int8 $elems die";
for native-endian, little-endian, big-endian -> $endian {
for NativeEndian, LittleEndian, BigEndian -> $endian {
dies-ok { buffer.read-uint8(-1,$endian) },
"does $name uint8 -1 $endian die";
dies-ok { buffer.read-int8(-1,$endian) },
Expand All @@ -124,19 +124,19 @@ for @bufs -> \buffer, $name {

# read16
for outer2(^($elems - 1)) -> int $i {
my $unative := make-uint16(buffer,$i,my-native-endian);
my $unative := make-uint16(buffer,$i,my-NativeEndian);
is buffer.read-uint16($i), $unative,
"is $name $i uint16 correct";
is buffer.read-uint16($i,native-endian), $unative,
"is $name $i uint16 native-endian correct";
is buffer.read-uint16($i,NativeEndian), $unative,
"is $name $i uint16 NativeEndian correct";

my $native := make-int16(buffer,$i,my-native-endian);
my $native := make-int16(buffer,$i,my-NativeEndian);
is buffer.read-int16($i), $native,
"is $name $i int16 correct";
is buffer.read-int16($i,native-endian), $native,
"is $name $i int16 native-endian correct";
is buffer.read-int16($i,NativeEndian), $native,
"is $name $i int16 NativeEndian correct";

for little-endian, big-endian -> $endian {
for LittleEndian, BigEndian -> $endian {
is buffer.read-uint16($i,$endian), make-uint16(buffer,$i,$endian),
"is $name $i uint16 $endian correct";
is buffer.read-int16($i,$endian), make-int16(buffer,$i,$endian),
Expand All @@ -149,7 +149,7 @@ for @bufs -> \buffer, $name {
"does $name uint16 {$elems - 1} die";
dies-ok { buffer.read-int16($elems - 1) },
"does $name int16 {$elems - 1} die";
for native-endian, little-endian, big-endian -> $endian {
for NativeEndian, LittleEndian, BigEndian -> $endian {
dies-ok { buffer.read-uint16(-1,$endian) },
"does $name uint16 -1 $endian die";
dies-ok { buffer.read-int16(-1,$endian) },
Expand All @@ -162,19 +162,19 @@ for @bufs -> \buffer, $name {

# read32
for outer2(^($elems - 3)) -> int $i {
my $unative := make-uint32(buffer,$i,my-native-endian);
my $unative := make-uint32(buffer,$i,my-NativeEndian);
is buffer.read-uint32($i), $unative,
"is $name $i uint32 correct";
is buffer.read-uint32($i,native-endian), $unative,
"is $name $i uint32 native-endian correct";
is buffer.read-uint32($i,NativeEndian), $unative,
"is $name $i uint32 NativeEndian correct";

my $native := make-int32(buffer,$i,my-native-endian);
my $native := make-int32(buffer,$i,my-NativeEndian);
is buffer.read-int32($i), $native,
"is $name $i int32 correct";
is buffer.read-int32($i,native-endian), $native,
"is $name $i int32 native-endian correct";
is buffer.read-int32($i,NativeEndian), $native,
"is $name $i int32 NativeEndian correct";

for little-endian, big-endian -> $endian {
for LittleEndian, BigEndian -> $endian {
is buffer.read-uint32($i,$endian), make-uint32(buffer,$i,$endian),
"is $name $i uint32 $endian correct";
is buffer.read-int32($i,$endian), make-int32(buffer,$i,$endian),
Expand All @@ -187,7 +187,7 @@ for @bufs -> \buffer, $name {
"does $name uint32 {$elems - 3} die";
dies-ok { buffer.read-int32($elems - 3) },
"does $name int32 {$elems - 3} die";
for native-endian, little-endian, big-endian -> $endian {
for NativeEndian, LittleEndian, BigEndian -> $endian {
dies-ok { buffer.read-uint32(-1,$endian) },
"does $name uint32 -1 $endian die";
dies-ok { buffer.read-int32(-1,$endian) },
Expand All @@ -200,19 +200,19 @@ for @bufs -> \buffer, $name {

# read64
for outer2(^($elems - 7)) -> int $i {
my $unative := make-uint64(buffer,$i,my-native-endian);
my $unative := make-uint64(buffer,$i,my-NativeEndian);
is buffer.read-uint64($i), $unative,
"is $name $i uint64 correct";
is buffer.read-uint64($i,native-endian), $unative,
"is $name $i uint64 native-endian correct";
is buffer.read-uint64($i,NativeEndian), $unative,
"is $name $i uint64 NativeEndian correct";

my $native := make-int64(buffer,$i,my-native-endian);
my $native := make-int64(buffer,$i,my-NativeEndian);
is buffer.read-int64($i), $native,
"is $name $i int64 correct";
is buffer.read-int64($i,native-endian), $native,
"is $name $i int64 native-endian correct";
is buffer.read-int64($i,NativeEndian), $native,
"is $name $i int64 NativeEndian correct";

for little-endian, big-endian -> $endian {
for LittleEndian, BigEndian -> $endian {
is buffer.read-uint64($i,$endian), make-uint64(buffer,$i,$endian),
"is $name $i uint64 $endian correct";
is buffer.read-int64($i,$endian), make-int64(buffer,$i,$endian),
Expand All @@ -225,7 +225,7 @@ for @bufs -> \buffer, $name {
"does $name uint64 {$elems - 7} die";
dies-ok { buffer.read-int64($elems - 7) },
"does $name int64 {$elems - 7} die";
for native-endian, little-endian, big-endian -> $endian {
for NativeEndian, LittleEndian, BigEndian -> $endian {
dies-ok { buffer.read-uint64(-1,$endian) },
"does $name uint64 -1 $endian die";
dies-ok { buffer.read-int64(-1,$endian) },
Expand All @@ -238,19 +238,19 @@ for @bufs -> \buffer, $name {

# read128
for outer2(^($elems - 15)) -> int $i {
my $unative := make-uint128(buffer,$i,my-native-endian);
my $unative := make-uint128(buffer,$i,my-NativeEndian);
is buffer.read-uint128($i), $unative,
"is $name $i uint128 correct";
is buffer.read-uint128($i,native-endian), $unative,
"is $name $i uint128 native-endian correct";
is buffer.read-uint128($i,NativeEndian), $unative,
"is $name $i uint128 NativeEndian correct";

my $native := make-int128(buffer,$i,my-native-endian);
my $native := make-int128(buffer,$i,my-NativeEndian);
is buffer.read-int128($i), $native,
"is $name $i int128 correct";
is buffer.read-int128($i,native-endian), $native,
"is $name $i int128 native-endian correct";
is buffer.read-int128($i,NativeEndian), $native,
"is $name $i int128 NativeEndian correct";

for little-endian, big-endian -> $endian {
for LittleEndian, BigEndian -> $endian {
is buffer.read-uint128($i,$endian), make-uint128(buffer,$i,$endian),
"is $name $i uint128 $endian correct";
is buffer.read-int128($i,$endian), make-int128(buffer,$i,$endian),
Expand All @@ -263,7 +263,7 @@ for @bufs -> \buffer, $name {
"does $name uint128 {$elems - 15} die";
dies-ok { buffer.read-int128($elems - 15) },
"does $name int128 {$elems - 15} die";
for native-endian, little-endian, big-endian -> $endian {
for NativeEndian, LittleEndian, BigEndian -> $endian {
dies-ok { buffer.read-uint128(-1,$endian) },
"does $name uint128 -1 $endian die";
dies-ok { buffer.read-int128(-1,$endian) },
Expand Down
20 changes: 10 additions & 10 deletions S03-buf/read-num.t
View file
Expand Up @@ -8,8 +8,8 @@ my @bufs = (
Buf[uint8].new((^256).roll(9)), 'Buf[uint8]-random',
);

my constant my-native-endian =
blob8.new(1,0).read-int16(0) == 1 ?? little-endian !! big-endian;
my constant my-NativeEndian =
blob8.new(1,0).read-int16(0) == 1 ?? LittleEndian !! BigEndian;

plan @bufs * 24;

Expand All @@ -21,18 +21,18 @@ for @bufs -> \buffer, $name {
# use "try" until MoarVM #1020 is fixed
for ^($elems - 3) -> int $i {
ok try buffer.read-num32($i), "is $name $i num32 not 0";
ok try buffer.read-num32($i,native-endian),
"is $name $i num32 native-endian not 0";
ok try buffer.read-num32($i,NativeEndian),
"is $name $i num32 NativeEndian not 0";

for little-endian, big-endian -> $endian {
for LittleEndian, BigEndian -> $endian {
ok try buffer.read-num32($i,$endian),
"is $name $i num32 $endian not 0";
}
}
dies-ok { buffer.read-num32(-1) }, "does $name num32 -1 die";
dies-ok { buffer.read-num32($elems - 3) },
"does $name num32 {$elems - 3} die";
for native-endian, little-endian, big-endian -> $endian {
for NativeEndian, LittleEndian, BigEndian -> $endian {
dies-ok { buffer.read-num32(-1,$endian) },
"does $name num32 -1 $endian die";
dies-ok { buffer.read-num32(-1,$endian) },
Expand All @@ -42,18 +42,18 @@ for @bufs -> \buffer, $name {
# read64
for ^($elems - 7) -> int $i {
ok buffer.read-num64($i), "is $name $i num64 not 0";
ok buffer.read-num64($i,native-endian),
"is $name $i num64 native-endian not 0";
ok buffer.read-num64($i,NativeEndian),
"is $name $i num64 NativeEndian not 0";

for little-endian, big-endian -> $endian {
for LittleEndian, BigEndian -> $endian {
ok buffer.read-num64($i,$endian),
"is $name $i num64 $endian not 0";
}
}
dies-ok { buffer.read-num64(-1) }, "does $name num64 -1 die";
dies-ok { buffer.read-num64($elems - 7) },
"does $name num64 {$elems - 7} die";
for native-endian, little-endian, big-endian -> $endian {
for NativeEndian, LittleEndian, BigEndian -> $endian {
dies-ok { buffer.read-num64(-1,$endian) },
"does $name num64 -1 $endian die";
dies-ok { buffer.read-num64($elems - 7,$endian) },
Expand Down

0 comments on commit 30d9c37

Please sign in to comment.