X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=scope.h;h=cc349f0f7c22957f73a2677ea1db343a5395ab0d;hb=249edfdff1b2b750e894ee5a0b6cb64d2640ca02;hp=3c38a1ffc324eb436b98a85d55ef8eb160a9cc60;hpb=f3dc24a506bc9f8ad2439e198f72ce34fb1c42b0;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/scope.h b/scope.h
index 3c38a1f..cc349f0 100644
--- a/scope.h
+++ b/scope.h
@@ -22,7 +22,9 @@
 #define SAVEt_REGCONTEXT 21
 #define SAVEt_STACK_POS  22
 #define SAVEt_I16	23
-#define SAVEt_OP	24
+#define SAVEt_AELEM     24
+#define SAVEt_HELEM     25
+#define SAVEt_OP	26
 
 #define SSCHECK(need) if (savestack_ix + need > savestack_max) savestack_grow()
 #define SSPUSHINT(i) (savestack[savestack_ix++].any_i32 = (I32)(i))
@@ -75,8 +77,17 @@
 #define SAVECLEARSV(sv)	save_clearsv(SOFT_CAST(SV**)&(sv))
 #define SAVEDELETE(h,k,l) \
 	  save_delete(SOFT_CAST(HV*)(h), SOFT_CAST(char*)(k), (I32)(l))
+#ifdef PERL_OBJECT
+#define CALLDESTRUCTOR this->*SSPOPDPTR
 #define SAVEDESTRUCTOR(f,p) \
-	  save_destructor(SOFT_CAST(void(*)_((void*)))(f),SOFT_CAST(void*)(p))
+	  save_destructor((DESTRUCTORFUNC)(FUNC_NAME_TO_PTR(f)),	\
+			  SOFT_CAST(void*)(p))
+#else
+#define CALLDESTRUCTOR *SSPOPDPTR
+#define SAVEDESTRUCTOR(f,p) \
+	  save_destructor(SOFT_CAST(void(*)_((void*)))(FUNC_NAME_TO_PTR(f)), \
+			  SOFT_CAST(void*)(p))
+#endif
 #define SAVESTACK_POS() STMT_START {	\
     SSCHECK(2);				\
     SSPUSHINT(stack_sp - stack_base);	\