generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-03-22 00:19:19 +01:00
Code Issues Projects Releases Wiki Activity

perl: More kind error messages in PP

Browse Source
This commit is contained in:
gfx 2010-09-18 14:38:35 +09:00
parent c707392a5a
commit a86c1624a7
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
perl/lib/Data/MessagePack/PP.pm
View File

@ -113,6 +113,9 @@ BEGIN {
} }
} }
sub _unexpected {
Carp::confess("Unexpected " . sprintf(shift, @_) . " found");
}
# #
# PACK # PACK
@ -141,7 +144,7 @@ sub _pack {
$num < 16 ? CORE::pack( 'C', 0x90 + $num ) $num < 16 ? CORE::pack( 'C', 0x90 + $num )
: $num < 2 ** 16 - 1 ? CORE::pack( 'Cn', 0xdc, $num ) : $num < 2 ** 16 - 1 ? CORE::pack( 'Cn', 0xdc, $num )
: $num < 2 ** 32 - 1 ? CORE::pack( 'CN', 0xdd, $num ) : $num < 2 ** 32 - 1 ? CORE::pack( 'CN', 0xdd, $num )
: die "" # don't arrivie here : _unexpected("number %d", $num)
; ;
if ( --$max_depth <= 0 ) { if ( --$max_depth <= 0 ) {
Carp::croak("perl structure exceeds maximum nesting level (max_depth set too low?)"); Carp::croak("perl structure exceeds maximum nesting level (max_depth set too low?)");
@ -155,7 +158,7 @@ sub _pack {
$num < 16 ? CORE::pack( 'C', 0x80 + $num ) $num < 16 ? CORE::pack( 'C', 0x80 + $num )
: $num < 2 ** 16 - 1 ? CORE::pack( 'Cn', 0xde, $num ) : $num < 2 ** 16 - 1 ? CORE::pack( 'Cn', 0xde, $num )
: $num < 2 ** 32 - 1 ? CORE::pack( 'CN', 0xdf, $num ) : $num < 2 ** 32 - 1 ? CORE::pack( 'CN', 0xdf, $num )
: die "" # don't arrivie here : _unexpected("number %d", $num)
; ;
if ( --$max_depth <= 0 ) { if ( --$max_depth <= 0 ) {
Carp::croak("perl structure exceeds maximum nesting level (max_depth set too low?)"); Carp::croak("perl structure exceeds maximum nesting level (max_depth set too low?)");
@ -211,7 +214,7 @@ sub _pack {
$num < 32 ? CORE::pack( 'C', 0xa0 + $num ) $num < 32 ? CORE::pack( 'C', 0xa0 + $num )
: $num < 2 ** 16 - 1 ? CORE::pack( 'Cn', 0xda, $num ) : $num < 2 ** 16 - 1 ? CORE::pack( 'Cn', 0xda, $num )
: $num < 2 ** 32 - 1 ? CORE::pack( 'CN', 0xdb, $num ) : $num < 2 ** 32 - 1 ? CORE::pack( 'CN', 0xdb, $num )
: die "" # don't arrivie here : _unexpected_number($num)
; ;
return $header . $value; return $header . $value;
@ -221,7 +224,7 @@ sub _pack {
return pack_double( $value ); return pack_double( $value );
} }
else { else {
die "???"; _unexpected("data type %s", $b_obj);
} }
} }
@ -365,7 +368,7 @@ sub _unpack {
} }
else { else {
die "???"; _unexpected("byte 0x%02x", $byte);
} }
} }
@ -484,7 +487,7 @@ sub _count {
: $byte == 0xcd ? 2 : $byte == 0xcd ? 2
: $byte == 0xce ? 4 : $byte == 0xce ? 4
: $byte == 0xcf ? 8 : $byte == 0xcf ? 8
: die; : _unexpected("byte 0x%02x", $byte);
return 1; return 1;
} }
@ -493,7 +496,7 @@ sub _count {
: $byte == 0xd1 ? 2 : $byte == 0xd1 ? 2
: $byte == 0xd2 ? 4 : $byte == 0xd2 ? 4
: $byte == 0xd3 ? 8 : $byte == 0xd3 ? 8
: die; : _unexpected("byte 0x%02x", $byte);
return 1; return 1;
} }
@ -524,7 +527,7 @@ sub _count {
} }
else { else {
die "???"; _unexpected("byte 0x%02x", $byte);
} }
return 0; return 0;

6
perl/t/50_leaktrace.t
View File

@ -2,8 +2,12 @@
use strict; use strict;
use Test::Requires { 'Test::LeakTrace' => 0.13 }; use Test::Requires { 'Test::LeakTrace' => 0.13 };
use Test::More; use Test::More;
use Data::MessagePack; use Data::MessagePack;
BEGIN {
if($INC{'Data/MessagePack/PP.pm'}) {
plan skip_all => 'disabled in PP';
}
}
my $simple_data = "xyz"; my $simple_data = "xyz";
my $complex_data = { my $complex_data = {