.gitignore GNUmakefile Makefile.PL t/9000-text-for-count-has-a-bad-pattern.t @@ -1,6 +1,7 @@ 0.13 Wednesday October 01 11:44:03 PDT 2008: - Conversion from Build.PL to Makefile.PL (Module::Install) - Move from svn to git (github) + - Fix for RT39738 (http://rt.cpan.org/Ticket/Display.html?id=39738) 0.12 2006-10-3 + More documentation. 0.11 2006-10-2 Changes @@ -3,14 +3,14 @@ NAME words. VERSION - Version 0.12 + Version 0.13 SYNOPSIS Generate formatted nonsense using random Latin words. use Text::Lorem::More; - my $lorem = Text::Lorem::More->new(); + my $lorem = Text::Lorem::More->new; # Greet a friend print "Hello, ", $lorem->fullname, "\n"; README @@ -9,7 +9,7 @@ Text::Lorem::More - Generate formatted nonsense using random Latin words. =head1 VERSION -Version 0.12 +Version 0.13 =head1 SYNOPSIS @@ -17,7 +17,7 @@ Generate formatted nonsense using random Latin words. use Text::Lorem::More; - my $lorem = Text::Lorem::More->new(); + my $lorem = Text::Lorem::More->new; # Greet a friend print "Hello, ", $lorem->fullname, "\n"; @@ -40,12 +40,14 @@ Generate formatted nonsense using random Latin words. =cut -our $VERSION = '0.12'; +our $VERSION = '0.13'; + +use base qw/Exporter/; -use Text::Lorem::More::Source; use Carp; -use base qw(Exporter); use Parse::RecDescent; + +use Text::Lorem::More::Source; our $PARSER = Parse::RecDescent->new(<<'_END_'); content: <rulevar: local @content > @@ -415,11 +417,12 @@ sub _process { my $separator = shift; $RECURSION += 1; - croak "too much recursion ($RECURSION) on \"$content\"" if $RECURSION >= MAXIMUM_RECURSION; + croak "Too much recursion ($RECURSION) on \"$content\"" if $RECURSION >= MAXIMUM_RECURSION; $count = 1 unless defined $count; + croak "\$count ($count) should be a number" unless $count =~ m/^\d+$/; + $separator = " " unless defined $separator; - carp "count must be a number, not \"$count\"" if ref $count || $count !~ m/^\d$/; local $Text::Lorem::More::COUNT = $count; $COUNT = $COUNT; local $Text::Lorem::More::PRUNE = 0; @@ -449,11 +452,12 @@ sub _generate { my $fast = shift; $RECURSION += 1; - croak "too much recursion ($RECURSION) on \"$pattern\"" if $RECURSION >= MAXIMUM_RECURSION; + croak "Too much recursion ($RECURSION) on \"$pattern\"" if $RECURSION >= MAXIMUM_RECURSION; $count = 1 unless defined $count; + croak "\$count ($count) should be a number" unless $count =~ m/^\d+$/; + $separator = " " unless defined $separator; - carp "count must be a number, not \"$count\"" if ref $count || $count !~ m/^\d$/; local $Text::Lorem::More::COUNT = $count; $COUNT = $COUNT; local $Text::Lorem::More::PRUNE = 0; @@ -491,7 +495,7 @@ sub _replace_pattern { $content = $generatelet->($self); } else { - croak "don't know how to run/handle generatelet \"$generatelet\""; + croak "Don't know how to run/handle generatelet \"$generatelet\""; } if (ref $content eq "ARRAY") { lib/Text/Lorem/More.pm ab3e6bb4629618f7377f61f5dff7008d29723af5 robertkrimen robertkrimen@gmail.com http://github.com/robertkrimen/text-lorem-more/commit/4f385813ab16e50ef39f6271afb6b7211745c4b5 4f385813ab16e50ef39f6271afb6b7211745c4b5 2008-10-01T12:04:49-07:00 2008-10-01T12:04:49-07:00 Fix for RT39738 (http://rt.cpan.org/Ticket/Display.html?id=39738) e086ef8648a90ce68fcc880cc408f719fa7de400 robertkrimen robertkrimen@gmail.com