improve: types not only list

kfly8 · Sep 1, 2021 · 1e1eb42 · 1e1eb42
1 parent 84a9adb
commit 1e1eb42
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/lib/Function/Return.pm b/lib/Function/Return.pm
@@ -138,7 +138,7 @@ sub _register_submeta {
     my ($class, $pkg, $sub, $types) = @_;
 
     my $meta = Sub::Meta->new(sub => $sub, stashname => $pkg);
-    $meta->set_returns(list => $types);
+    $meta->set_returns(_normalize_types($types));
 
     if (my $materials = Sub::Meta::Finder::FunctionParameters::find_materials($sub)) {
         $meta->set_is_method($materials->{is_method});
@@ -156,7 +156,7 @@ sub _register_submeta_and_install {
     my $wrapped  = $class->wrap_sub($sub, $types);
 
     my $meta = Sub::Meta->new(sub => $wrapped, stashname => $pkg);
-    $meta->set_returns(list => $types);
+    $meta->set_returns(_normalize_types($types));
 
     if (my $materials = Sub::Meta::Finder::FunctionParameters::find_materials($sub)) {
         $meta->set_is_method($materials->{is_method});
@@ -174,6 +174,16 @@ sub _register_submeta_and_install {
     return;
 }
 
+sub _normalize_types {
+    my $types = shift;
+    if (@$types == 1) {
+        return $types->[0];
+    }
+    else {
+        return $types;
+    }
+}
+
 1;
 __END__
 

diff --git a/t/03_meta.t b/t/03_meta.t
@@ -35,7 +35,9 @@ subtest 'single' => sub {
         subname($code);
         my $meta = Function::Return::meta $code;
         isa_ok $meta, 'Sub::Meta';
-        is_deeply $meta->returns->list, [Str];
+        is $meta->returns->list, Str;
+        is $meta->returns->scalar, Str;
+        is $meta->returns->void, Str;
     }
 };
 
@@ -45,6 +47,8 @@ subtest 'multi' => sub {
         my $meta = Function::Return::meta $code;
         isa_ok $meta, 'Sub::Meta';
         is_deeply $meta->returns->list, [Str, Int];
+        is_deeply $meta->returns->scalar, [Str, Int];
+        is_deeply $meta->returns->void, [Str, Int];
     }
 };
 
@@ -54,6 +58,8 @@ subtest 'empty' => sub {
         my $meta = Function::Return::meta $code;
         isa_ok $meta, 'Sub::Meta';
         is_deeply $meta->returns->list, [];
+        is_deeply $meta->returns->scalar, [];
+        is_deeply $meta->returns->void, [];
     }
 };
 
@@ -70,7 +76,9 @@ subtest 'with_fp_fun' => sub {
         note subname($code);
         my $meta = Function::Return::meta $code;
         isa_ok $meta, 'Sub::Meta';
-        is_deeply $meta->returns->list, [Num];
+        is $meta->returns->list, Num;
+        is $meta->returns->scalar, Num;
+        is $meta->returns->void, Num;
 
         my $pinfo = Function::Parameters::info \&with_fp_fun;
         is $pinfo, undef;
@@ -88,7 +96,9 @@ subtest 'with_fp_method' => sub {
         note subname($code);
         my $meta = Function::Return::meta $code;
         isa_ok $meta, 'Sub::Meta';
-        is_deeply $meta->returns->list, [Num];
+        is $meta->returns->list, Num;
+        is $meta->returns->scalar, Num;
+        is $meta->returns->void, Num;
 
         my $pinfo = Function::Parameters::info \&with_fp_method;
         is $pinfo, undef;