-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Fix pow and unary operators order #1723
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.
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
Open
krepysh
wants to merge
7
commits into
pallets:stable
Choose a base branch
from
krepysh:fix_pow_and_unary_operators_order
base: stable
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+34
−5
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
45c3f39
Fix: change pow and unary minus priority bug, and add test.
e1b8db8
Add: test for pow evaluation order
9ab3dc6
Add: section to CHANGES.rst
8a501e1
Add: more tests for parser. Wrap first arg of binop with additional b…
krepysh 1b5ee53
Merge remote-tracking branch 'origin/3.1.x' into fix_pow_and_unary_op…
krepysh c141c96
Change wording in changelog
krepysh 402d111
Fix: add mention about new power evaluation order to documentation
krepysh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -575,6 +575,26 @@ def test_parse_unary(self, env): | |
| tmpl = env.from_string('{{ -foo["bar"]|abs }}') | ||
| assert tmpl.render(foo={"bar": 42}) == "42" | ||
|
|
||
| def test_negative_pow(self, env): | ||
| tmpl = env.from_string("{{ - 1 ** 2 }}") | ||
| assert tmpl.render() == "-1" | ||
|
|
||
| def test_pow_associative_from_left_to_right(self, env): | ||
| tmpl = env.from_string("{{ 2 ** 3 ** 2 }}") | ||
| assert tmpl.render() == "512" | ||
|
|
||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In order to verify if issue #1720 is fixed, I would add the following tests: def test_pow_negative_base(self, env):
tmpl = env.from_string("{{ (- 1) ** 2 }}")
assert tmpl.render() == "1"
def test_pow_negative_base_variable_exponent(self, env):
tmpl = env.from_string("{{ (- 1) ** x }}", {"x": 2})
assert tmpl.render() == "1"
def test_negative_pow_variable_exponent(self, env):
tmpl = env.from_string("{{ - 1 ** x }}", {"x": 2})
assert tmpl.render() == "-1"All the tests seems to pass adding the change suggested here |
||
| def test_pow_negative_base(self, env): | ||
| tmpl = env.from_string("{{ (- 1) ** 2 }}") | ||
| assert tmpl.render() == "1" | ||
|
|
||
| def test_pow_negative_base_variable_exponent(self, env): | ||
| tmpl = env.from_string("{{ (- 1) ** x }}", {"x": 2}) | ||
| assert tmpl.render() == "1" | ||
|
|
||
| def test_negative_pow_variable_exponent(self, env): | ||
| tmpl = env.from_string("{{ - 1 ** x }}", {"x": 2}) | ||
| assert tmpl.render() == "-1" | ||
|
|
||
|
|
||
| class TestLstripBlocks: | ||
| def test_lstrip(self, env): | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@davidism, should I remove this outdated explanation? Or it will be better to leave it here in order to keep history in docs?