Bump $VERSION to 0.76_50

[p5sagit/Devel-Size.git] / Size.xs

diff --git a/Size.xs b/Size.xs
index a2e30b1..7cd3ea7 100644 (file)
--- a/Size.xs
+++ b/Size.xs
@@ -16,6 +16,11 @@
 #  define SvOOK_offset(sv, len) STMT_START { len = SvIVX(sv); } STMT_END
 #endif
 
+#if PERL_VERSION < 6
+#  define PL_opargs opargs
+#  define PL_op_name op_name
+#endif
+
 #ifdef _MSC_VER 
 /* "structured exception" handling is a Microsoft extension to C and C++.
    It's *not* C++ exception handling - C++ exception handling can't capture
@@ -176,7 +181,7 @@ free_state(struct state *st)
 #define SOME_RECURSION 1
 #define TOTAL_SIZE_RECURSION 2
 
-static bool sv_size(pTHX_ struct state *, const SV *const, const int recurse);
+static void sv_size(pTHX_ struct state *, const SV *const, const int recurse);
 
 typedef enum {
     OPc_NULL,   /* 0 */
@@ -191,6 +196,13 @@ typedef enum {
     OPc_PVOP,   /* 9 */
     OPc_LOOP,   /* 10 */
     OPc_COP /* 11 */
+#ifdef OA_CONDOP
+    , OPc_CONDOP /* 12 */
+#endif
+#ifdef OA_GVOP
+    , OPc_GVOP /* 13 */
+#endif
+
 } opclass;
 
 static opclass
@@ -236,9 +248,17 @@ cc_opclass(const OP * const o)
         case OA_SVOP: TAG;
         return OPc_SVOP;
 
+#ifdef OA_PADOP
         case OA_PADOP: TAG;
         return OPc_PADOP;
+#endif
+
+#ifdef OA_GVOP
+        case OA_GVOP: TAG;
+        return OPc_GVOP;
+#endif
 
+#ifdef OA_PVOP_OR_SVOP
         case OA_PVOP_OR_SVOP: TAG;
             /*
              * Character translations (tr///) are usually a PVOP, keeping a 
@@ -249,6 +269,7 @@ cc_opclass(const OP * const o)
              */
         return (o->op_private & (OPpTRANS_TO_UTF|OPpTRANS_FROM_UTF))
             ? OPc_SVOP : OPc_PVOP;
+#endif
 
         case OA_LOOP: TAG;
         return OPc_LOOP;
@@ -298,6 +319,11 @@ cc_opclass(const OP * const o)
             return OPc_BASEOP;
         else
             return OPc_PVOP;
+
+#ifdef OA_CONDOP
+        case OA_CONDOP: TAG;
+           return OPc_CONDOP;
+#endif
         }
         warn("Devel::Size: Can't determine class of operator %s, assuming BASEOP\n",
          PL_op_name[o->op_type]);
@@ -390,37 +416,45 @@ op_size(pTHX_ const OP * const baseop, struct state *st)
            TAG;break;
        case OPc_UNOP: TAG;
            st->total_size += sizeof(struct unop);
-           op_size(aTHX_ cUNOPx(baseop)->op_first, st);
+           op_size(aTHX_ ((UNOP *)baseop)->op_first, st);
            TAG;break;
        case OPc_BINOP: TAG;
            st->total_size += sizeof(struct binop);
-           op_size(aTHX_ cBINOPx(baseop)->op_first, st);
-           op_size(aTHX_ cBINOPx(baseop)->op_last, st);
+           op_size(aTHX_ ((BINOP *)baseop)->op_first, st);
+           op_size(aTHX_ ((BINOP *)baseop)->op_last, st);
            TAG;break;
        case OPc_LOGOP: TAG;
            st->total_size += sizeof(struct logop);
-           op_size(aTHX_ cBINOPx(baseop)->op_first, st);
-           op_size(aTHX_ cLOGOPx(baseop)->op_other, st);
+           op_size(aTHX_ ((BINOP *)baseop)->op_first, st);
+           op_size(aTHX_ ((LOGOP *)baseop)->op_other, st);
+           TAG;break;
+#ifdef OA_CONDOP
+       case OPc_CONDOP: TAG;
+           st->total_size += sizeof(struct condop);
+           op_size(aTHX_ ((BINOP *)baseop)->op_first, st);
+           op_size(aTHX_ ((CONDOP *)baseop)->op_true, st);
+           op_size(aTHX_ ((CONDOP *)baseop)->op_false, st);
            TAG;break;
+#endif
        case OPc_LISTOP: TAG;
            st->total_size += sizeof(struct listop);
-           op_size(aTHX_ cLISTOPx(baseop)->op_first, st);
-           op_size(aTHX_ cLISTOPx(baseop)->op_last, st);
+           op_size(aTHX_ ((LISTOP *)baseop)->op_first, st);
+           op_size(aTHX_ ((LISTOP *)baseop)->op_last, st);
            TAG;break;
        case OPc_PMOP: TAG;
            st->total_size += sizeof(struct pmop);
-           op_size(aTHX_ cPMOPx(baseop)->op_first, st);
-           op_size(aTHX_ cPMOPx(baseop)->op_last, st);
+           op_size(aTHX_ ((PMOP *)baseop)->op_first, st);
+           op_size(aTHX_ ((PMOP *)baseop)->op_last, st);
 #if PERL_VERSION < 9 || (PERL_VERSION == 9 && PERL_SUBVERSION < 5)
-           op_size(aTHX_ cPMOPx(baseop)->op_pmreplroot, st);
-           op_size(aTHX_ cPMOPx(baseop)->op_pmreplstart, st);
+           op_size(aTHX_ ((PMOP *)baseop)->op_pmreplroot, st);
+           op_size(aTHX_ ((PMOP *)baseop)->op_pmreplstart, st);
 #endif
            /* This is defined away in perl 5.8.x, but it is in there for
               5.6.x */
 #ifdef PM_GETRE
-           regex_size(PM_GETRE(cPMOPx(baseop)), st);
+           regex_size(PM_GETRE((PMOP *)baseop), st);
 #else
-           regex_size(cPMOPx(baseop)->op_pmregexp, st);
+           regex_size(((PMOP *)baseop)->op_pmregexp, st);
 #endif
            TAG;break;
        case OPc_SVOP: TAG;
@@ -428,22 +462,30 @@ op_size(pTHX_ const OP * const baseop, struct state *st)
            if (!(baseop->op_type == OP_AELEMFAST
                  && baseop->op_flags & OPf_SPECIAL)) {
                /* not an OP_PADAV replacement */
-               sv_size(aTHX_ st, cSVOPx(baseop)->op_sv, SOME_RECURSION);
+               sv_size(aTHX_ st, ((SVOP *)baseop)->op_sv, SOME_RECURSION);
            }
            TAG;break;
+#ifdef OA_PADOP
       case OPc_PADOP: TAG;
          st->total_size += sizeof(struct padop);
          TAG;break;
+#endif
+#ifdef OA_GVOP
+      case OPc_GVOP: TAG;
+         st->total_size += sizeof(struct gvop);
+         sv_size(aTHX_ st, ((GVOP *)baseop)->op_gv, SOME_RECURSION);
+         TAG;break;
+#endif
        case OPc_PVOP: TAG;
-           check_new_and_strlen(st, cPVOPx(baseop)->op_pv);
+           check_new_and_strlen(st, ((PVOP *)baseop)->op_pv);
            TAG;break;
        case OPc_LOOP: TAG;
            st->total_size += sizeof(struct loop);
-           op_size(aTHX_ cLOOPx(baseop)->op_first, st);
-           op_size(aTHX_ cLOOPx(baseop)->op_last, st);
-           op_size(aTHX_ cLOOPx(baseop)->op_redoop, st);
-           op_size(aTHX_ cLOOPx(baseop)->op_nextop, st);
-           op_size(aTHX_ cLOOPx(baseop)->op_lastop, st);
+           op_size(aTHX_ ((LOOP *)baseop)->op_first, st);
+           op_size(aTHX_ ((LOOP *)baseop)->op_last, st);
+           op_size(aTHX_ ((LOOP *)baseop)->op_redoop, st);
+           op_size(aTHX_ ((LOOP *)baseop)->op_nextop, st);
+           op_size(aTHX_ ((LOOP *)baseop)->op_lastop, st);
            TAG;break;
        case OPc_COP: TAG;
         {
@@ -582,19 +624,19 @@ const U8 body_sizes[SVt_LAST] = {
 #endif
 };
 
-static bool
+static void
 sv_size(pTHX_ struct state *const st, const SV * const orig_thing,
        const int recurse) {
   const SV *thing = orig_thing;
   U32 type;
 
   if(!check_new(st, thing))
-      return FALSE;
+      return;
 
   type = SvTYPE(thing);
   if (type > SVt_LAST) {
       warn("Devel::Size: Unknown variable type: %d encountered\n", type);
-      return TRUE;
+      return;
   }
   st->total_size += sizeof(SV) + body_sizes[type];
 
@@ -769,7 +811,7 @@ sv_size(pTHX_ struct state *const st, const SV * const orig_thing,
     TAG;break;
 
   }
-  return TRUE;
+  return;
 }
 
 static struct state *
@@ -789,6 +831,9 @@ new_state(pTHX)
     check_new(st, &PL_sv_undef);
     check_new(st, &PL_sv_no);
     check_new(st, &PL_sv_yes);
+#if PERL_VERSION > 8 || (PERL_VERSION == 8 && PERL_SUBVERSION > 0)
+    check_new(st, &PL_sv_placeholder);
+#endif
     return st;
 }