| Subject: | Move option number check from has() |
Currently Moose::has() checks that it is is passed an even number of
arguments (i.e. a hash). This check does not belong there as has()
doesn't really care about those options. The earliest these matter is in
the Moose::Meta::Attribute constructors - new() and
interpolate_class_and_new().
The attached patch does two things:
1) Moves the option check to interpolate_class_and_new(). This means
there is no check inside new(), but it seems to be always called from
interpolate_class_and_new() during normal attribute construction.
2) Changes the error message since it is no-longer 'has'-specific. Also
I have always found the existing error message rather confusing, as it
does not tell me much about what the actual problem is.
The patch is probably fairly basic and probably should not be applied as
is, and probably needs more tests, but I would like to know if the
approach makes sense.
P.
| Subject: | move_option_check.patch |
ÿþF r o m d 0 0 0 b a 7 5 1 e 9 9 4 c b 1 2 c 3 3 e f c 6 8 f 2 d e c 4 5 5 6 2 1 d 6 3 8 M o n S e p 1 7 0 0 : 0 0 : 0 0 2 0 0 1
F r o m : P e t e r S h a n g o v < p s h a n g o v @ y a h o o . c o m >
D a t e : M o n , 3 S e p 2 0 1 2 0 0 : 1 0 : 4 0 + 0 1 0 0
S u b j e c t : [ P A T C H ] m o v e o p t i o n n u m b e r c h e c k
- - -
l i b / M o o s e . p m | 7 + + - - - - -
l i b / M o o s e / M e t a / A t t r i b u t e . p m | 9 + + + + + + + - -
t / a t t r i b u t e s / m i s c _ a t t r i b u t e _ t e s t s . t | 2 + -
3 f i l e s c h a n g e d , 1 0 i n s e r t i o n s ( + ) , 8 d e l e t i o n s ( - )
d i f f - - g i t a / l i b / M o o s e . p m b / l i b / M o o s e . p m
i n d e x 1 4 c b 7 b a . . c 1 8 4 a 6 7 1 0 0 6 4 4
- - - a / l i b / M o o s e . p m
+ + + b / l i b / M o o s e . p m
@ @ - 6 4 , 1 5 + 6 4 , 1 2 @ @ s u b h a s {
m y $ m e t a = s h i f t ;
m y $ n a m e = s h i f t ;
- M o o s e - > t h r o w _ e r r o r ( ' U s a g e : h a s \ ' n a m e \ ' = > ( k e y = > v a l u e , . . . ) ' )
- i f @ _ % 2 = = 1 ;
-
m y % c o n t e x t = M o o s e : : U t i l : : _ c a l l e r _ i n f o ;
$ c o n t e x t { c o n t e x t } = ' h a s d e c l a r a t i o n ' ;
$ c o n t e x t { t y p e } = ' c l a s s ' ;
- m y % o p t i o n s = ( d e f i n i t i o n _ c o n t e x t = > \ % c o n t e x t , @ _ ) ;
+ m y @ o p t i o n s = ( d e f i n i t i o n _ c o n t e x t = > \ % c o n t e x t , @ _ ) ;
m y $ a t t r s = ( r e f ( $ n a m e ) e q ' A R R A Y ' ) ? $ n a m e : [ ( $ n a m e ) ] ;
- $ m e t a - > a d d _ a t t r i b u t e ( $ _ , % o p t i o n s ) f o r @ $ a t t r s ;
+ $ m e t a - > a d d _ a t t r i b u t e ( $ _ , @ o p t i o n s ) f o r @ $ a t t r s ;
}
s u b b e f o r e {
d i f f - - g i t a / l i b / M o o s e / M e t a / A t t r i b u t e . p m b / l i b / M o o s e / M e t a / A t t r i b u t e . p m
i n d e x 4 6 a 8 4 1 2 . . 8 7 4 6 a f a 1 0 0 6 4 4
- - - a / l i b / M o o s e / M e t a / A t t r i b u t e . p m
+ + + b / l i b / M o o s e / M e t a / A t t r i b u t e . p m
@ @ - 1 1 6 , 1 0 + 1 1 6 , 1 5 @ @ s u b n e w {
}
s u b i n t e r p o l a t e _ c l a s s _ a n d _ n e w {
- m y ( $ c l a s s , $ n a m e , % a r g s ) = @ _ ;
+ m y $ c l a s s = s h i f t ;
+ m y $ n a m e = s h i f t ;
- m y ( $ n e w _ c l a s s , @ t r a i t s ) = $ c l a s s - > i n t e r p o l a t e _ c l a s s ( \ % a r g s ) ;
+ $ c l a s s - > t h r o w _ e r r o r ( ' A t t r i b u t e o p t i o n s m u s t b e a n e v e n n u m b e r ' )
+ i f @ _ % 2 = = 1 ;
+
+ m y % a r g s = @ _ ;
+ m y ( $ n e w _ c l a s s , @ t r a i t s ) = $ c l a s s - > i n t e r p o l a t e _ c l a s s ( \ % a r g s ) ;
$ n e w _ c l a s s - > n e w ( $ n a m e , % a r g s , ( s c a l a r ( @ t r a i t s ) ? ( t r a i t s = > \ @ t r a i t s ) : ( ) ) ) ;
}
d i f f - - g i t a / t / a t t r i b u t e s / m i s c _ a t t r i b u t e _ t e s t s . t b / t / a t t r i b u t e s / m i s c _ a t t r i b u t e _ t e s t s . t
i n d e x c 3 d 6 9 1 c . . f 5 e d d 0 7 1 0 0 6 4 4
- - - a / t / a t t r i b u t e s / m i s c _ a t t r i b u t e _ t e s t s . t
+ + + b / t / a t t r i b u t e s / m i s c _ a t t r i b u t e _ t e s t s . t
@ @ - 2 6 4 , 7 + 2 6 4 , 7 @ @ o k ( O u t O f C l a s s T e s t - > m e t a - > g e t _ a t t r i b u t e ( ' b a r ' ) , ' a t t r c r e a t e d f r o m c a n ' ) ;
p a c k a g e F o o ;
u s e M o o s e ;
- : : l i k e ( : : e x c e p t i o n { h a s ' f o o ' = > ( ' r o ' , i s a = > ' S t r ' ) } , q r / ^ U s a g e / , ' h a s t h r o w s e r r o r w i t h o d d n u m b e r o f a t t r i b u t e o p t i o n s ' ) ;
+ : : l i k e ( : : e x c e p t i o n { h a s ' f o o ' = > ( ' r o ' , i s a = > ' S t r ' ) } , q r / ^ A t t r i b u t e / , ' h a s t h r o w s e r r o r w i t h o d d n u m b e r o f a t t r i b u t e o p t i o n s ' ) ;
}
}
- -
1 . 7 . 7 . 1 . m s y s g i t . 0