Attachment 357654 Details for Bug 192832 – Patch for landing

[patch] Patch for landing

bug-192832-20181218215848.patch (text/plain), 4.60 KB, created by Ross Kirsling on 2018-12-18 21:58:49 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Ross Kirsling

Created: 2018-12-18 21:58:49 PST

Size: 4.60 KB

patch

obsolete

>Subversion Revision: 239366
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index f5f845842cb118aa848615432f816f7fd5dda388..34dab9994072cd29a08ded23f21f17ba6a6dd805 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-12-18  Ross Kirsling  <ross.kirsling@sony.com>
>+
>+        Error message for `-x ** y` contains a typo.
>+        https://bugs.webkit.org/show_bug.cgi?id=192832
>+
>+        Reviewed by Saam Barati.
>+
>+        * parser/Parser.cpp:
>+        (JSC::Parser<LexerType>::parseBinaryExpression):
>+        Make corrections to error message: "amiguous" -> "ambiguous", "parenthesis" -> "parentheses"
>+
> 2018-12-18  Saam Barati  <sbarati@apple.com>
> 
>         Update ARM64EHash
>diff --git a/Source/JavaScriptCore/parser/Parser.cpp b/Source/JavaScriptCore/parser/Parser.cpp
>index 6faedb5bad8dc1c346366f5fe01a46118b168b5c..83388b3400403a1bf8df50c555416b6be02e0d71 100644
>--- a/Source/JavaScriptCore/parser/Parser.cpp
>+++ b/Source/JavaScriptCore/parser/Parser.cpp
>@@ -3886,7 +3886,7 @@ template <class TreeBuilder> TreeExpression Parser<LexerType>::parseBinaryExpres
>         //          Check this.
>         // If the binary operator <> has higher precedence than one of "**", this check does not work.
>         // But it's OK for ** because the operator "**" has the highest operator precedence in the binary operators.
>-        failIfTrue(match(POW) && isUnaryOpExcludingUpdateOp(leadingTokenTypeForUnaryExpression), "Amiguous unary expression in the left hand side of the exponentiation expression; parenthesis must be used to disambiguate the expression");
>+        failIfTrue(match(POW) && isUnaryOpExcludingUpdateOp(leadingTokenTypeForUnaryExpression), "Ambiguous unary expression in the left hand side of the exponentiation expression; parentheses must be used to disambiguate the expression");
> 
>         int precedence = isBinaryOperator(m_token.m_type);
>         if (!precedence)
>diff --git a/JSTests/ChakraCore/test/UnitTestFramework/UnitTestFramework.js b/JSTests/ChakraCore/test/UnitTestFramework/UnitTestFramework.js
>index ca645e77e627d61a0e66f8f66144a22c59eafd83..61bfc24cdcf99a2612711aa86f8b8ce6cf8d94dc 100644
>--- a/JSTests/ChakraCore/test/UnitTestFramework/UnitTestFramework.js
>+++ b/JSTests/ChakraCore/test/UnitTestFramework/UnitTestFramework.js
>@@ -366,7 +366,7 @@ var assert = function assert() {
>                 },
>                 {
>                     regexp: /Invalid unary operator on the left hand side of exponentiation $\*\*$ operator/,
>-                    replStr: "Unexpected token '**'. Amiguous unary expression in the left hand side of the exponentiation expression; parenthesis must be used to disambiguate the expression."
>+                    replStr: "Unexpected token '**'. Ambiguous unary expression in the left hand side of the exponentiation expression; parentheses must be used to disambiguate the expression."
>                 },
>                 {
>                     regexp: /Assignment to read-only properties is not allowed in strict mode/,
>diff --git a/JSTests/ChangeLog b/JSTests/ChangeLog
>index 4bf3c583299df436f668acefee85805180810908..dbd5b3c9aa08d93ba5f21dfcc232013e8b813ae2 100644
>--- a/JSTests/ChangeLog
>+++ b/JSTests/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-12-18  Ross Kirsling  <ross.kirsling@sony.com>
>+
>+        Error message for `-x ** y` contains a typo.
>+        https://bugs.webkit.org/show_bug.cgi?id=192832
>+
>+        Reviewed by Saam Barati.
>+
>+        * ChakraCore/test/UnitTestFramework/UnitTestFramework.js:
>+        (assert.assert.return.throws):
>+        * stress/pow-expects-update-expression-on-lhs.js:
>+        (throw.new.Error):
>+        Update test expectations which match against the exact error message.
>+
> 2018-12-18  Mark Lam  <mark.lam@apple.com>
> 
>         Gardening: test options fix.
>diff --git a/JSTests/stress/pow-expects-update-expression-on-lhs.js b/JSTests/stress/pow-expects-update-expression-on-lhs.js
>index cd4cd2eb41d946ae96c3312eaa38ba33a71cec80..c255259f3fa7e9f51dce844b6165507fa41f6854 100644
>--- a/JSTests/stress/pow-expects-update-expression-on-lhs.js
>+++ b/JSTests/stress/pow-expects-update-expression-on-lhs.js
>@@ -38,7 +38,7 @@ function testSyntaxError(script, message) {
>         {
>             return ${token} a ** b;
>         }
>-        `, `SyntaxError: Unexpected token '**'. Amiguous unary expression in the left hand side of the exponentiation expression; parenthesis must be used to disambiguate the expression.`);
>+        `, `SyntaxError: Unexpected token '**'. Ambiguous unary expression in the left hand side of the exponentiation expression; parentheses must be used to disambiguate the expression.`);
>     }
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 192832: 357623 | 357654