[Bast-commits] r4954 - in
Devel-Declare/1.000/branches/context_object:
lib/Devel/Declare/Context lib/Devel/Declare/MethodInstaller t
rhesa at dev.catalyst.perl.org
rhesa at dev.catalyst.perl.org
Wed Oct 22 23:09:50 BST 2008
Author: rhesa
Date: 2008-10-22 23:09:49 +0100 (Wed, 22 Oct 2008)
New Revision: 4954
Modified:
Devel-Declare/1.000/branches/context_object/lib/Devel/Declare/Context/Simple.pm
Devel-Declare/1.000/branches/context_object/lib/Devel/Declare/MethodInstaller/Simple.pm
Devel-Declare/1.000/branches/context_object/t/methinstaller-simple.t
Log:
improvements from MX::MS and MX::Declare
Modified: Devel-Declare/1.000/branches/context_object/lib/Devel/Declare/Context/Simple.pm
===================================================================
--- Devel-Declare/1.000/branches/context_object/lib/Devel/Declare/Context/Simple.pm 2008-10-22 18:41:56 UTC (rev 4953)
+++ Devel-Declare/1.000/branches/context_object/lib/Devel/Declare/Context/Simple.pm 2008-10-22 22:09:49 UTC (rev 4954)
@@ -1,10 +1,11 @@
package Devel::Declare::Context::Simple;
use Devel::Declare ();
-use Scope::Guard;
+use B::Hooks::EndOfScope;
use strict;
use warnings;
+sub DEBUG { warn "@_" }
sub new {
my $class = shift;
bless {@_}, $class;
@@ -39,6 +40,8 @@
Devel::Declare::set_linestr($linestr);
return $name;
}
+
+ $self->skipspace;
return;
}
@@ -47,15 +50,16 @@
$self->skipspace;
my $linestr = Devel::Declare::get_linestr();
- if (substr( $linestr, $self->offset, 1 ) eq '(') {
- my $length = Devel::Declare::toke_scan_str( $self->offset );
+ if (substr($linestr, $self->offset, 1) eq '(') {
+ my $length = Devel::Declare::toke_scan_str($self->offset);
my $proto = Devel::Declare::get_lex_stuff();
Devel::Declare::clear_lex_stuff();
$linestr = Devel::Declare::get_linestr();
- substr( $linestr, $self->offset, $length ) = '';
+ substr($linestr, $self->offset, $length) = '';
Devel::Declare::set_linestr($linestr);
return $proto;
}
+
return;
}
@@ -70,30 +74,37 @@
}
sub inject_if_block {
- my $self = shift;
+ my $self = shift;
my $inject = shift;
+ my $before = shift || '';
+
$self->skipspace;
+
my $linestr = Devel::Declare::get_linestr;
- if (substr( $linestr, $self->offset, 1 ) eq '{') {
- substr( $linestr, $self->offset + 1, 0 ) = $inject;
+ if (substr($linestr, $self->offset, 1) eq '{') {
+ substr($linestr, $self->offset + 1, 0) = $inject;
+ substr($linestr, $self->offset, 0) = $before;
Devel::Declare::set_linestr($linestr);
}
}
sub scope_injector_call {
- return ' BEGIN { ' . __PACKAGE__ . '::inject_scope }; ';
+ my $self = shift;
+ my $inject = shift || '';
+ return ' BEGIN { ' . ref($self) . "->inject_scope('${inject}') }; ";
}
sub inject_scope {
- my $self = shift;
- $^H |= 0x120000;
- $^H{DD_METHODHANDLERS} = Scope::Guard->new(sub {
+ my $class = shift;
+ my $inject = shift;
+ on_scope_end {
my $linestr = Devel::Declare::get_linestr;
+ return unless defined $linestr;
my $offset = Devel::Declare::get_linestr_offset;
- substr( $linestr, $offset, 0 ) = ';';
+ substr( $linestr, $offset, 0 ) = ';' . $inject;
Devel::Declare::set_linestr($linestr);
- });
+ };
}
1;
-
+# vi:sw=2 ts=2
Modified: Devel-Declare/1.000/branches/context_object/lib/Devel/Declare/MethodInstaller/Simple.pm
===================================================================
--- Devel-Declare/1.000/branches/context_object/lib/Devel/Declare/MethodInstaller/Simple.pm 2008-10-22 18:41:56 UTC (rev 4953)
+++ Devel-Declare/1.000/branches/context_object/lib/Devel/Declare/MethodInstaller/Simple.pm 2008-10-22 22:09:49 UTC (rev 4954)
@@ -22,6 +22,53 @@
);
}
+sub strip_attrs {
+ my $self = shift;
+ $self->skipspace;
+
+ my $Offset = $self->offset;
+ my $linestr = Devel::Declare::get_linestr;
+ my $attrs = '';
+
+ if (substr($linestr, $Offset, 1) eq ':') {
+ while (substr($linestr, $Offset, 1) ne '{') {
+ if (substr($linestr, $Offset, 1) eq ':') {
+ substr($linestr, $Offset, 1) = '';
+ Devel::Declare::set_linestr($linestr);
+
+ $attrs .= ':';
+ }
+
+ $self->skipspace;
+ $Offset = $self->offset;
+ $linestr = Devel::Declare::get_linestr();
+
+ if (my $len = Devel::Declare::toke_scan_word($Offset, 0)) {
+ my $name = substr($linestr, $Offset, $len);
+ substr($linestr, $Offset, $len) = '';
+ Devel::Declare::set_linestr($linestr);
+
+ $attrs .= " ${name}";
+
+ if (substr($linestr, $Offset, 1) eq '(') {
+ my $length = Devel::Declare::toke_scan_str($Offset);
+ my $arg = Devel::Declare::get_lex_stuff();
+ Devel::Declare::clear_lex_stuff();
+ $linestr = Devel::Declare::get_linestr();
+ substr($linestr, $Offset, $length) = '';
+ Devel::Declare::set_linestr($linestr);
+
+ $attrs .= "(${arg})";
+ }
+ }
+ }
+
+ $linestr = Devel::Declare::get_linestr();
+ }
+
+ return $attrs;
+}
+
sub parser {
my $self = shift;
$self->init(@_);
@@ -29,12 +76,13 @@
$self->skip_declarator;
my $name = $self->strip_name;
my $proto = $self->strip_proto;
+ my $attrs = $self->strip_attrs;
my @decl = $self->parse_proto($proto);
my $inject = $self->inject_parsed_proto(@decl);
if (defined $name) {
$inject = $self->scope_injector_call() . $inject;
}
- $self->inject_if_block($inject);
+ $self->inject_if_block($inject, $attrs ? "sub ${attrs} " : '');
if (defined $name) {
my $pkg = $self->get_curstash_name;
$name = join( '::', $pkg, $name )
Modified: Devel-Declare/1.000/branches/context_object/t/methinstaller-simple.t
===================================================================
--- Devel-Declare/1.000/branches/context_object/t/methinstaller-simple.t 2008-10-22 18:41:56 UTC (rev 4953)
+++ Devel-Declare/1.000/branches/context_object/t/methinstaller-simple.t 2008-10-22 22:09:49 UTC (rev 4954)
@@ -66,6 +66,7 @@
@test_list = (method { 1 }, sub { 2 }, method () { 3 }, sub { 4 });
+ method leftie :lvalue { $self->{attributes} };
}
use Test::More 'no_plan';
@@ -80,6 +81,9 @@
is($o->main, 'main', 'declaration of package named method ok');
+$o->leftie = 'attributes work';
+is($o->leftie, 'attributes work', 'code attributes intact');
+
$o->upgrade;
isa_ok($o, 'DeclareTest2');
@@ -92,19 +96,3 @@
is_deeply([ map { $_->() } @test_list ], [ 1, 2, 3, 4], 'binding ok');
-__END__
-/home/rhesa/perl/t/methinstaller-simple....
-ok 1 - The object isa DeclareTest
-ok 2 - @_ args ok
-ok 3 - method with argument ok
-ok 4 - declaration of package named method ok
-ok 5 - The object isa DeclareTest2
-ok 6 - absolute method declaration ok
-ok 7 - anon method with @_ ok
-ok 8 - anon method with proto ok
-ok 9 - binding ok
-1..9
-ok
-All tests successful.
-Files=1, Tests=9, 0 wallclock secs ( 0.04 usr 0.00 sys + 0.05 cusr 0.00 csys = 0.09 CPU)
-Result: PASS
More information about the Bast-commits
mailing list