Add elc target to to makefile

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

diff --git a/scope.h b/scope.h
index 757161e..3ac4a59 100644 (file)
--- a/scope.h
+++ b/scope.h
@@ -22,7 +22,10 @@
 #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 SAVEt_HINTS    27
 
 #define SSCHECK(need) if (savestack_ix + need > savestack_max) savestack_grow()
 #define SSPUSHINT(i) (savestack[savestack_ix++].any_i32 = (I32)(i))
@@ -78,19 +81,35 @@
 #ifdef PERL_OBJECT
 #define CALLDESTRUCTOR this->*SSPOPDPTR
 #define SAVEDESTRUCTOR(f,p) \
-         save_destructor((DESTRUCTORFUNC)(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*)))(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);  \
-    SSPUSHINT(SAVEt_STACK_POS);                \
- } STMT_END
+
+#define SAVESTACK_POS() \
+    STMT_START {                               \
+       SSCHECK(2);                             \
+       SSPUSHINT(stack_sp - stack_base);       \
+       SSPUSHINT(SAVEt_STACK_POS);             \
+    } STMT_END
+
 #define SAVEOP()       save_op()
 
+#define SAVEHINTS() \
+    STMT_START {                               \
+       if (hints & HINT_LOCALIZE_HH)           \
+           save_hints();                       \
+       else {                                  \
+           SSCHECK(2);                         \
+           SSPUSHINT(hints);                   \
+           SSPUSHINT(SAVEt_HINTS);             \
+       }                                       \
+    } STMT_END
+
 /* A jmpenv packages the state required to perform a proper non-local jump.
  * Note that there is a start_env initialized when perl starts, and top_env
  * points to this initially, so top_env should always be non-null.