From: Robin Edwards <robin.ge@gmail.com>
Date: Mon, 14 Dec 2009 11:31:01 +0000 (+0000)
Subject: removed switch
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=6bcba247cc74f7fad3ca3c0a576e00bcec0b7889;p=p5sagit%2FDevel-Declare-Keyword.git

removed switch
---

diff --git a/README b/README
index c3486c9..d974782 100644
--- a/README
+++ b/README
@@ -21,9 +21,9 @@ TODO
 SYNTAX
 #parse an action routines called for each entry in proto
 keyword method (ident?, proto?, custom, block) {
-	$block->end($proto->{end_code});
-	$block->begin($proto->{begin_code});
-	$block->name($ident);
+	$block->name($ident); # name the block
+	$block->code($proto); # inject proto code (at begining)
+	$block->terminate; # add semi colon
 }
 
 #passed a Keyword::Parser object
@@ -65,3 +65,23 @@ YADDA
 <mst> yes. I was hoping we vcould at least work out how to fake them in the process
 <Zefram> I have a long-term plan to let much of the Perl parser work in a recursive-descent manner
 <kentnl> also, for pedanticsness sake, wouldn't the signature be keyword method ( Name?, Proto?, Block ) , unless of course, you meant the example to do "method ( $foo, $bar, $baz ) mymethod  { } " notation
+
+...
+
+<pdcawley> Same technique as is used to insert the semicolon in Moose::Declare is a good starting point.
+<pdcawley> Yeah, injecting into the backend of the block is, currently, a no no.
+<rob> yea but by that point its compiled the block, so I can't seem to inject code there
+<rob> until we can parse a block
+<pdcawley> But you can inject something into the beginning which sets up a datastructure that your end of scope stuff can make use of.
+<pdcawley> Obviously, you need to do something before the block which _declares_ the thing that your 'after' stuff can see
+<rob> yea
+<rob> may run into issues if a keyword like method is used for anon sub though?
+<pdcawley> And you can always insert 'setup_shit; $ret = do {<$block_contents' and have an EOS like '; do_shit; return $ret}'
+<pdcawley> MXD's EOS stuff catches that as well, I think.
+<rob> ok
+<pdcawley> Basically, at the point you set up the insertions, you know if you have a name or are anonymous, so you know whether you need to insert a semicolon at the end or not.
+
+#mk_parser() 
+<pdcawley> Just build a method based on $ident and dispatch to that.
+<rob> ok
+<pdcawley> I'd suggest making an object as early as possible, your dispatch issues get so much easier then.
diff --git a/lib/Keyword.pm b/lib/Keyword.pm
index ca08ea2..f58d9a9 100644
--- a/lib/Keyword.pm
+++ b/lib/Keyword.pm
@@ -1,7 +1,6 @@
 package Keyword;
 use strict;
 use warnings;
-use Switch;
 use Devel::Declare;
 use B::Hooks::EndOfScope;
 use Data::Dumper;
@@ -164,40 +163,27 @@ sub proto_to_parselist {
 		my $opt;
 		$ident =~ s/\?//g and $opt = 1 if $ident =~ /\?$/;
 
-
-		# I should NOT be prefix subs with action_ / rule_
-		switch($ident) {
-			no strict 'refs';
-
-			#builtin
-			case 'ident' { 
-				push @pa, 
-					{name=>$ident, parse=>\&{'Keyword::Parse::Ident::parse_ident'}, 	
-					action=>\&{$KW_MODULE."::action_ident"},  
-						opt=>$opt, builtin=>1}
-				}	
-
-			case 'proto' { 
-				push @pa, 
-					{name=>$ident, parse=>\&{'Keyword::Parse::Proto::parse_proto'},
-						action=>\&{$KW_MODULE."::action_proto"},  
-						opt=>$opt, builtin=>1}
-				}
-
-			case 'block' { 
-							push @pa, 
-					{name=>$ident, parse=>\&{'Keyword::Parse::Block::new'},
-						action=>sub{return @_},  #returns block object
-						opt=>$opt, builtin=>1}
-				}
-
-			#custom parse routine
-			else { 
-				push @pa, 
-					{name=>$ident, parse=>\&{$KW_MODULE."::parse_$ident"}, 
-						action=>\&{$KW_MODULE."::action_$ident"},  
-						opt=>$opt}; 
-				}; 
+		my $p = {ident=>$ident, opt=>$opt};
+		no strict 'refs';
+		if($ident eq 'ident') {
+			$p->{parse} = \&{'Keyword::Parse::Ident::parse_ident'};
+			$p->{action} = \&{$KW_MODULE."::action_ident"};
+			push @pa, $p;
+		}
+		elsif($ident eq 'proto') {
+			$p->{parse} = \&{'Keyword::Parse::Proto::parse_proto'};
+			$p->{action} = \&{$KW_MODULE."::action_proto"};
+			push @pa, $p;
+		}
+		elsif($ident eq 'block') {
+			$p->{parse} = \&{'Keyword::Parse::Block::new'};
+			$p->{action} = sub{return @_};
+			push @pa, $p;
+		}
+		else { 	#custom parse routine
+			$p->{parse} = \&{$KW_MODULE."::parse_$ident"};
+			$p->{action} = \&{$KW_MODULE."::action_$ident"};
+			push @pa, $p;
 		}
 	}