summaryrefslogtreecommitdiff
path: root/universal.c
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2010-10-14 09:47:57 +0100
committerNicholas Clark <nick@ccl4.org>2010-10-14 14:34:27 +0100
commit0bbbe6948c4d46b5eafef01c918d2aea8e16681a (patch)
tree3b80f73b29c997cfc7736af8992d9f4c4f0496c9 /universal.c
parent939767c9d84f9288c260508432b50879f71e1d3b (diff)
downloadperl-0bbbe6948c4d46b5eafef01c918d2aea8e16681a.tar.gz
Expand CALLREG_NAMED_BUFF* macros in XS_Tie_Hash_NamedCapture_*
This reveals even more similarity between the routines' bodies.
Diffstat (limited to 'universal.c')
-rw-r--r--universal.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/universal.c b/universal.c
index 52d701c702..cd8f9f9039 100644
--- a/universal.c
+++ b/universal.c
@@ -1274,7 +1274,7 @@ XS(XS_Tie_Hash_NamedCapture_FETCH)
PUTBACK;
flags = (U32)SvUV(SvRV(MUTABLE_SV(ST(0))));
- ret = CALLREG_NAMED_BUFF_FETCH(rx, ST(1), flags);
+ ret = RX_ENGINE(rx)->named_buff(aTHX_ (rx), ST(1), NULL, flags | RXapif_FETCH);
SPAGAIN;
PUSHs(ret ? sv_2mortal(ret) : &PL_sv_undef);
@@ -1302,7 +1302,7 @@ XS(XS_Tie_Hash_NamedCapture_STORE)
PUTBACK;
flags = (U32)SvUV(SvRV(MUTABLE_SV(ST(0))));
- ret = CALLREG_NAMED_BUFF_STORE(rx,ST(1), ST(2), flags);
+ ret = RX_ENGINE(rx)->named_buff(aTHX_ (rx), ST(1), ST(2), flags | RXapif_STORE);
/* Perl_magic_setpack calls us with G_DISCARD, so our return stack state
@@ -1331,7 +1331,7 @@ XS(XS_Tie_Hash_NamedCapture_DELETE)
PUTBACK;
flags = (U32)SvUV(SvRV(MUTABLE_SV(ST(0))));
- ret = CALLREG_NAMED_BUFF_DELETE(rx, ST(1), flags);
+ ret = RX_ENGINE(rx)->named_buff(aTHX_ (rx), ST(1), NULL, flags | RXapif_DELETE);
SPAGAIN;
PUSHs(ret ? sv_2mortal(ret) : &PL_sv_undef);
@@ -1358,7 +1358,7 @@ XS(XS_Tie_Hash_NamedCapture_CLEAR)
PUTBACK;
flags = (U32)SvUV(SvRV(MUTABLE_SV(ST(0))));
- ret = CALLREG_NAMED_BUFF_CLEAR(rx, flags);
+ ret = RX_ENGINE(rx)->named_buff(aTHX_ (rx), NULL, NULL, flags | RXapif_CLEAR);
/* Perl_magic_wipepack calls us with G_DISCARD, so our return stack state
is thrown away. */
@@ -1388,7 +1388,7 @@ XS(XS_Tie_Hash_NamedCapture_EXISTS)
PUTBACK;
flags = (U32)SvUV(SvRV(MUTABLE_SV(ST(0))));
- ret = CALLREG_NAMED_BUFF_EXISTS(rx, ST(1), flags);
+ ret = RX_ENGINE(rx)->named_buff(aTHX_ (rx), ST(1), NULL, flags | RXapif_EXISTS);
SPAGAIN;
PUSHs(ret ? sv_2mortal(ret) : &PL_sv_undef);
@@ -1415,7 +1415,7 @@ XS(XS_Tie_Hash_NamedCapture_FIRSTK)
PUTBACK;
flags = (U32)SvUV(SvRV(MUTABLE_SV(ST(0))));
- ret = CALLREG_NAMED_BUFF_FIRSTKEY(rx, flags);
+ ret = RX_ENGINE(rx)->named_buff_iter(aTHX_ (rx), NULL, flags | RXapif_FIRSTKEY);
SPAGAIN;
PUSHs(ret ? sv_2mortal(ret) : &PL_sv_undef);
@@ -1442,7 +1442,7 @@ XS(XS_Tie_Hash_NamedCapture_NEXTK)
PUTBACK;
flags = (U32)SvUV(SvRV(MUTABLE_SV(ST(0))));
- ret = CALLREG_NAMED_BUFF_NEXTKEY(rx, ST(1), flags);
+ ret = RX_ENGINE(rx)->named_buff_iter(aTHX_ (rx), ST(1), flags | RXapif_NEXTKEY);
SPAGAIN;
PUSHs(ret ? sv_2mortal(ret) : &PL_sv_undef);
@@ -1469,7 +1469,7 @@ XS(XS_Tie_Hash_NamedCapture_SCALAR)
PUTBACK;
flags = (U32)SvUV(SvRV(MUTABLE_SV(ST(0))));
- ret = CALLREG_NAMED_BUFF_SCALAR(rx, flags);
+ ret = RX_ENGINE(rx)->named_buff(aTHX_ (rx), NULL, NULL, flags | RXapif_SCALAR);
SPAGAIN;
PUSHs(ret ? sv_2mortal(ret) : &PL_sv_undef);