Merge branch 'master' into 64bit-index-support

PDLPorters · Feb 10, 2013 · 0e25005 · 0e25005
2 parents 9ee953d + c3a70d0
commit 0e25005
Show file tree

Hide file tree

Showing 14 changed files with 1,531 additions and 318 deletions.
diff --git a/Basic/Bad/bad.pd b/Basic/Bad/bad.pd
diff --git a/Basic/Gen/PP.pm b/Basic/Gen/PP.pm
@@ -2828,14 +2828,14 @@ sub build_pars_from_fulldoc {
 
 	# Get the signature or die
 	my $sig = extract_signature_from_fulldoc($fulldoc)
-		or croak('No Pars specified and none could be extracted from FullDoc');
+		or confess('No Pars specified and none could be extracted from FullDoc');
 
 	# Everything is semicolon-delimited
 	my @args = split /\s*;\s*/, $sig;
 	my @pars;
 	my $switched_to_other_pars = 0;
 	for my $arg (@args) {
-		croak('All PDL args must come before other pars in FullDoc signature')
+		confess('All PDL args must come before other pars in FullDoc signature')
 			if $switched_to_other_pars and $arg =~ $pars_re;
 		if ($arg =~ $pars_re) {
 			push @pars, $arg;
@@ -2846,7 +2846,7 @@ sub build_pars_from_fulldoc {
 	}
 
 	# Make sure there's something there
-	croak('FullDoc signature contains no PDL arguments') if @pars == 0;
+	confess('FullDoc signature contains no PDL arguments') if @pars == 0;
 
 	# All done!
 	return join('; ', @pars);
@@ -2874,7 +2874,7 @@ sub build_otherpars_from_fulldoc {
 	my @args = split /\s*;\s*/, $sig;
 	my @otherpars;
 	for my $arg (@args) {
-		croak('All PDL args must come before other pars in FullDoc signature')
+		confess('All PDL args must come before other pars in FullDoc signature')
 			if @otherpars > 0 and $arg =~ $pars_re;
 		if ($arg !~ $pars_re) {
 			push @otherpars, $arg;
@@ -2972,6 +2972,9 @@ $PDL::PP::deftbl =
          # Append a final cut if it doesn't exist due to heredoc shinanigans
          $fulldoc .= "\n\n=cut\n" unless $fulldoc =~ /\n=cut\n*$/;
 
+         # Make sure the =head1 FUNCTIONS section gets added
+         $::DOCUMENTED++;
+
          return $fulldoc;
       }
    ),

diff --git a/Basic/PDL.pm b/Basic/PDL.pm
@@ -146,7 +146,7 @@ start-up modules.
 
 
 # set the version:
-$PDL::VERSION = '2.4.11_004'; # Go to sub numbering per git push
+$PDL::VERSION = '2.4.11_010'; # Go to sub numbering per git push
 
 # Main loader of standard PDL package
 

diff --git a/Basic/SourceFilter/FilterSimple.pm b/Basic/SourceFilter/FilterSimple.pm
@@ -3,14 +3,15 @@
 use Filter::Simple;
 
 FILTER_ONLY
+   all => sub { s/\r\n/\n/g if $^V lt v5.14.0 and $^O eq 'MSWin32'; },
    code_no_comments =>
-   # all =>
       sub {
       my ($text1,$text2) = ($_,'');
       ## print STDERR "**************** Input: \n$text1\n";
       $text2 = perldlpp('PDL::NiceSlice', $text1);
       ## print STDERR "**************** Output: $text2\n";
       $_ = $text2;
-   };
+   },
+   all => sub { print if $PDL::NiceSlice::debug_filter };
 
 1;
diff --git a/Basic/SourceFilter/NiceSlice.pm b/Basic/SourceFilter/NiceSlice.pm
@@ -4,7 +4,8 @@ BEGIN {
       'Filter::Simple'     => 'PDL/NiceSlice/FilterSimple.pm',
    );  # to validate names
 
-   $PDL::NiceSlice::engine = $engine_ok{'Filter::Util::Call'};  # default engine type
+   ## $PDL::NiceSlice::engine = $engine_ok{'Filter::Util::Call'};  # default engine type
+   $PDL::NiceSlice::engine = $engine_ok{'Filter::Simple'};  # default engine type
 
    if ( exists $ENV{PDL_NICESLICE_ENGINE} ) {
       my $engine = $ENV{PDL_NICESLICE_ENGINE};
@@ -39,7 +40,7 @@ package PDL::NiceSlice;
 # Modified 5-Nov-2007: stop processing if we encounter m/^no\s+PDL\;:\;:NiceSlice\;\s*$/.
 
 $PDL::NiceSlice::VERSION = '1.0.3';
-$PDL::NiceSlice::debug = 0;
+$PDL::NiceSlice::debug = defined($PDL::NiceSlice::debug) ? $PDL::NiceSlice::debug : 0;
 # the next one is largely stolen from Regexp::Common
 my $RE_cmt = qr'(?:(?:\#)(?:[^\n]*)(?:\n))';
 
@@ -338,7 +339,7 @@ sub reinstator_regexp{
 # as a preprocessor
 sub perldlpp {
  my ($class, $txt) = @_;
-
+ local($_);
  ##############################
  # Backwards compatibility to before the two-parameter form. The only
  # call should be around line 206 of PDL::AutoLoader, but one never

diff --git a/Doc/Doc.pm b/Doc/Doc.pm
@@ -267,9 +267,10 @@ gives examples of typical usage for the current function:
 =item Bad
 
 provides information on how the function handles bad values (if
-C<$PDL:Config{WITH_BADVAL}> is set to 1). The intention is to
-have this information automatically created for pp-compiled
-functions, although it can be over-ridden.
+C<$PDL:Config{WITH_BADVAL}> is set to 1). The documentation under
+this directive should indicate if this function accepts piddles
+with bad values and under what circumstances this function might
+return piddles with bad values.
 
 =back
 

diff --git a/Graphics/Graphics2D.pm b/Graphics/Graphics2D.pm
@@ -823,6 +823,10 @@ sub imag2d_update {
    die "imag2d_update: callback could not find image window\n" unless defined $img;
 
    # update display window
+   # TODO: do we need to save and restore the current window?
+   # For now: calling imag2d_update makes that window current
+   glutSetWindow($win_id);
+
    $img .= $image->sever;
    glutPostRedisplay();
 

diff --git a/Graphics/PGPLOT/Window/Window.pm b/Graphics/PGPLOT/Window/Window.pm
@@ -1489,10 +1489,10 @@ set pen=0 for both that point and the point before it.
 
 =for usage
 
- Usage: $w->( $x, $y, [$pen], [$opt] );
-        $w->( $xy, [$pen], [$opt] );
-        $w->( \@xvects, \@yvects, [\@pen], [$opt] );
-        $w->( \@xyvects, [\@pen], [$opt] );
+ Usage: $w->lines( $x, $y, [$pen], [$opt] );
+        $w->lines( $xy, [$pen], [$opt] );
+        $w->lines( \@xvects, \@yvects, [\@pen], [$opt] );
+        $w->lines( \@xyvects, [\@pen], [$opt] );
 
 The following standard options influence this command:
  AXIS, BORDER, COLO(U)R, LINESTYLE, LINEWIDTH, MISSING,