misc.pd (PDL-2.082) | : | misc.pd (PDL-2.083) | ||
---|---|---|---|---|
skipping to change at line 384 | skipping to change at line 384 | |||
my $class = shift; | my $class = shift; | |||
barf 'Usage ($x,$y,...) = rcols( *HANDLE|"filename", ["/pattern/" or \%option s], $col1, $col2, ..., [ \%options] )' | barf 'Usage ($x,$y,...) = rcols( *HANDLE|"filename", ["/pattern/" or \%option s], $col1, $col2, ..., [ \%options] )' | |||
if $#_<0; | if $#_<0; | |||
my $is_handle = _is_io_handle $_[0]; | my $is_handle = _is_io_handle $_[0]; | |||
my $fh = $is_handle ? $_[0] : gensym; | my $fh = $is_handle ? $_[0] : gensym; | |||
open $fh, $_[0] or die "File $_[0] not found\n" unless $is_handle; | open $fh, $_[0] or die "File $_[0] not found\n" unless $is_handle; | |||
shift; | shift; | |||
# set up default options | # set up default options | |||
my $opt = new PDL::Options( { | my $opt = PDL::Options->new( { | |||
CHUNKSIZE => undef, | CHUNKSIZE => undef, | |||
COLIDS => undef, | COLIDS => undef, | |||
COLSEP => undef, | COLSEP => undef, | |||
DEFTYPE => $deftype, | DEFTYPE => $deftype, | |||
EXCLUDE => '/^#/', | EXCLUDE => '/^#/', | |||
INCLUDE => undef, | INCLUDE => undef, | |||
LINES => '', | LINES => '', | |||
PERLCOLS => undef, | PERLCOLS => undef, | |||
TYPES => [], | TYPES => [], | |||
VERBOSE=> $PDL::verbose, | VERBOSE=> $PDL::verbose, | |||
skipping to change at line 1093 | skipping to change at line 1093 | |||
my $is_handle = _is_io_handle $_[0]; | my $is_handle = _is_io_handle $_[0]; | |||
my $fh = $is_handle ? $_[0] : gensym; | my $fh = $is_handle ? $_[0] : gensym; | |||
open $fh, $_[0] or die "File $_[0] not found\n" unless $is_handle; | open $fh, $_[0] or die "File $_[0] not found\n" unless $is_handle; | |||
if (ref($pattern) ne "CODE") { | if (ref($pattern) ne "CODE") { | |||
die "Got a ".ref($pattern)." for rgrep?!"; | die "Got a ".ref($pattern)." for rgrep?!"; | |||
} | } | |||
# set up default options | # set up default options | |||
my $opt = new PDL::Options( { | my $opt = PDL::Options->new( { | |||
DEFTYPE => $deftype, | DEFTYPE => $deftype, | |||
TYPES => [], | TYPES => [], | |||
UNDEFINED => $PDL::undefval, | UNDEFINED => $PDL::undefval, | |||
BUFFERSIZE => 10000 | BUFFERSIZE => 10000 | |||
} ); | } ); | |||
# Check if the user specified options | # Check if the user specified options | |||
my $u_opt = $_[1] || {}; | my $u_opt = $_[1] || {}; | |||
$opt->options( $u_opt); | $opt->options( $u_opt); | |||
my $options = $opt->current(); | my $options = $opt->current(); | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |