diff options
| author | Jesse Luehrs <doy@tozt.net> | 2010-08-20 12:57:58 -0500 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2010-08-20 12:57:58 -0500 |
| commit | 35a44de4f6d64502ac59b84b40d1034e143ade52 (patch) | |
| tree | 0a9b7a00e6ab753b9bebcb506ff850dab1295756 /lib | |
| parent | 180f81a127a2d1b0ec2eee086eb500041a9caa3d (diff) | |
| download | moosex-nonmoose-35a44de4f6d64502ac59b84b40d1034e143ade52.tar.gz moosex-nonmoose-35a44de4f6d64502ac59b84b40d1034e143ade52.zip | |
fix edge case with inlined fallback constructors
need to handle hashref parameters
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/MooseX/NonMoose/Meta/Role/Constructor.pm | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/MooseX/NonMoose/Meta/Role/Constructor.pm b/lib/MooseX/NonMoose/Meta/Role/Constructor.pm index 57316c9..b42b59f 100644 --- a/lib/MooseX/NonMoose/Meta/Role/Constructor.pm +++ b/lib/MooseX/NonMoose/Meta/Role/Constructor.pm @@ -69,7 +69,18 @@ sub _generate_fallback_constructor { ? "${class_var}->FOREIGNBUILDARGS(\@_)" : '@_'; my $instance = "${class_var}->${super_new_class}::$new($arglist)"; - "${class_var}->Moose::Object::new(__INSTANCE__ => $instance, \@_)" + # XXX: the "my $__DUMMY = " part is because "return do" triggers a weird + # bug in pre-5.12 perls (it ends up returning undef) + "my \$__DUMMY = do {\n" + . " if (ref(\$_[0]) eq 'HASH') {\n" + . " \$_[0]->{__INSTANCE__} = $instance\n" + . " unless exists \$_[0]->{__INSTANCE__};\n" + . " }\n" + . " else {\n" + . " unshift \@_, __INSTANCE__ => $instance;\n" + . " }\n" + . " ${class_var}->Moose::Object::new(\@_);\n" + . "}"; } sub _generate_instance { |