rename POPFOO() to CX_POPFOO()

Rename all the context-popping macros such as POPBLOCK and POPSUB, by
giving them a CX_ prefix. (Do TOPBLOCK too).

This is principally to  deliberately break any existing non-core use of
these non-API macros, as their behaviour has changed in this branch.
In particular, POPBLOCK(cx) no longer decrements the cxt stack pointer
nor sets cx; instead, cx is now expected to already point to the stack
frame which POPBLOCK should process.

At the same time, giving them a CX_ prefix makes it clearer that these
are all part of a family of macros that manipulate the context stack.

The PUSHFOO() macros will be renamed in a later commit.

1 files changed, 2 insertions, 2 deletions

diff --git a/pp_sort.c b/pp_sort.c
index 4079eef2be..8e875122f0 100644
--- a/pp_sort.c
+++ b/pp_sort.c
@@ -1706,13 +1706,13 @@ PP(pp_sort)
             CX_LEAVE_SCOPE(cx);
 	    if (!(flags & OPf_SPECIAL)) {
                 assert(CxTYPE(cx) == CXt_SUB);
-                POPSUB(cx);
+                CX_POPSUB(cx);
 	    }
             else
                 assert(CxTYPE(cx) == CXt_NULL);
                 /* there isn't a POPNULL ! */
 
-	    POPBLOCK(cx);
+	    CX_POPBLOCK(cx);
             CX_POP(cx);
 	    POPSTACK;
 	    CATCH_SET(oldcatch);