X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FScalar%2FVec%2FUtil.pm;h=5fa5fa21147e0870a6d20fdfc4809e64dd6c9f64;hb=5287145983fdaeadb8adadd96292e05e2cda239a;hp=dd8b1cbcea3b3cdb30da08a3098a114c9701b838;hpb=856caa5792565f48b11a5dc86856519b649eaffb;p=perl%2Fmodules%2FScalar-Vec-Util.git

diff --git a/lib/Scalar/Vec/Util.pm b/lib/Scalar/Vec/Util.pm
index dd8b1cb..5fa5fa2 100644
--- a/lib/Scalar/Vec/Util.pm
+++ b/lib/Scalar/Vec/Util.pm
@@ -11,13 +11,13 @@ Scalar::Vec::Util - Utility routines for vec strings.
 
 =head1 VERSION
 
-Version 0.05
+Version 0.06
 
 =cut
 
 our $VERSION;
 BEGIN {
- $VERSION = '0.05';
+ $VERSION = '0.06';
  eval {
   require XSLoader;
   XSLoader::load(__PACKAGE__, $VERSION);
@@ -72,20 +72,16 @@ Grows C<$vec> if necessary.
 
 =cut
 
-sub _alldef {
- for (@_) { return 0 unless defined }
- return 1;
-}
-
-sub vfill_pp {
- (undef, my $s, my $l, my $x) = @_;
- croak "Invalid argument" unless _alldef @_;
+sub vfill_pp ($$$$) {
+ my ($s, $l, $x) = @_[1 .. 3];
  return unless $l;
+ croak 'Invalid negative offset' if $s < 0;
+ croak 'Invalid negative length' if $l < 0;
  $x = ~0 if $x;
  my $SIZE = 32;
  my $t = int($s / $SIZE) + 1;
  my $u = int(($s + $l) / $SIZE);
- if ($SIZE * $t < $s + $l and $t <= $u) {
+ if ($SIZE * $t < $s + $l) { # implies $t <= $u
   vec($_[0], $_, 1)     = $x for $s .. $SIZE * $t - 1;
   vec($_[0], $_, $SIZE) = $x for $t .. $u - 1;
   vec($_[0], $_, 1)     = $x for $SIZE * $u .. $s + $l - 1;
@@ -103,10 +99,11 @@ Doesn't need to allocate any extra memory.
 
 =cut
 
-sub vcopy_pp {
+sub vcopy_pp ($$$$$) {
  my ($fs, $ts, $l) = @_[1, 3, 4];
- croak "Invalid argument" unless _alldef @_;
  return unless $l;
+ croak 'Invalid negative offset' if $fs < 0 or $ts < 0;
+ croak 'Invalid negative length' if $l  < 0;
  my $step = $ts - $fs;
  if ($step <= 0) { 
   vec($_[2], $_ + $step, 1) = vec($_[0], $_, 1) for $fs .. $fs + $l - 1;
@@ -124,9 +121,11 @@ Doesn't need to allocate any extra memory.
 
 =cut
 
-sub vshift {
+sub vshift ($$$$;$) {
  my ($start, $length, $bits, $insert) = @_[1 .. 4];
- return unless $bits;
+ return unless $length and $bits;
+ croak 'Invalid negative offset' if $start  < 0;
+ croak 'Invalid negative length' if $length < 0;
  my $left = 1;
  if ($bits < 0) {
   $left = 0;
@@ -154,9 +153,11 @@ Currently allocates an extra buffer of size C<O($bits)>.
 
 =cut
 
-sub vrot {
+sub vrot ($$$$) {
  my ($start, $length, $bits) = @_[1 .. 3];
  return unless $length and $bits;
+ croak 'Invalid negative offset' if $start  < 0;
+ croak 'Invalid negative length' if $length < 0;
  my $left = 1;
  if ($bits < 0) {
   $left = 0;
@@ -184,9 +185,10 @@ If needed, C<$length> is decreased to fit inside C<$v1> and C<$v2> boundaries.
 
 =cut
 
-sub veq_pp {
+sub veq_pp ($$$$$) {
  my ($s1, $s2, $l) = @_[1, 3, 4];
- croak "Invalid argument" unless _alldef @_;
+ croak 'Invalid negative offset' if $s1 < 0 or $s2 < 0;
+ croak 'Invalid negative length' if $l  < 0;
  my $i = 0;
  while ($i < $l) {
   return 0 if vec($_[0], $s1 + $i, 1) != vec($_[2], $s2 + $i, 1);
@@ -328,7 +330,7 @@ Tests code coverage report is available at L<http://www.profvince.com/perl/cover
 
 =head1 COPYRIGHT & LICENSE
 
-Copyright 2008 Vincent Pit, all rights reserved.
+Copyright 2008-2009 Vincent Pit, all rights reserved.
 
 This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself.