summaryrefslogtreecommitdiff
path: root/Doc/library/dis.rst
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-12-14 20:13:39 +0200
committerEzio Melotti <ezio.melotti@gmail.com>2012-12-14 20:13:39 +0200
commit3eab56987c48344d6626b69fd809e1586d61b719 (patch)
treea6ab9f0e2cbdc648b292d17b1f097039f4d9c102 /Doc/library/dis.rst
parent108f7ef617406a11cbf987007f0260f18d37a40a (diff)
parent97ed28f0985683390be4ea86e1fa01ded50d3574 (diff)
downloadcpython-3eab56987c48344d6626b69fd809e1586d61b719.tar.gz
#16681: merge with 3.2.
Diffstat (limited to 'Doc/library/dis.rst')
-rw-r--r--Doc/library/dis.rst26
1 files changed, 15 insertions, 11 deletions
diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
index 108cda7330..4339f559b4 100644
--- a/Doc/library/dis.rst
+++ b/Doc/library/dis.rst
@@ -171,11 +171,6 @@ The Python compiler currently generates the following bytecode instructions.
**General instructions**
-.. opcode:: STOP_CODE
-
- Indicates end-of-code to the compiler, not used by the interpreter.
-
-
.. opcode:: NOP
Do nothing code. Used as a placeholder by the bytecode optimizer.
@@ -436,6 +431,13 @@ the stack so that it is available for further iterations of the loop.
Pops ``TOS`` and yields it from a :term:`generator`.
+.. opcode:: YIELD_FROM
+
+ Pops ``TOS`` and delegates to it as a subiterator from a :term:`generator`.
+
+ .. versionadded:: 3.3
+
+
.. opcode:: IMPORT_STAR
Loads all symbols not starting with ``'_'`` directly from the module TOS to the
@@ -752,17 +754,19 @@ the more significant byte last.
.. opcode:: MAKE_FUNCTION (argc)
- Pushes a new function object on the stack. TOS is the code associated with the
- function. The function object is defined to have *argc* default parameters,
- which are found below TOS.
+ Pushes a new function object on the stack. TOS is the
+ :term:`qualified name` of the function; TOS1 is the code associated with
+ the function. The function object is defined to have *argc* default parameters,
+ which are found below TOS1.
.. opcode:: MAKE_CLOSURE (argc)
Creates a new function object, sets its *__closure__* slot, and pushes it on
- the stack. TOS is the code associated with the function, TOS1 the tuple
- containing cells for the closure's free variables. The function also has
- *argc* default parameters, which are found below the cells.
+ the stack. TOS is the :term:`qualified name` of the function, TOS1 is the
+ code associated with the function, and TOS2 is the tuple containing cells for
+ the closure's free variables. The function also has *argc* default parameters,
+ which are found below the cells.
.. opcode:: BUILD_SLICE (argc)