Improving precedence comparison. #1154
Merged
Conversation
This file contains 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
* Improving handling for Infix, Prefix and Postfix format
rocky
reviewed
Nov 5, 2024
mathics/builtin/layout.py
Outdated
| @@ -16,7 +16,13 @@ | |||
| from mathics.builtin.makeboxes import MakeBoxes | |||
| from mathics.builtin.options import options_to_rules | |||
| from mathics.core.atoms import Real, String | |||
| from mathics.core.builtin import BinaryOperator, Builtin, Operator | |||
| from mathics.core.builtin import ( | |||
| BinaryOperator, | |||
There was a problem hiding this comment.
WIth the changes to use PostfixOperator and PrefixOperator (thank you very much), the "BinaryOperator" is no longer imported.
rocky
reviewed
Nov 5, 2024
mathics/builtin/recurrence.py
Outdated
| ## PyPy: {{a -> (Function[{n}, 1 - C[1] + C[1] -1 ^ n])}} | ||
| ## CPython: {{a -> (Function[{n}, 1 + C[1] -1 ^ n - C[1]])} | ||
| ## PyPy: {{a -> Function[{n}, 1 - C[1] + C[1] -1 ^ n]}} | ||
| ## CPython: {{a -> Function[{n}, 1 + C[1] -1 ^ n - C[1]]} | ||
|
|
||
| Geta "pure function" solution for a with two boundary conditions: |
There was a problem hiding this comment.
A small typo from previous: "Geta" -> "Get a"
rocky
reviewed
Nov 5, 2024
| attributes = A_SEQUENCE_HOLD | A_PROTECTED | ||
| grouping = "Right" | ||
| name = "Rule" |
rocky
reviewed
Nov 5, 2024
| @@ -527,7 +527,7 @@ def lhs(expr): | |||
| return Expression(SymbolFormat, expr, Symbol(format)) | |||
|
|
|||
| def rhs(expr): | |||
| if expr.has_formf(SymbolInfix, None): | |||
| if expr.has_form(SymbolInfix, None): | |||
rocky
reviewed
Nov 5, 2024
mathics/eval/makeboxes.py
Outdated
| ) -> Optional[int]: | ||
| """ | ||
| compare the precedence of the element regarding a precedence value. | ||
| If both precedences are equivalent, return 0. If precedence of element |
There was a problem hiding this comment.
precedence is an integers or maybe fixed-point numbers. So here, "equivalent" is the same as "equals".
If both precedences are equivalent -> If the precedence is the same
There was a problem hiding this comment.
If the precedence of element -> If the precedence of the first element
rocky
reviewed
Nov 5, 2024
| @@ -279,8 +307,8 @@ def format_expr(expr): | |||
|
|
|||
| formatted = format_expr(expr) if isinstance(expr, EvalMixin) else None | |||
| if formatted is not None: | |||
| do_format = element_formatters.get(type(formatted), do_format_element) | |||
| result = do_format(formatted, evaluation, form) | |||
| do_format_fn = element_formatters.get(type(formatted), do_format_element) | |||
rocky
reviewed
Nov 5, 2024
| @@ -1151,22 +1151,29 @@ def __init__(self, *args, **kwargs): | |||
|
|
|||
| # Prevent pattern matching symbols from gaining meaning here using | |||
| # Verbatim | |||
| name = f"Verbatim[{name}]" | |||
| verbatim_name = f"Verbatim[{name}]" | |||
|
LGTM - but please see comments. |
|
@rocky, good. Then let's merge and iterate. |
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 PR includes some fixes and improvings for handling operator precedence. In particular, as in WMA, avoids wrapping in parenthesis the second element of
Rule[pat_, Function[...]].