From: Lukas Mai <l.mai@web.de>
Date: Tue, 19 Jun 2012 03:17:49 +0000 (+0200)
Subject: Merge branch 'keyword-rewrite-magic' into method-attr
X-Git-Tag: v0.06~6^2~1
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=10acc8b1a7d80a19b07671881718e5e3abe77926;p=p5sagit%2FFunction-Parameters.git

Merge branch 'keyword-rewrite-magic' into method-attr
---

10acc8b1a7d80a19b07671881718e5e3abe77926
diff --cc lib/Function/Parameters.pm
index 0f4a82d,4bb18a8..88c3e66
--- a/lib/Function/Parameters.pm
+++ b/lib/Function/Parameters.pm
@@@ -56,29 -44,35 +56,38 @@@ sub import 
  			? $proto
  			: [$proto, $bare_arms[$bare++] || confess(qq{Don't know what to do with "$proto"})]
  		;
- 		my ($name, $type) = @$item;
+ 		my ($name, $proto_type) = @$item;
  		_assert_valid_identifier $name;
  
- 		unless (ref $type) {
- 			# use '||' instead of 'or' to preserve $type in the error message
- 			$type = $type_map{$type}
- 				|| confess qq["$type" doesn't look like a valid type (one of ${\join ', ', sort keys %type_map})];
+ 		unless (ref $proto_type) {
+ 			# use '||' instead of 'or' to preserve $proto_type in the error message
+ 			$proto_type = $type_map{$proto_type}
+ 				|| confess qq["$proto_type" doesn't look like a valid type (one of ${\join ', ', sort keys %type_map})];
  		}
- 		$type->{name} ||= 'optional';
- 		$type->{name} =~ /^(?:optional|required|prohibited)\z/
- 			or confess qq["$type->{name}" doesn't look like a valid name attribute (one of optional, required, prohibited)];
 +
- 		$type->{shift} and _assert_valid_identifier $type->{shift}, 1;
- 		$type->{attrs} and _assert_valid_attributes $type->{attrs};
+ 		my %type = %$proto_type;
+ 		my %clean;
++
+ 		$clean{name} = delete $type{name} || 'optional';
+ 		$clean{name} =~ /^(?:optional|required|prohibited)\z/
+ 			or confess qq["$clean{name}" doesn't look like a valid name attribute (one of optional, required, prohibited)];
++
+ 		$clean{shift} = delete $type{shift} || '';
 -		if ($clean{shift}) {
 -			_assert_valid_identifier $clean{shift}, 1;
 -			bytes::length($clean{shift}) < SHIFT_NAME_LIMIT
 -				or confess qq["$clean{shift}" is longer than I can handle];
 -		}
++		_assert_valid_identifier $clean{shift}, 1 if $clean{shift};
++
++		$clean{attrs} = delete $type{attrs} || '';
++		_assert_valid_attributes $clean{attrs} if $clean{attrs};
  		
- 		$spec{$name} = $type;
+ 		%type and confess "Invalid keyword property: @{[keys %type]}";
+ 
+ 		$spec{$name} = \%clean;
  	}
  	
  	for my $kw (keys %spec) {
  		my $type = $spec{$kw};
  
- 		$^H{HINTK_SHIFT_ . $kw} = $type->{shift} || '';
- 		$^H{HINTK_ATTRS_ . $kw} = $type->{attrs} || '';
+ 		$^H{HINTK_SHIFT_ . $kw} = $type->{shift};
++		$^H{HINTK_ATTRS_ . $kw} = $type->{attrs};
  		$^H{HINTK_NAME_ . $kw} =
  			$type->{name} eq 'prohibited' ? FLAG_NAME_PROHIBITED :
  			$type->{name} eq 'required' ? FLAG_NAME_REQUIRED :