Skip to content

gh-77273: Better bytecodes for f-strings #6132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markshannon merged 6 commits into from
Jun 14, 2023
Merged

gh-77273: Better bytecodes for f-strings #6132

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3af4084
Avoid conditional stack effects when compiling f-strings.
markshannon Jun 5, 2023
a84bd65
Merge branch 'main' into better-bytecode-fstring
markshannon Jun 5, 2023
b6d7171
Fix up magic number.
markshannon Jun 5, 2023
62a3404
Document new instructions.
markshannon Jun 5, 2023
31385d1
Merge branch 'main' into better-bytecode-fstring
markshannon Jun 9, 2023
641466c
Merge branch 'main' into better-bytecode-fstring
markshannon Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Document new instructions.
  • Loading branch information
@markshannon
markshannon committed Jun 5, 2023
commit 62a340404047755e43e7dda44029a4eedfcb19cb
53 changes: 37 additions & 16 deletions Doc/library/dis.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1423,26 +1423,47 @@ iterations of the loop.
an argument from two-byte to four-byte.


.. opcode:: FORMAT_VALUE (flags)
.. opcode:: CONVERT_VALUE (oparg)

Used for implementing formatted literal strings (f-strings). Pops
an optional *fmt_spec* from the stack, then a required *value*.
*flags* is interpreted as follows:
Convert value to a string, depending on ``oparg``::

* ``(flags & 0x03) == 0x00``: *value* is formatted as-is.
* ``(flags & 0x03) == 0x01``: call :func:`str` on *value* before
formatting it.
* ``(flags & 0x03) == 0x02``: call :func:`repr` on *value* before
formatting it.
* ``(flags & 0x03) == 0x03``: call :func:`ascii` on *value* before
formatting it.
* ``(flags & 0x04) == 0x04``: pop *fmt_spec* from the stack and use
it, else use an empty *fmt_spec*.
value = STACK.pop()
result = func(value)
STACK.push(result)

Formatting is performed using :c:func:`PyObject_Format`. The
result is pushed on the stack.
* ``oparg == 1``: call :func:`str` on *value*
* ``oparg == 2``: call :func:`repr` on *value*
* ``oparg == 3``: call :func:`ascii` on *value*

.. versionadded:: 3.6
Used for implementing formatted literal strings (f-strings).

.. versionadded:: 3.13


.. opcode:: FORMAT_SIMPLE

Formats the value on top of stack::

value = STACK.pop()
result = value.__format__("")
STACK.push(result)

Used for implementing formatted literal strings (f-strings).

.. versionadded:: 3.13

.. opcode:: FORMAT_SPEC

Formats the given value with the given format spec::

spec = STACK.pop()
value = STACK.pop()
result = value.__format__(spec)
STACK.push(result)

Used for implementing formatted literal strings (f-strings).

.. versionadded:: 3.13


.. opcode:: MATCH_CLASS (count)
Expand Down