[pad] pad_find_my_symbol_pvs - pad_findmy_pvs alternative with explicit symbol table

Author: Branislav Zahradník

ext/XS-APItest/APItest.xs

@@ -791,6 +791,7 @@ enum Pad_Find_Method {
     PAD_FINDMY_PV,
     PAD_FINDMY_PVN,
     PAD_FINDMY_SV,
+    PAD_FIND_MY_SYMBOL_FOO,
     PAD_FIND_MY_SYMBOL_PV,
     PAD_FIND_MY_SYMBOL_PVN,
 };
@@ -834,6 +835,10 @@ THX_ck_entersub_pad_scalar(pTHX_ OP *entersubop, GV *namegv, SV *ckobj)
         case PAD_FINDMY_FOO: {
             padoff = pad_findmy_pvs("$foo", 0);
         } break;
+        case PAD_FIND_MY_SYMBOL_FOO: {
+            padoff = pad_find_my_symbol_pvs (Perl_Symbol_Table_Scalar, "foo", 0);
+            break;
+        }
         case PAD_FIND_MY_SYMBOL_PV: {
             char *namepv = SvPV_nolen(a1);
             padoff = pad_find_my_symbol_pv (Perl_Symbol_Table_Scalar, namepv, SvUTF8(a1));
@@ -4380,6 +4385,7 @@ BOOT:
     EXPORT_ENUM (stash, PAD_FINDMY_PV);
     EXPORT_ENUM (stash, PAD_FINDMY_PVN);
     EXPORT_ENUM (stash, PAD_FINDMY_SV);
+    EXPORT_ENUM (stash, PAD_FIND_MY_SYMBOL_FOO);
     EXPORT_ENUM (stash, PAD_FIND_MY_SYMBOL_PV);
     EXPORT_ENUM (stash, PAD_FIND_MY_SYMBOL_PVN);
 }

ext/XS-APItest/t/pad_scalar.t

@@ -1,13 +1,14 @@
 use warnings;
 use strict;
 
-use Test::More tests => 110;
+use Test::More tests => 113;
 
 use XS::APItest qw (
     PAD_FINDMY_FOO
     PAD_FINDMY_PV
     PAD_FINDMY_PVN
     PAD_FINDMY_SV
+    PAD_FIND_MY_SYMBOL_FOO
     PAD_FIND_MY_SYMBOL_PV
     PAD_FIND_MY_SYMBOL_PVN
     pad_scalar
@@ -17,6 +18,7 @@ is pad_scalar (PAD_FINDMY_SV,          "foo"), "NOT_IN_PAD", q (undeclared '$foo
 is pad_scalar (PAD_FINDMY_PVN,         "foo"), "NOT_IN_PAD", q (undeclared '$foo'; pad_findmy_pvn ());
 is pad_scalar (PAD_FINDMY_PV,          "foo"), "NOT_IN_PAD", q (undeclared '$foo'; pad_findmy_pv ());
 is pad_scalar (PAD_FINDMY_FOO,         "foo"), "NOT_IN_PAD", q (undeclared '$foo'; pad_findmy_pvs ());
+is pad_scalar (PAD_FIND_MY_SYMBOL_FOO, "foo"), "NOT_IN_PAD", q (undeclared '$foo'; pad_find_my_symbol_pvs ());
 is pad_scalar (PAD_FIND_MY_SYMBOL_PV,  "foo"), "NOT_IN_PAD", q (undeclared '$foo'; pad_find_my_symbol_pv ());
 is pad_scalar (PAD_FIND_MY_SYMBOL_PVN, "foo"), "NOT_IN_PAD", q (undeclared '$foo'; pad_find_my_symbol_pvn ());
 
@@ -32,6 +34,7 @@ is pad_scalar (PAD_FINDMY_SV,          "foo"), "NOT_MY", q ('our $foo'; pad_find
 is pad_scalar (PAD_FINDMY_PVN,         "foo"), "NOT_MY", q ('our $foo'; pad_findmy_pvn ());
 is pad_scalar (PAD_FINDMY_PV,          "foo"), "NOT_MY", q ('our $foo'; pad_findmy_pv ());
 is pad_scalar (PAD_FINDMY_FOO,         "foo"), "NOT_MY", q ('our $foo'; pad_findmy_pvs ());
+is pad_scalar (PAD_FIND_MY_SYMBOL_FOO, "foo"), "NOT_MY", q ('our $foo'; pad_find_my_symbol_pvs ());
 is pad_scalar (PAD_FIND_MY_SYMBOL_PV,  "foo"), "NOT_MY", q ('our $foo'; pad_find_my_symbol_pv ());
 is pad_scalar (PAD_FIND_MY_SYMBOL_PVN, "foo"), "NOT_MY", q ('our $foo'; pad_find_my_symbol_pvn ());
 
@@ -79,12 +82,12 @@ sub bb() {
     my $counter = 0;
     my $foo = \$counter;
     return sub {
-        ok pad_scalar (PAD_FINDMY_SV,          "foo") == \pad_scalar(PAD_FINDMY_SV, "counter");
-        ok pad_scalar (PAD_FINDMY_PVN,         "foo") == \pad_scalar(PAD_FINDMY_SV, "counter");
-        ok pad_scalar (PAD_FINDMY_PV,          "foo") == \pad_scalar(PAD_FINDMY_SV, "counter");
-        ok pad_scalar (PAD_FINDMY_FOO,         "foo") == \pad_scalar(PAD_FINDMY_SV, "counter");
-        ok pad_scalar (PAD_FIND_MY_SYMBOL_PV,  "foo") == \pad_scalar(PAD_FINDMY_SV, "counter");
-        ok pad_scalar (PAD_FIND_MY_SYMBOL_PVN, "foo") == \pad_scalar(PAD_FINDMY_SV, "counter");
+        ok pad_scalar (PAD_FINDMY_SV,          "foo") == \pad_scalar (PAD_FINDMY_SV, "counter");
+        ok pad_scalar (PAD_FINDMY_PVN,         "foo") == \pad_scalar (PAD_FINDMY_SV, "counter");
+        ok pad_scalar (PAD_FINDMY_PV,          "foo") == \pad_scalar (PAD_FINDMY_SV, "counter");
+        ok pad_scalar (PAD_FINDMY_FOO,         "foo") == \pad_scalar (PAD_FINDMY_SV, "counter");
+        ok pad_scalar (PAD_FIND_MY_SYMBOL_PV,  "foo") == \pad_scalar (PAD_FINDMY_SV, "counter");
+        ok pad_scalar (PAD_FIND_MY_SYMBOL_PVN, "foo") == \pad_scalar (PAD_FINDMY_SV, "counter");
 
         my $modulus = pad_scalar (PAD_FINDMY_SV, "counter") % 5;
 
@@ -121,6 +124,7 @@ is pad_scalar (PAD_FINDMY_SV,          "foo"), "NOT_MY", q ('my $foo' still unde
 is pad_scalar (PAD_FINDMY_PVN,         "foo"), "NOT_MY", q ('my $foo' still undeclared; pad_findmy_pvn ());
 is pad_scalar (PAD_FINDMY_PV,          "foo"), "NOT_MY", q ('my $foo' still undeclared; pad_findmy_pv ());
 is pad_scalar (PAD_FINDMY_FOO,         "foo"), "NOT_MY", q ('my $foo' still undeclared; pad_findmy_pvs ());
+is pad_scalar (PAD_FIND_MY_SYMBOL_FOO, "foo"), "NOT_MY", q ('my $foo' still undeclared; pad_find_my_symbol_pvs ());
 is pad_scalar (PAD_FIND_MY_SYMBOL_PV,  "foo"), "NOT_MY", q ('my $foo' still undeclared; pad_find_my_symbol_pv ());
 is pad_scalar (PAD_FIND_MY_SYMBOL_PVN, "foo"), "NOT_MY", q ('my $foo' still undeclared; pad_find_my_symbol_pvn ());
 

pad.c

@@ -1037,6 +1037,7 @@ C<flags> is reserved and must be zero.
 
 =for apidoc pad_find_my_symbol_pv
 =for apidoc_item pad_find_my_symbol_pvn
+=for apidoc_item pad_find_my_symbol_pvs
 
 Similar to C<pad_findmy_pv> but with explicit symbol table parameter.
 
@@ -1048,6 +1049,9 @@ Similar to C<pad_findmy_pv> but with explicit symbol table parameter.
     pad_findmy_pvn ("$self", 5, 0);
     pad_find_my_symbol_pvn (Perl_Symbol_Scalar, "self", 5, 0);
 
+    pad_findmy_pvs ("$self", 0);
+    pad_find_my_symbol_pvs (Perl_Symbol_Scalar, "self", 0);
+
 =cut
 */
 

pad.h

@@ -736,6 +736,15 @@ Similar to L</pad_add_symbol_pvn>, but takes a literal string instead of a strin
 #define pad_findmy_pvs(name,flags) \
     EXPAND_CALL (pad_findmy_pvn, (STR_WITH_LEN(name), flags))
 
+/*
+=for apidoc_defn Am|PADOFFSET|pad_find_my_symbol_pvs|"symbol_table"|"name"|U32 flags
+
+=cut
+*/
+
+#define pad_find_my_symbol_pvs(Symbol_Table, Name, Flags)               \
+    EXPAND_CALL (pad_find_my_symbol_pvn, (Symbol_Table, STR_WITH_LEN(Name), Flags))
+
 struct suspended_compcv
 {
     CV *compcv;