rename

Author: JelleZijlstra

Include/internal/pycore_instruction_sequence.h

@@ -66,8 +66,8 @@ _PyJumpTargetLabel _PyInstructionSequence_NewLabel(_PyInstructionSequence *seq);
 int _PyInstructionSequence_ApplyLabelMap(_PyInstructionSequence *seq);
 int _PyInstructionSequence_InsertInstruction(_PyInstructionSequence *seq, int pos,
                                              int opcode, int oparg, _Py_SourceLocation loc);
-int _PyInstructionSequence_PrependSequence(_PyInstructionSequence *seq, int pos,
-                                           _PyInstructionSequence *nested);
+int _PyInstructionSequence_InjectSequence(_PyInstructionSequence *seq, int pos,
+                                          _PyInstructionSequence *injected);
 int _PyInstructionSequence_AddNested(_PyInstructionSequence *seq, _PyInstructionSequence *nested);
 void PyInstructionSequence_Fini(_PyInstructionSequence *seq);
 

Python/codegen.c

@@ -829,7 +829,7 @@ codegen_process_deferred_annotations(compiler *c, location loc)
 
     if (nested_instr_seq != NULL) {
         RETURN_IF_ERROR(
-            _PyInstructionSequence_PrependSequence(old_instr_seq, 1, nested_instr_seq));
+            _PyInstructionSequence_InjectSequence(old_instr_seq, 1, nested_instr_seq));
         _PyCompile_SetInstrSequence(c, old_instr_seq);
         PyInstructionSequence_Fini(nested_instr_seq);
     }

Python/instruction_sequence.c

@@ -160,27 +160,27 @@ _PyInstructionSequence_InsertInstruction(instr_sequence *seq, int pos,
 }
 
 int
-_PyInstructionSequence_PrependSequence(instr_sequence *seq, int pos,
-                                       instr_sequence *nested)
+_PyInstructionSequence_InjectSequence(instr_sequence *seq, int pos,
+                                      instr_sequence *injected)
 {
     assert(pos >= 0 && pos <= seq->s_used);
     // Merging labelmaps is not supported
-    assert(nested->s_labelmap_size == 0 && nested->s_nested == NULL);
-    if (nested->s_used == 0) {
+    assert(injected->s_labelmap_size == 0 && injected->s_nested == NULL);
+    if (injected->s_used == 0) {
         return SUCCESS;
     }
 
-    int last_idx = instr_sequence_grow(seq, nested->s_used);
+    int last_idx = instr_sequence_grow(seq, injected->s_used);
 
     RETURN_IF_ERROR(last_idx);
-    for (int i = last_idx - nested->s_used; i >= pos; i--) {
-        seq->s_instrs[i + nested->s_used] = seq->s_instrs[i];
+    for (int i = last_idx - injected->s_used; i >= pos; i--) {
+        seq->s_instrs[i + injected->s_used] = seq->s_instrs[i];
     }
-    for (int i=0; i < nested->s_used; i++) {
-        seq->s_instrs[i + pos] = nested->s_instrs[i];
+    for (int i=0; i < injected->s_used; i++) {
+        seq->s_instrs[i + pos] = injected->s_instrs[i];
     }
     for(int lbl=0; lbl < seq->s_labelmap_size; lbl++) {
-        seq->s_labelmap[lbl] += nested->s_used;
+        seq->s_labelmap[lbl] += injected->s_used;
     }
     return SUCCESS;
 }