[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 672e2da 07/49: js2-parse-mul-expr: Parse the right operand
From: |
Dmitry Gutov |
Subject: |
[elpa] master 672e2da 07/49: js2-parse-mul-expr: Parse the right operand as exponentiation too |
Date: |
Mon, 16 Jan 2017 15:35:46 +0000 (UTC) |
branch: master
commit 672e2dae9220d73f7c92d940b7a8b814ed013b6f
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
js2-parse-mul-expr: Parse the right operand as exponentiation too
Follow-up to #344.
---
js2-mode.el | 2 +-
tests/parser.el | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/js2-mode.el b/js2-mode.el
index 6123019..e0ad559 100644
--- a/js2-mode.el
+++ b/js2-mode.el
@@ -9923,7 +9923,7 @@ FIXME: The latter option is unused?"
(while continue
(setq tt (js2-get-token))
(if (memq tt js2-parse-mul-ops)
- (setq pn (js2-make-binary tt pn 'js2-parse-unary-expr))
+ (setq pn (js2-make-binary tt pn 'js2-parse-expon-expr))
(js2-unget-token)
(setq continue nil)))
pn))
diff --git a/tests/parser.el b/tests/parser.el
index 0cd5f07..a0e2c5a 100644
--- a/tests/parser.el
+++ b/tests/parser.el
@@ -935,7 +935,7 @@ the test."
"class Foo {;}" :reference "class Foo {\n}")
(js2-deftest-parse exponentiation
- "a **= b ** c ** d;")
+ "a **= b ** c ** d * e ** f;")
(js2-deftest-parse exponentiation-prohibits-unary-op
"var a = -b ** c" :syntax-error "b")
- [elpa] master 44c289f 24/49: Copy edits, (continued)
- [elpa] master 44c289f 24/49: Copy edits, Dmitry Gutov, 2017/01/16
- [elpa] master b6d9301 17/49: Merge pull request #377 from XeCycle/memfn-delete, Dmitry Gutov, 2017/01/16
- [elpa] master 64ec0a2 14/49: Allow newline in globals declaration, Dmitry Gutov, 2017/01/16
- [elpa] master 2801681 26/49: Fix "pos" argument in template node constructors, Dmitry Gutov, 2017/01/16
- [elpa] master 712dfb0 29/49: Merge pull request #384 from mishoo/master, Dmitry Gutov, 2017/01/16
- [elpa] master df06798 23/49: Merge pull request #378 from JulianKniephoff/include-externs-locally, Dmitry Gutov, 2017/01/16
- [elpa] master 2a79649 33/49: Fix indentation after regexp in js2-old-indent.el, Dmitry Gutov, 2017/01/16
- [elpa] master f450de0 34/49: Handle destructuring assignments when classifying variables, Dmitry Gutov, 2017/01/16
- [elpa] master 90e37cd 45/49: Merge pull request #397 from lelit/issue393, Dmitry Gutov, 2017/01/16
- [elpa] master 9b63a13 16/49: Special methods should allow keywords as names, Dmitry Gutov, 2017/01/16
- [elpa] master 672e2da 07/49: js2-parse-mul-expr: Parse the right operand as exponentiation too,
Dmitry Gutov <=
- [elpa] master a91e357 40/49: Create a separate scope for switch statements, Dmitry Gutov, 2017/01/16
- [elpa] master 4d35da5 30/49: Fix the fix (error detection), Dmitry Gutov, 2017/01/16
- [elpa] master 31a2399 44/49: Mostly cosmetic, split js2--classify-variables in three simpler functions, Dmitry Gutov, 2017/01/16
- [elpa] master 3725fcf 35/49: Handle other cases of destructuring assignments/initializations, Dmitry Gutov, 2017/01/16
- [elpa] master dad7d09 32/49: feat: add js2-comments-between func, Dmitry Gutov, 2017/01/16
- [elpa] master 523b3cb 38/49: Add a STRICT parameter to js2--collect-declared-symbols, Dmitry Gutov, 2017/01/16
- [elpa] master 1f12517 10/49: Merge pull request #353 from kaushalmodi/js2-jsx-mode-docstring-fix, Dmitry Gutov, 2017/01/16
- [elpa] master 454b242 20/49: Update NEWS.md, Dmitry Gutov, 2017/01/16
- [elpa] master 2d0dc5e 43/49: Cosmetic, reformat to stay within the preferred 80 columns limit, Dmitry Gutov, 2017/01/16
- [elpa] master ff072bf 49/49: Merge commit '03c679eb9914d58d7d9b7afc2036c482a9a01236' from js2-mode, Dmitry Gutov, 2017/01/16