From: Lukas Mai <l.mai@web.de>
Date: Mon, 18 Jun 2012 20:01:40 +0000 (+0200)
Subject: detect invalid keyword properties
X-Git-Tag: v0.06~4^2~1^2~1^2~5
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ae6e00b529be40fd7921824eb830ca44833a2878;p=p5sagit%2FFunction-Parameters.git

detect invalid keyword properties
---

diff --git a/lib/Function/Parameters.pm b/lib/Function/Parameters.pm
index 97dd88e..0c0db2b 100644
--- a/lib/Function/Parameters.pm
+++ b/lib/Function/Parameters.pm
@@ -45,30 +45,35 @@ 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)];
-		if ($type->{shift}) {
-			_assert_valid_identifier $type->{shift}, 1;
-			bytes::length($type->{shift}) < SHIFT_NAME_LIMIT
-				or confess qq["$type->{shift}" is longer than I can handle];
+		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];
 		}
 		
-		$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_SHIFT_ . $kw} = $type->{shift};
 		$^H{HINTK_NAME_ . $kw} =
 			$type->{name} eq 'prohibited' ? FLAG_NAME_PROHIBITED :
 			$type->{name} eq 'required' ? FLAG_NAME_REQUIRED :
diff --git a/t/strict.t b/t/strict.t
index a58183d..e06f04a 100644
--- a/t/strict.t
+++ b/t/strict.t
@@ -1,7 +1,7 @@
 use warnings;
 use strict;
 
-use Test::More tests => 8;
+use Test::More tests => 10;
 
 use Dir::Self;
 
@@ -11,6 +11,7 @@ for my $fail (
 	['2', qr/expect.*\).*after.*"\@x".*"\$y"/],
 	['3', qr/expect.*\).*after.*"%y".*"\$z"/],
 	['4', qr/expect.*\).*after.*"\@y".*"\@z"/],
+	['5', qr/Invalid.*rarity/],
 ) {
 	my ($file, $pat) = @$fail;
 	$@ = undef;
diff --git a/t/strict_5.fail b/t/strict_5.fail
new file mode 100644
index 0000000..9f09951
--- /dev/null
+++ b/t/strict_5.fail
@@ -0,0 +1,11 @@
+#!perl
+use warnings;
+use strict;
+
+use Function::Parameters {
+	spike => {
+		rarity => 'best',
+	},
+};
+
+'ok'