summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Mitchell <davem@iabyn.com>2022-05-28 12:11:20 +0100
committerDavid Mitchell <davem@iabyn.com>2022-06-20 11:27:22 +0100
commita8c38aeb02f54027c283d5d8948af4947f669700 (patch)
treee7994f6d14a854fed6def32a8c297a07fe7e7a0f
parentc4ac568bb31f6eacb56f1263a238e7a5b19fc3f0 (diff)
downloadperl-a8c38aeb02f54027c283d5d8948af4947f669700.tar.gz
s/JUMPENV/JMPENV/g
Although one of the macros associated with the JMPENV facility is inconsistently called JMPENV_JUMP(), fix all code comments and debugging output to eliminate any references to JUMPENV.
-rw-r--r--cop.h6
-rw-r--r--intrpvar.h2
-rw-r--r--pp.c4
-rw-r--r--pp_hot.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/cop.h b/cop.h
index f937fddbea..dd386d10aa 100644
--- a/cop.h
+++ b/cop.h
@@ -115,7 +115,7 @@ typedef struct jmpenv JMPENV;
DEBUG_l({ \
int i = 0; JMPENV *p = PL_top_env; \
while (p) { i++; p = p->je_prev; } \
- Perl_deb(aTHX_ "JUMPENV_PUSH level=%d at %s:%d\n", \
+ Perl_deb(aTHX_ "JMPENV_PUSH level=%d at %s:%d\n", \
i, __FILE__, __LINE__);}) \
cur_env.je_prev = PL_top_env; \
JE_OLD_STACK_HWM_save(cur_env); \
@@ -132,7 +132,7 @@ typedef struct jmpenv JMPENV;
DEBUG_l({ \
int i = -1; JMPENV *p = PL_top_env; \
while (p) { i++; p = p->je_prev; } \
- Perl_deb(aTHX_ "JUMPENV_POP level=%d at %s:%d\n", \
+ Perl_deb(aTHX_ "JMPENV_POP level=%d at %s:%d\n", \
i, __FILE__, __LINE__);}) \
assert(PL_top_env == &cur_env); \
PL_delaymagic = cur_env.je_old_delaymagic; \
@@ -144,7 +144,7 @@ typedef struct jmpenv JMPENV;
DEBUG_l({ \
int i = -1; JMPENV *p = PL_top_env; \
while (p) { i++; p = p->je_prev; } \
- Perl_deb(aTHX_ "JUMPENV_JUMP(%d) level=%d at %s:%d\n", \
+ Perl_deb(aTHX_ "JMPENV_JUMP(%d) level=%d at %s:%d\n", \
(int)v, i, __FILE__, __LINE__);}) \
if (PL_top_env->je_prev) \
PerlProc_longjmp(PL_top_env->je_buf, (v)); \
diff --git a/intrpvar.h b/intrpvar.h
index bcadb78246..430422fbde 100644
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -83,7 +83,7 @@ PERLVARI(I, tainted, bool, FALSE) /* using variables controlled by $< */
* control returns to pp_push or whatever, it sees if any of those flags
* have been set, and if so finally calls mg_set().
*
- * NB: PL_delaymagic is automatically saved and restored by JUMPENV_PUSH
+ * NB: PL_delaymagic is automatically saved and restored by JMPENV_PUSH
* / POP. This removes the need to do ENTER/SAVEI16(PL_delaymagic)/LEAVE
* in hot code like pp_push.
*/
diff --git a/pp.c b/pp.c
index 088d04e30a..ccaf49e1d2 100644
--- a/pp.c
+++ b/pp.c
@@ -5796,7 +5796,7 @@ PP(pp_push)
/* SPAGAIN; not needed: SP is assigned to immediately below */
}
else {
- /* PL_delaymagic is restored by JUMPENV_POP on dieing, so we
+ /* PL_delaymagic is restored by JMPENV_POP on dieing, so we
* only need to save locally, not on the save stack */
U16 old_delaymagic = PL_delaymagic;
@@ -5852,7 +5852,7 @@ PP(pp_unshift)
/* SPAGAIN; not needed: SP is assigned to immediately below */
}
else {
- /* PL_delaymagic is restored by JUMPENV_POP on dieing, so we
+ /* PL_delaymagic is restored by JMPENV_POP on dieing, so we
* only need to save locally, not on the save stack */
U16 old_delaymagic = PL_delaymagic;
SSize_t i = 0;
diff --git a/pp_hot.c b/pp_hot.c
index 2ec4bbc4eb..f583261558 100644
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -2225,7 +2225,7 @@ PP(pp_aassign)
SV **relem;
SV **lelem;
U8 gimme;
- /* PL_delaymagic is restored by JUMPENV_POP on dieing, so we
+ /* PL_delaymagic is restored by JMPENV_POP on dieing, so we
* only need to save locally, not on the save stack */
U16 old_delaymagic = PL_delaymagic;
#ifdef DEBUGGING