Rename ENTER_WITH to BEGIN_WITH for consistency with BEFORE_ASYNC_WITH.

Author: markshannon

Include/opcode.h

@@ -34,7 +34,7 @@ extern "C" {
 #define GET_AITER                50
 #define GET_ANEXT                51
 #define BEFORE_ASYNC_WITH        52
-#define ENTER_WITH               53
+#define BEFORE_WITH              53
 #define INPLACE_ADD              55
 #define INPLACE_SUBTRACT         56
 #define INPLACE_MULTIPLY         57

Lib/opcode.py

@@ -89,7 +89,7 @@ def jabs_op(name, op):
 def_op('GET_AITER', 50)
 def_op('GET_ANEXT', 51)
 def_op('BEFORE_ASYNC_WITH', 52)
-def_op('ENTER_WITH', 53)
+def_op('BEFORE_WITH', 53)
 
 def_op('INPLACE_ADD', 55)
 def_op('INPLACE_SUBTRACT', 56)

Python/ceval.c

@@ -934,7 +934,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
                    - If we're about the enter the body of a with statement
                      having just called __enter__/__exit__, then make sure
                      that the exception handler is pushed. Otherwise, we might
-                     not call __exit__ if an interrput occurs and just this moment.
+                     not call __exit__ if an interrupt occurs at just this moment.
                    - If we're about to enter the try: of a try statement (not
                      *very* useful, but might help in some cases and it's
                      traditional)
@@ -2894,7 +2894,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
             DISPATCH();
         }
 
-        TARGET(ENTER_WITH) {
+        TARGET(BEFORE_WITH) {
             /* Replace TOP with TOP.__exit__ and push the result
              * of calling TOP.__enter__()
              */

Python/compile.c

@@ -1029,7 +1029,7 @@ PyCompile_OpcodeStackEffect(int opcode, int oparg)
                         + 3 others for the previous exception state
                         -1 for the context manager. */
 
-        case ENTER_WITH:
+        case BEFORE_WITH:
             return 1;
 
         case LOAD_FAST:
@@ -4538,7 +4538,7 @@ compiler_async_with(struct compiler *c, stmt_ty s, int pos)
    is implemented as:
 
         <code for EXPR>
-        ENTER_WITH
+        BEFORE_WITH
         SETUP_WITH  E
         <code to store to VAR> or POP_TOP
         <code for BLOCK>
@@ -4573,7 +4573,7 @@ compiler_with(struct compiler *c, stmt_ty s, int pos)
     /* Evaluate EXPR */
     VISIT(c, expr, item->context_expr);
     /* Will push bound __exit__ */
-    ADDOP(c, ENTER_WITH);
+    ADDOP(c, BEFORE_WITH);
     ADDOP_JREL(c, SETUP_WITH, final2);
 
     if (item->optional_vars) {

Python/opcode_targets.h

@@ -52,7 +52,7 @@ static void *opcode_targets[256] = {
     &&TARGET_GET_AITER,
     &&TARGET_GET_ANEXT,
     &&TARGET_BEFORE_ASYNC_WITH,
-    &&TARGET_ENTER_WITH,
+    &&TARGET_BEFORE_WITH,
     &&_unknown_opcode,
     &&TARGET_INPLACE_ADD,
     &&TARGET_INPLACE_SUBTRACT,