[ PATCH 5.004 68 ] Text::ParseWords, ^W fixed, version 3.1

[p5sagit/p5-mst-13.2.git] / scope.h

diff --git a/scope.h b/scope.h
index 4648d00..cc349f0 100644 (file)
--- 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))
@@ -39,8 +41,23 @@
 #define SAVETMPS save_int((int*)&tmps_floor), tmps_floor = tmps_ix
 #define FREETMPS if (tmps_ix > tmps_floor) free_tmps()
 
+#ifdef DEBUGGING
+#define ENTER                                                  \
+    STMT_START {                                               \
+       push_scope();                                           \
+       DEBUG_l(WITH_THR(deb("ENTER scope %ld at %s:%d\n",      \
+                   scopestack_ix, __FILE__, __LINE__)));       \
+    } STMT_END
+#define LEAVE                                                  \
+    STMT_START {                                               \
+       DEBUG_l(WITH_THR(deb("LEAVE scope %ld at %s:%d\n",      \
+                   scopestack_ix, __FILE__, __LINE__)));       \
+       pop_scope();                                            \
+    } STMT_END
+#else
 #define ENTER push_scope()
 #define LEAVE pop_scope()
+#endif
 #define LEAVE_SCOPE(old) if (savestack_ix > old) leave_scope(old)
 
 /*
@@ -60,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((DESTRUCTORFUNC)(FUNC_NAME_TO_PTR(f)),        \
+                         SOFT_CAST(void*)(p))
+#else
+#define CALLDESTRUCTOR *SSPOPDPTR
 #define SAVEDESTRUCTOR(f,p) \
-         save_destructor(SOFT_CAST(void(*)_((void*)))(f),SOFT_CAST(void*)(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);  \