Use named groups in mathtext parser. #21448
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3855e16 to
b970df6
Compare
timhoffm
approved these changes
Oct 24, 2021
|
I'll milestone this as RC for mpl3.5, although for that release most likely we could (should) just extract the minimal patch (above, in the Edit: ...) to specifically fix compat with pyparsing 3. |
timhoffm
added a commit
to timhoffm/matplotlib
that referenced
this pull request
Oct 24, 2021
- Code suggestion taken from matplotlib#21448 - Removed all pyparsing pinning. If this runs through CI, the fix is proven to be working.
|
We should only backport the minimal fix as suggested. I've created #21454 for this. So we can remilestone to 3.6 and remove the "release critical" tag here. |
timhoffm
added a commit
to timhoffm/matplotlib
that referenced
this pull request
Oct 24, 2021
- Code suggestion taken from matplotlib#21448 - Removed all pyparsing pinning. If this runs through CI, the fix is proven to be working.
|
I know, I was just letting someone else do the work :-) |
timhoffm
added a commit
to timhoffm/matplotlib
that referenced
this pull request
Oct 24, 2021
- Code suggestion taken from matplotlib#21448 - Removed all pyparsing pinning. If this runs through CI, the fix is proven to be working.
|
I suggest you remove the pyparsing pinning in this PR as well to make sure it solves the issue. |
|
This is already done in the second commit. |
fb6fe24 to
bd30b7b
Compare
|
Seems also a bit faster, see #20821 (comment). Edit: self-contained perf test: MPLBACKEND=agg python -c 'import time; from pylab import *; from matplotlib.tests.test_mathtext import math_tests; fig = figure(figsize=(3, 10)); fig.text(0, 0, "\n".join(filter(None, math_tests)), size=6); start = time.perf_counter(); [fig.canvas.draw() for _ in range(10)]; print((time.perf_counter() - start) / 10)'before: ~1.02s; after: ~0.81s. |
6 tasks
This makes the definitions much easier to read, by removing the need to use Group() and Suppress(): previously, these would be used to nest the parsed tokens and remove the unnecessary ones (e.g, braces), but such tokens can also easily be ignored by giving names to the tokens we use (instead of accessing them by position). (See e.g. the implementation of subsuper, which is also somewhat simplified.) Also remove a few other pyparsing combinators that are not needed: Combine (just concatenate the strings ourselves), FollowedBy (use lookahead regexes), Literal (use plain strings, in particular braces which are very common). Also remove right_delim_safe, as self._right_delim already includes the backslash-escaped closing brace rather than the unescaped one (right_delim_safe dates back to when it didn't). The error message for `a^2_2^2` now changed to "double superscript" as we now simply check for subscripts and superscripts one at a time, and fail when we see either two subscript or two superscripts, emitting the corresponding error.
2 tasks
oscargus
approved these changes
Apr 21, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This makes the definitions much easier to read, by removing the need to
use Group() and Suppress(): previously, these would be used to nest the
parsed tokens and remove the unnecessary ones (e.g, braces), but such
tokens can also easily be ignored by giving names to the tokens we use
(instead of accessing them by position). (See e.g. the implementation
of subsuper, which is also somewhat simplified.)
Also remove a few other pyparsing combinators that are not
needed: Combine (just concatenate the strings ourselves), FollowedBy
(use lookahead regexes), Literal (use plain strings, in particular
braces which are very common).
Also remove right_delim_safe, as self._right_delim already includes the
backslash-escaped closing brace rather than the unescaped one
(right_delim_safe dates back to when it didn't).
The error message for
a^2_2^2now changed to "double superscript" aswe now simply check for subscripts and superscripts one at a time, and
fail when we see either two subscript or two superscripts, emitting the
corresponding error.
(I played a bit with the parser to try and see what's wrong with pyparsing 3and got there; unfortunately this patch doesn't fix the incompatibility :-()
Edit: This seems to fix support with pyparsing 3. It's not totally clear why, though...
A much more minimal fix would be
I still don't know whether that's a bug or an intended API change on pyparsing's side.
PR Summary
PR Checklist
pytestpasses).flake8on changed files to check).flake8-docstringsand runflake8 --docstring-convention=all).doc/users/next_whats_new/(follow instructions in README.rst there).doc/api/next_api_changes/(follow instructions in README.rst there).