Fix ldots #993
Merged
Fix ldots #993
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
|
@mmatera Thanks for doing this. I'll look at Wednesday night. |
This was referenced Oct 27, 2020
rocky
reviewed
Oct 29, 2020
mathics/core/expression.py
Outdated
| ),"...",170)) | ||
| else: | ||
| return Expression("System`HoldForm",expr) | ||
|
|
There was a problem hiding this comment.
An interesting way to handle this.
I suspect there is a better way, but I don't know what it is.
And as you have said it doesn't fully address the problem of
In[1] = a...
Out[1] = a...
But this is an improvement.
rocky
approved these changes
Oct 29, 2020
GarkGarcia
reviewed
Oct 29, 2020
mathics/builtin/patterns.py
Outdated
| @@ -206,6 +206,8 @@ def apply_levelspec(self, expr, rules, ls, evaluation, options): | |||
| return result | |||
| except InvalidLevelspecError: | |||
| evaluation.message('General', 'level', ls) | |||
| except PatternError as e: | |||
There was a problem hiding this comment.
There's no need to extract e in here.
mathics/builtin/patterns.py
Outdated
| return result | ||
| result, applied = expr.apply_rules(rules, evaluation) | ||
| return result | ||
| except PatternError as e: |
mathics/builtin/patterns.py
Outdated
| @@ -309,8 +314,12 @@ class ReplaceRepeated(BinaryOperator): | |||
|
|
|||
| def apply_list(self, expr, rules, evaluation): | |||
| 'ReplaceRepeated[expr_, rules_]' | |||
| try: | |||
| rules, ret = create_rules(rules, expr, 'ReplaceRepeated', evaluation) | |||
| except PatternError as e: | |||
mathics/builtin/patterns.py
Outdated
| try: | ||
| rules, ret = create_rules( | ||
| rules, expr, 'ReplaceList', evaluation, extra_args=[max]) | ||
| except PatternError as e: |
mathics/builtin/patterns.py
Outdated
| @@ -1114,7 +1127,8 @@ def init(self, expr, min=1): | |||
| self.min = min | |||
| if len(expr.leaves) == 2: | |||
| leaf_1 = expr.leaves[1] | |||
| if (leaf_1.has_form('List', 1, 2) and all(leaf.get_int_value() for leaf in leaf_1.leaves)): | |||
| allnumbers = all(not (leaf.get_int_value() is None) for leaf in leaf_1.get_leaves()) | |||
| if (leaf_1.has_form('List', 1, 2) and allnumbers ): | |||
There was a problem hiding this comment.
There's not need for the parenthesis in this condition.
mathics/builtin/patterns.py
Outdated
| @@ -1114,7 +1127,8 @@ def init(self, expr, min=1): | |||
| self.min = min | |||
| if len(expr.leaves) == 2: | |||
| leaf_1 = expr.leaves[1] | |||
| if (leaf_1.has_form('List', 1, 2) and all(leaf.get_int_value() for leaf in leaf_1.leaves)): | |||
| allnumbers = all(not (leaf.get_int_value() is None) for leaf in leaf_1.get_leaves()) | |||
There was a problem hiding this comment.
leaf.get_int_value() is not None is more idiomatic than not (leaf.get_int_value() is None)
|
Thanks! |
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 fixes the behavior of Repeated and RepeatedNull and introduce catch exceptions for wrong formatted patterns.
Import@"https://raw.githubusercontent.com/jkuczm/MathematicaCellsToTeX/master/NoInstall.m"now still does not loads, but at least do not kill the interpreter...
@rocky please have a look at this.