Test 'package A; sub foo; foo A->new' that gets deparsed as 'A->foo->new'

[perl/modules/indirect.git] / indirect.xs

diff --git a/indirect.xs b/indirect.xs
index 6a21c3ab389a592b937a04715d170d02bec65418..1f1ab9a69b3c9642dc37da47da2a615e1a147af1 100644 (file)
--- a/indirect.xs
+++ b/indirect.xs
@@ -87,7 +87,6 @@ STATIC const char *indirect_map_fetch(pTHX_ const OP *o, SV ** const name) {
 STATIC void indirect_map_delete(pTHX_ const OP *o) {
 #define indirect_map_delete(O) indirect_map_delete(aTHX_ (O))
  char buf[32];
- SV *val;
 
  hv_delete(indirect_map, buf, OP2STR(o), G_DISCARD);
 }
@@ -129,13 +128,15 @@ STATIC const char *indirect_find(pTHX_ SV *sv, const char *s) {
 STATIC OP *(*indirect_old_ck_const)(pTHX_ OP *) = 0;
 
 STATIC OP *indirect_ck_const(pTHX_ OP *o) {
+ o = CALL_FPTR(indirect_old_ck_const)(aTHX_ o);
+
  if (indirect_hint()) {
   SV *sv = cSVOPo_sv;
   if (SvPOK(sv) && (SvTYPE(sv) >= SVt_PV))
    indirect_map_store(o, indirect_find(sv, PL_parser->oldbufptr), sv);
  }
 
- return CALL_FPTR(indirect_old_ck_const)(aTHX_ o);
+ return o;
 }
 
 /* ... ck_rv2sv ............................................................ */
@@ -149,7 +150,9 @@ STATIC OP *indirect_ck_rv2sv(pTHX_ OP *o) {
   if (SvPOK(name) && (SvTYPE(name) >= SVt_PV)) {
    SV *sv = sv_2mortal(newSVpvn("$", 1));
    sv_catsv(sv, name);
+   o = CALL_FPTR(indirect_old_ck_rv2sv)(aTHX_ o);
    indirect_map_store(o, indirect_find(sv, PL_parser->oldbufptr), sv);
+   return o;
   }
  }
 
@@ -161,6 +164,8 @@ STATIC OP *indirect_ck_rv2sv(pTHX_ OP *o) {
 STATIC OP *(*indirect_old_ck_padany)(pTHX_ OP *) = 0;
 
 STATIC OP *indirect_ck_padany(pTHX_ OP *o) {
+ o = CALL_FPTR(indirect_old_ck_padany)(aTHX_ o);
+
  if (indirect_hint()) {
   SV *sv;
   const char *s = PL_parser->oldbufptr, *t = PL_parser->bufptr - 1;
@@ -172,7 +177,7 @@ STATIC OP *indirect_ck_padany(pTHX_ OP *o) {
   indirect_map_store(o, s, sv);
  }
 
- return CALL_FPTR(indirect_old_ck_padany)(aTHX_ o);
+ return o;
 }
 
 /* ... ck_method ........................................................... */
@@ -212,6 +217,8 @@ STATIC OP *indirect_ck_entersub(pTHX_ OP *o) {
  OP *om, *oo;
  IV hint = indirect_hint();
 
+ o = CALL_FPTR(indirect_old_ck_entersub)(aTHX_ o);
+
  if (hint) {
   const char *pm, *po;
   SV *svm, *svo;
@@ -241,7 +248,7 @@ done:
   indirect_map_clean(o);
  }
 
- return CALL_FPTR(indirect_old_ck_entersub)(aTHX_ o);
+ return o;
 }
 
 STATIC U32 indirect_initialized = 0;