Index: ossp-pkg/string-divert/ChangeLog RCS File: /v/ossp/cvs/ossp-pkg/string-divert/ChangeLog,v rcsdiff -q -kk '-r1.3' '-r1.4' -u '/v/ossp/cvs/ossp-pkg/string-divert/ChangeLog,v' 2>/dev/null --- ChangeLog 2003/05/29 18:43:50 1.3 +++ ChangeLog 2003/09/22 12:58:25 1.4 @@ -2,6 +2,8 @@ ChangeLog ========= + 0.93 (22-Sep-2003) + o fix obj->folder(format, pattern) implementation 0.92 (29-Apr-2003) o fix auto-indentation generation on unfolding o add "storage" mode functionality Index: ossp-pkg/string-divert/Divert.pm RCS File: /v/ossp/cvs/ossp-pkg/string-divert/Divert.pm,v rcsdiff -q -kk '-r1.5' '-r1.6' -u '/v/ossp/cvs/ossp-pkg/string-divert/Divert.pm,v' 2>/dev/null --- Divert.pm 2003/05/29 18:45:49 1.5 +++ Divert.pm 2003/09/22 12:58:25 1.6 @@ -36,7 +36,7 @@ require Exporter; -our $VERSION = '0.92'; +our $VERSION = '0.93'; our @ISA = qw(Exporter); our @EXPORT_OK = qw(new destroy DESTROY @@ -327,9 +327,9 @@ if (defined($b)) { # configure folder my $test = sprintf($a, "foo"); - my $id = ($test =~ m|${b}()|s); + my ($id) = ($test =~ m|${b}()|s); die "folder construction format and matching regular expression do not correspond" - if ($id ne "foo"); + if (not defined($id) or (defined($id) and $id ne "foo")); $self->{foldermk} = $a; $self->{folderre} = $b; return; Index: ossp-pkg/string-divert/test.pl RCS File: /v/ossp/cvs/ossp-pkg/string-divert/test.pl,v rcsdiff -q -kk '-r1.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/string-divert/test.pl,v' 2>/dev/null --- test.pl 2003/05/23 11:09:57 1.2 +++ test.pl 2003/09/22 12:58:25 1.3 @@ -23,7 +23,7 @@ ## use 5.006; -use Test::More tests => 36; +use Test::More tests => 37; # test: module loading BEGIN { use_ok('String::Divert') }; @@ -132,3 +132,8 @@ $x << 0; ok("$x" eq "foobarbazquux", "diversion"); +# configuring folder patters +$x->assign("x"); +$x->folder('{#%s#}', '\{#([a-zA-Z_][a-zA-Z0-9_.-]*)#\}'); +ok("$x" eq "x", "folder pattern 1"); +