s/TMP_CRLF_PATCH/PERL_STRICT_CR/ with sense reversed, so they

[perl5.git] / cc_runtime.h

diff --git a/cc_runtime.h b/cc_runtime.h
index 7d28ff5..18e3ba2 100644 (file)
--- a/cc_runtime.h
+++ b/cc_runtime.h
@@ -1,4 +1,4 @@
-#define DOOP(ppname) PUTBACK; op = ppname(ARGS); SPAGAIN
+#define DOOP(ppname) PUTBACK; PL_op = ppname(ARGS); SPAGAIN
 
 #define PP_LIST(g) do {                        \
        dMARK;                          \
@@ -6,13 +6,13 @@
            if (++MARK <= SP)           \
                *MARK = *SP;            \
            else                        \
-               *MARK = &sv_undef;      \
+               *MARK = &PL_sv_undef;   \
            SP = MARK;                  \
        }                               \
    } while (0)
 
 #define MAYBE_TAINT_SASSIGN_SRC(sv) \
-    if (tainting && tainted && (!SvGMAGICAL(left) || !SvSMAGICAL(left) || \
+    if (PL_tainting && PL_tainted && (!SvGMAGICAL(left) || !SvSMAGICAL(left) || \
                                 !((mg=mg_find(left, 't')) && mg->mg_len & 1)))\
         TAINT_NOT
 
@@ -28,9 +28,9 @@
 
 #define PP_UNSTACK do {                \
        TAINT_NOT;              \
-       stack_sp = stack_base + cxstack[cxstack_ix].blk_oldsp;  \
+       PL_stack_sp = PL_stack_base + cxstack[cxstack_ix].blk_oldsp;    \
        FREETMPS;               \
-       oldsave = scopestack[scopestack_ix - 1]; \
+       oldsave = PL_scopestack[PL_scopestack_ix - 1]; \
        LEAVE_SCOPE(oldsave);   \
        SPAGAIN;                \
     } while(0)
@@ -38,24 +38,24 @@
 /* Anyone using eval "" deserves this mess */
 #define PP_EVAL(ppaddr, nxt) do {              \
        dJMPENV;                                \
-       int jmpstat;                            \
+       int ret;                                \
        PUTBACK;                                \
-       JMPENV_PUSH(jmpstat);                   \
-       switch (jmpstat) {                      \
-       case JMP_NORMAL:                        \
-           op = ppaddr(ARGS);                  \
-           retstack[retstack_ix - 1] = Nullop; \
-           if (op != nxt) runops();            \
+       JMPENV_PUSH(ret);                       \
+       switch (ret) {                          \
+       case 0:                                 \
+           PL_op = ppaddr(ARGS);                       \
+           PL_retstack[PL_retstack_ix - 1] = Nullop;   \
+           if (PL_op != nxt) runops();         \
            JMPENV_POP;                         \
            break;                              \
-       case JMP_ABNORMAL: JMPENV_POP; JMPENV_JUMP(JMP_ABNORMAL);       \
-       case JMP_MYEXIT: JMPENV_POP; JMPENV_JUMP(JMP_MYEXIT);   \
-       case JMP_EXCEPTION:                                     \
+       case 1: JMPENV_POP; JMPENV_JUMP(1);     \
+       case 2: JMPENV_POP; JMPENV_JUMP(2);     \
+       case 3:                                 \
            JMPENV_POP;                         \
-           if (restartop != nxt)               \
-               JMPENV_JUMP(JMP_EXCEPTION);                     \
+           if (PL_restartop != nxt)            \
+               JMPENV_JUMP(3);                 \
        }                                       \
-       op = nxt;                               \
+       PL_op = nxt;                            \
        SPAGAIN;                                \
     } while (0)
 
@@ -64,8 +64,8 @@
        int ret;                                \
        JMPENV_PUSH(ret);                       \
        switch (ret) {                          \
-       case JMP_ABNORMAL: JMPENV_POP; JMPENV_JUMP(JMP_ABNORMAL);       \
-       case JMP_MYEXIT: JMPENV_POP; JMPENV_JUMP(JMP_MYEXIT);   \
-       case JMP_EXCEPTION: JMPENV_POP; SPAGAIN; goto label;\
+       case 1: JMPENV_POP; JMPENV_JUMP(1);     \
+       case 2: JMPENV_POP; JMPENV_JUMP(2);     \
+       case 3: JMPENV_POP; SPAGAIN; goto label;\
        }                                       \
     } while (0)