@@ -4,7 +4,7 @@ use warnings; use inc::Module::Install 0.77; name 'Test-Class-Sugar'; -perl_version '5.010000'; +perl_version '5.008008'; all_from 'lib/Test/Class/Sugar.pm'; recommends 'Test::Most'; Makefile.PL @@ -31,7 +31,8 @@ use Sub::Exporter -setup => { unshift @$to_export, 'testclass', \&testclass; } foreach my $name (@$to_export) { - if (my $parser = __PACKAGE__->can($PARSER_FOR{$name}//'-NOTHING-')) { + my $parser_called = defined $PARSER_FOR{$name} ? $PARSER_FOR{$name} : '-NOTHING-'; + if (my $parser = __PACKAGE__->can($parser_called)) { Devel::Declare->setup_for( $pack, { $name => { const => sub { $parser->($pack, $args->{col}{defaults}, @_) } } }, @@ -56,7 +57,7 @@ sub _testclass_generator { my($ctx, $classname, $defaults, $options) = @_; foreach my $key (keys %$defaults) { - $options->{$key} //= $defaults->{$key}; + defined $options->{$key} ? () : ($options->{$key} = $defaults->{$key}); } my $ret = Test::Class::Sugar::CodeGenerator->new( lib/Test/Class/Sugar.pm @@ -74,7 +74,8 @@ class Test::Class::Sugar::CodeGenerator { } method helpers { - @{$self->options->{helpers} //= [qw{Test::Most}]}; + $self->options->{helpers} = [qw{Test::Most}] unless defined $self->options->{helpers}; + @{$self->options->{helpers}}; } method use_helpers_string { @@ -109,8 +110,9 @@ class Test::Class::Sugar::CodeGenerator { method inject_testclass { $self->context->skipspace; - $self->context->inject_if_block($self->testclass_preamble) // - croak "Expecting an opening brace"; + my $inject = $self->context->inject_if_block($self->testclass_preamble); + croak "Expecting an opening brace" unless defined $inject; + $inject; } method shadow_testclass { @@ -118,8 +120,8 @@ class Test::Class::Sugar::CodeGenerator { } method install_testclass { - $self->has_classname - // croak "You provide either a class name or an exercises clause"; + croak "You provide either a class name or an exercises clause" + unless defined $self->has_classname; $self->inject_testclass; $self->shadow_testclass; lib/Test/Class/Sugar/CodeGenerator.pm @@ -44,8 +44,8 @@ sub strip_names { unless($self->looking_at('>>')) { while (! $self->looking_at(qr/(?:{|>>)/,1) ) { $self->looking_at(qr{\w}) or croak("I don't understand ", $self->peek_next_char); - $name .= ('_' . $self->strip_name) - // croak "Expecting a simple name; try quoting it"; + $name .= ('_' . $self->strip_name); + croak "Expecting a simple name; try quoting it" unless defined $name; $self->skipspace; } } @@ -70,7 +70,9 @@ sub strip_test_name { sub looking_at { my($self, $expected, $len) = @_; - $len //= ref($expected) ? undef : length($expected); + unless (defined $len) { + $len = ref($expected) ? undef : length($expected); + } $expected = quotemeta($expected) unless ref($expected); @@ -115,10 +117,10 @@ sub strip_options { my %ret; while (!$self->looking_at(qr/[{"]/)) { - $self->strip_base_classes(\%ret) - // $self->strip_helper_classes(\%ret) - // $self->strip_class_under_test(\%ret) - // croak 'Expected option name'; + defined $self->strip_base_classes(\%ret) ? () + : defined $self->strip_helper_classes(\%ret) ? () + : defined $self->strip_class_under_test(\%ret) ? () + : croak 'Expected option name'; $self->skipspace; } @@ -132,8 +134,9 @@ sub strip_class_under_test { croak "testclass can only exercise one class" if $opts->{class_under_test}; - $opts->{class_under_test} = $self->strip_name - // croak "Expected a class name"; + my $name = $self->strip_name; + croak "Expected a class name" unless defined $name; + $opts->{class_under_test} = $name; return 1; } @@ -142,7 +145,7 @@ sub strip_helper_classes { my($self, $opts) = @_; return unless $self->strip_string('uses'); - $opts->{helpers} //= []; + $opts->{helpers} = [] unless defined $opts->{helpers}; while (1) { $self->skipspace; @@ -151,8 +154,8 @@ sub strip_helper_classes { $helper .= 'Test::'; } - $helper .= $self->strip_name - // croak "Expecting a test helper name"; + my $name = $self->strip_name; + $helper .= $name; push @{$opts->{helpers}}, $helper; return 1 unless $self->strip_comma; } @@ -165,8 +168,8 @@ sub strip_base_classes { while (1) { $self->skipspace; - my $baseclass = $self->strip_name - // croak 'expecting a base class'; + my $baseclass = $self->strip_name; + croak 'expecting a base class' unless defined $baseclass; $ret->{base} .= "$baseclass "; return 1 unless $self->strip_comma; } lib/Test/Class/Sugar/Context.pm 7f4f83fdef68f5044d921f7835c0a39e20b6524f Joel Bernstein joel.bernstein@net-a-porter.com http://github.com/pdcawley/test-class-sugar/commit/db7978cfa50ffa924a73cea3feca585375f56f36 db7978cfa50ffa924a73cea3feca585375f56f36 2009-11-06T04:39:37-08:00 2009-11-06T04:39:37-08:00 remove uses of defined-or operator, permits T::C::Sugar to run on 5.8.x 83052ad8e7adf24407562e534d561b360d170a13 Joel Bernstein joel.bernstein@net-a-porter.com