WebKit Bugzilla
Attachment 338888 Details for
Bug 185030
: Token misspelled "tocken" in error message string
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Fix typo "tocken" => "token" in SyntaxError message string
0001-Fix-typo-tocken-token-in-SyntaxError-message-string.patch (text/plain), 36.05 KB, created by
Rick Waldron
on 2018-04-26 10:19:16 PDT
(
hide
)
Description:
Fix typo "tocken" => "token" in SyntaxError message string
Filename:
MIME Type:
Creator:
Rick Waldron
Created:
2018-04-26 10:19:16 PDT
Size:
36.05 KB
patch
obsolete
>From ed22842c68238306e6789bfe46f53ab85153a4e0 Mon Sep 17 00:00:00 2001 >From: Rick Waldron <waldron.rick@gmail.com> >Date: Thu, 26 Apr 2018 13:16:21 -0400 >Subject: [PATCH] Fix typo "tocken" => "token" in SyntaxError message string > >--- > .../test/Basics/IdsWithEscapes.baseline-jsc | 16 +-- > JSTests/ChangeLog | 15 +++ > JSTests/stress/destructuring-assignment-syntax.js | 10 +- > ...or-messages-for-in-operator-should-not-crash.js | 4 +- > JSTests/stress/reserved-word-with-escape.js | 124 ++++++++++----------- > Source/JavaScriptCore/ChangeLog | 46 ++++++++ > Source/JavaScriptCore/parser/Parser.cpp | 2 +- > Tools/ChangeLog | 9 ++ > Tools/Scripts/test262/test262-expectations.yaml | 8 +- > 9 files changed, 152 insertions(+), 82 deletions(-) > >diff --git a/JSTests/ChakraCore/test/Basics/IdsWithEscapes.baseline-jsc b/JSTests/ChakraCore/test/Basics/IdsWithEscapes.baseline-jsc >index 18d60c5dab..9f5b948975 100644 >--- a/JSTests/ChakraCore/test/Basics/IdsWithEscapes.baseline-jsc >+++ b/JSTests/ChakraCore/test/Basics/IdsWithEscapes.baseline-jsc >@@ -3,20 +3,20 @@ > 20 > 20 > ReferenceError: Can't find variable: hello2 >-SyntaxError: Unexpected escaped characters in keyword tocken: 'fals\u0065' >-SyntaxError: Unexpected escaped characters in keyword tocken: 'fals\u0065' >-SyntaxError: Unexpected escaped characters in keyword tocken: 'tru\u0065' >+SyntaxError: Unexpected escaped characters in keyword token: 'fals\u0065' >+SyntaxError: Unexpected escaped characters in keyword token: 'fals\u0065' >+SyntaxError: Unexpected escaped characters in keyword token: 'tru\u0065' > SyntaxError: Unexpected keyword 'var' >-SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r' >+SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r' > SyntaxError: Unexpected keyword 'else' >-SyntaxError: Unexpected escaped characters in keyword tocken: 'els\u0065' >+SyntaxError: Unexpected escaped characters in keyword token: 'els\u0065' > SyntaxError: Cannot use the keyword 'false' as a variable name. > SyntaxError: Cannot use the keyword 'var' as a variable name. >-SyntaxError: Unexpected escaped characters in keyword tocken: 'fals\u0065' >-SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r' >+SyntaxError: Unexpected escaped characters in keyword token: 'fals\u0065' >+SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r' > 10 > 10 > 10 > 10 > SyntaxError: Cannot use the keyword 'else' as a function name. >-SyntaxError: Unexpected escaped characters in keyword tocken: 'els\u0065' >+SyntaxError: Unexpected escaped characters in keyword token: 'els\u0065' >diff --git a/JSTests/ChangeLog b/JSTests/ChangeLog >index 461f6d606c..e00f902c5c 100644 >--- a/JSTests/ChangeLog >+++ b/JSTests/ChangeLog >@@ -1,3 +1,18 @@ >+2018-04-26 Rick Waldron <waldron.rick@gmail.com> >+ >+ Token misspelled "tocken" in error message string >+ https://bugs.webkit.org/show_bug.cgi?id=185030 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * ChakraCore/test/Basics/IdsWithEscapes.baseline-jsc: Fix typo "tocken" => "token" >+ * stress/destructuring-assignment-syntax.js: Fix typo "tocken" => "token" >+ * stress/error-messages-for-in-operator-should-not-crash.js: Fix typo "tocken" => "token" >+ * stress/reserved-word-with-escape.js: Fix typo "tocken" => "token" >+ (testSyntaxError.String.raw.v): >+ (String.raw.SyntaxError.Cannot.use.the.keyword.string_appeared_here.as.a.name): >+ (testSyntaxError.String.raw.a): >+ > 2018-04-25 Robin Morisset <rmorisset@apple.com> > > In FTLLowerDFGToB3.cpp::compileCreateRest, always use a contiguous array as the indexing type when under isWatchingHavingABadTimeWatchpoint >diff --git a/JSTests/stress/destructuring-assignment-syntax.js b/JSTests/stress/destructuring-assignment-syntax.js >index 5808fd24d4..4567da25e2 100644 >--- a/JSTests/stress/destructuring-assignment-syntax.js >+++ b/JSTests/stress/destructuring-assignment-syntax.js >@@ -47,16 +47,16 @@ testSyntax("[{prop: 1}.prop] = []"); > testSyntaxError("[...c = 1] = []", "SyntaxError: Unexpected token '='. Expected a closing ']' following a rest element destructuring pattern."); > testSyntaxError("[...c, d] = []", "SyntaxError: Unexpected token ','. Expected a closing ']' following a rest element destructuring pattern."); > testSyntaxError("[this] = []", "SyntaxError: Invalid destructuring assignment target."); >-testSyntaxError("[th\\u{69}s] = []", "SyntaxError: Unexpected escaped characters in keyword tocken: 'th\\u{69}s'"); >+testSyntaxError("[th\\u{69}s] = []", "SyntaxError: Unexpected escaped characters in keyword token: 'th\\u{69}s'"); > testSyntaxError("[function() {}] = []", "SyntaxError: Invalid destructuring assignment target."); > testSyntaxError("['string'] = []", "SyntaxError: Invalid destructuring assignment target."); > testSyntaxError("[123] = []", "SyntaxError: Invalid destructuring assignment target."); > testSyntaxError("[true] = []", "SyntaxError: Invalid destructuring assignment target."); >-testSyntaxError("[tru\\u0065] = []", "SyntaxError: Unexpected escaped characters in keyword tocken: 'tru\\u0065'"); >+testSyntaxError("[tru\\u0065] = []", "SyntaxError: Unexpected escaped characters in keyword token: 'tru\\u0065'"); > testSyntaxError("[false] = []", "SyntaxError: Invalid destructuring assignment target."); >-testSyntaxError("[f\\u0061lse] = []", "SyntaxError: Unexpected escaped characters in keyword tocken: 'f\\u0061lse'"); >+testSyntaxError("[f\\u0061lse] = []", "SyntaxError: Unexpected escaped characters in keyword token: 'f\\u0061lse'"); > testSyntaxError("[null] = []", "SyntaxError: Invalid destructuring assignment target."); >-testSyntaxError("[n\\u{75}ll] = []", "SyntaxError: Unexpected escaped characters in keyword tocken: 'n\\u{75}ll'"); >+testSyntaxError("[n\\u{75}ll] = []", "SyntaxError: Unexpected escaped characters in keyword token: 'n\\u{75}ll'"); > > testSyntaxError("'use strict'; ({ eval } = {})", "SyntaxError: Cannot modify 'eval' in strict mode."); > testSyntaxError("'use strict'; ({ eval = 0 } = {})", "SyntaxError: Cannot modify 'eval' in strict mode."); >@@ -69,4 +69,4 @@ testSyntaxError("'use strict'; ({ a: arguments = 0 } = {})", "SyntaxError: Canno > testSyntaxError("'use strict'; ([ eval ] = [])", "SyntaxError: Cannot modify 'eval' in strict mode."); > testSyntaxError("'use strict'; ([ eval = 0 ] = [])", "SyntaxError: Cannot modify 'eval' in strict mode."); > testSyntaxError("'use strict'; ([ arguments ] = [])", "SyntaxError: Cannot modify 'arguments' in strict mode."); >-testSyntaxError("'use strict'; ([ arguments = 0 ] = [])", "SyntaxError: Cannot modify 'arguments' in strict mode."); >\ No newline at end of file >+testSyntaxError("'use strict'; ([ arguments = 0 ] = [])", "SyntaxError: Cannot modify 'arguments' in strict mode."); >diff --git a/JSTests/stress/error-messages-for-in-operator-should-not-crash.js b/JSTests/stress/error-messages-for-in-operator-should-not-crash.js >index b54580cc28..424e6c5fcb 100644 >--- a/JSTests/stress/error-messages-for-in-operator-should-not-crash.js >+++ b/JSTests/stress/error-messages-for-in-operator-should-not-crash.js >@@ -5,7 +5,7 @@ try { > error = e; > } > >-if (!error || error.message !== "Unexpected escaped characters in keyword tocken: 'i\\u{006E}'") >+if (!error || error.message !== "Unexpected escaped characters in keyword token: 'i\\u{006E}'") > throw new Error("Bad"); > > error = null; >@@ -15,7 +15,7 @@ try { > error = e; > } > >-if (!error || error.message !== "Unexpected escaped characters in keyword tocken: 'i\\u006E'") >+if (!error || error.message !== "Unexpected escaped characters in keyword token: 'i\\u006E'") > throw new Error("Bad"); > > // This test should not crash. >diff --git a/JSTests/stress/reserved-word-with-escape.js b/JSTests/stress/reserved-word-with-escape.js >index 0f688e078d..d6db09ac21 100644 >--- a/JSTests/stress/reserved-word-with-escape.js >+++ b/JSTests/stress/reserved-word-with-escape.js >@@ -25,122 +25,122 @@ testSyntax("var cocoa"); > testSyntax("var c\u006fcoa"); > > testSyntaxError(String.raw`var var`, String.raw`SyntaxError: Cannot use the keyword 'var' as a variable name.`); >-testSyntaxError(String.raw`var v\u0061r`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`var v\u{0061}r`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`var v\u0061r`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`var v\u{0061}r`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`var var = 2000000;`, String.raw`SyntaxError: Cannot use the keyword 'var' as a variable name.`); >-testSyntaxError(String.raw`var v\u0061r = 2000000;`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`var v\u{0061}r = 2000000`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`var v\u0061r = 2000000;`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`var v\u{0061}r = 2000000`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`var {var} = obj)`, String.raw`SyntaxError: Cannot use abbreviated destructuring syntax for keyword 'var'.`); >-testSyntaxError(String.raw`var {v\u0061r} = obj`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`var {v\u{0061}r} = obj`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`var {v\u0061r} = obj`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`var {v\u{0061}r} = obj`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`var {var:var} = obj)`, String.raw`SyntaxError: Cannot use the keyword 'var' as a variable name.`); >-testSyntaxError(String.raw`var {var:v\u0061r} = obj`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`var {var:v\u{0061}r} = obj`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`var {var:v\u0061r} = obj`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`var {var:v\u{0061}r} = obj`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`var [var] = obj`, String.raw`SyntaxError: Cannot use the keyword 'var' as a variable name.`); >-testSyntaxError(String.raw`var [v\u0061r] = obj`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`var [v\u{0061}r] = obj`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`var [v\u0061r] = obj`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`var [v\u{0061}r] = obj`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`[var] = obj`, String.raw`SyntaxError: Unexpected keyword 'var'`); >-testSyntaxError(String.raw`[v\u0061r] = obj`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`[v\u{0061}r] = obj`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`[v\u0061r] = obj`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`[v\u{0061}r] = obj`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`function var() { }`, String.raw`SyntaxError: Cannot use the keyword 'var' as a function name.`); >-testSyntaxError(String.raw`function v\u0061r() { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`function v\u{0061}r() { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`function v\u0061r() { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`function v\u{0061}r() { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`function a(var) { }`, String.raw`SyntaxError: Cannot use the keyword 'var' as a parameter name.`); >-testSyntaxError(String.raw`function a(v\u0061r) { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`function a(v\u{0061}r) { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`function a(v\u0061r) { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`function a(v\u{0061}r) { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`function a({var}) { }`, String.raw`SyntaxError: Cannot use abbreviated destructuring syntax for keyword 'var'.`); >-testSyntaxError(String.raw`function a({v\u0061r}) { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`function a({v\u{0061}r}) { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`function a({v\u0061r}) { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`function a({v\u{0061}r}) { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`function a({var:var}) { }`, String.raw`SyntaxError: Cannot use the keyword 'var' as a parameter name.`); >-testSyntaxError(String.raw`function a({var:v\u0061r}) { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`function a({var:v\u{0061}r}) { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`function a({var:v\u0061r}) { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`function a({var:v\u{0061}r}) { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`function a([var]) { }`, String.raw`SyntaxError: Cannot use the keyword 'var' as a parameter name.`); >-testSyntaxError(String.raw`function a([v\u0061r]) { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`function a([v\u{0061}r]) { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`function a([v\u0061r]) { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`function a([v\u{0061}r]) { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`(function var() { })`, String.raw`SyntaxError: Cannot use the keyword 'var' as a function name.`); >-testSyntaxError(String.raw`(function v\u0061r() { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`(function v\u{0061}r() { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`(function v\u0061r() { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`(function v\u{0061}r() { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`(function a(var) { })`, String.raw`SyntaxError: Cannot use the keyword 'var' as a parameter name.`); >-testSyntaxError(String.raw`(function a(v\u0061r) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`(function a(v\u{0061}r) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`(function a(v\u0061r) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`(function a(v\u{0061}r) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`(function a({var}) { })`, String.raw`SyntaxError: Cannot use abbreviated destructuring syntax for keyword 'var'.`); >-testSyntaxError(String.raw`(function a({v\u0061r}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`(function a({v\u{0061}r}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`(function a({v\u0061r}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`(function a({v\u{0061}r}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`(function a({var:var}) { })`, String.raw`SyntaxError: Cannot use the keyword 'var' as a parameter name.`); >-testSyntaxError(String.raw`(function a({var:v\u0061r}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`(function a({var:v\u{0061}r}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`(function a({var:v\u0061r}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`(function a({var:v\u{0061}r}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`(function a([var]) { })`, String.raw`SyntaxError: Cannot use the keyword 'var' as a parameter name.`); >-testSyntaxError(String.raw`(function a([v\u0061r]) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`(function a([v\u{0061}r]) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`(function a([v\u0061r]) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`(function a([v\u{0061}r]) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`(function a([{var}]) { })`, String.raw`SyntaxError: Cannot use abbreviated destructuring syntax for keyword 'var'.`); >-testSyntaxError(String.raw`(function a([{v\u0061r}]) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`(function a([{v\u{0061}r}]) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`(function a([{v\u0061r}]) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`(function a([{v\u{0061}r}]) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`(function a([{var:var}]) { })`, String.raw`SyntaxError: Cannot use the keyword 'var' as a parameter name.`); >-testSyntaxError(String.raw`(function a([{var:v\u0061r}]) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`(function a([{var:v\u{0061}r}]) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`(function a([{var:v\u0061r}]) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`(function a([{var:v\u{0061}r}]) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`(function a([[var]]) { })`, String.raw`SyntaxError: Cannot use the keyword 'var' as a parameter name.`); >-testSyntaxError(String.raw`(function a([[v\u0061r]]) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`(function a([[v\u{0061}r]]) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`(function a([[v\u0061r]]) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`(function a([[v\u{0061}r]]) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`(function a({ hello: {var}}) { })`, String.raw`SyntaxError: Cannot use abbreviated destructuring syntax for keyword 'var'.`); >-testSyntaxError(String.raw`(function a({ hello: {v\u0061r}}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`(function a({ hello: {v\u{0061}r}}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`(function a({ hello: {v\u0061r}}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`(function a({ hello: {v\u{0061}r}}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`(function a({ hello: {var:var}}) { })`, String.raw`SyntaxError: Cannot use the keyword 'var' as a parameter name.`); >-testSyntaxError(String.raw`(function a({ hello: {var:v\u0061r}}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`(function a({ hello: {var:v\u{0061}r}}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`(function a({ hello: {var:v\u0061r}}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`(function a({ hello: {var:v\u{0061}r}}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`(function a({ hello: [var]}) { })`, String.raw`SyntaxError: Cannot use the keyword 'var' as a parameter name.`); >-testSyntaxError(String.raw`(function a({ hello: [v\u0061r]}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`(function a({ hello: [v\u{0061}r]}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`(function a({ hello: [v\u0061r]}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`(function a({ hello: [v\u{0061}r]}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`(function a({ 0: {var} }) { })`, String.raw`SyntaxError: Cannot use abbreviated destructuring syntax for keyword 'var'.`); >-testSyntaxError(String.raw`(function a({ 0: {v\u0061r}}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`(function a({ 0: {v\u{0061}r}}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`(function a({ 0: {v\u0061r}}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`(function a({ 0: {v\u{0061}r}}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`(function a({ 0: {var:var}}) { })`, String.raw`SyntaxError: Cannot use the keyword 'var' as a parameter name.`); >-testSyntaxError(String.raw`(function a({ 0: {var:v\u0061r}}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`(function a({ 0: {var:v\u{0061}r}}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`(function a({ 0: {var:v\u0061r}}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`(function a({ 0: {var:v\u{0061}r}}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`(function a({ 0: {value:var}}) { })`, String.raw`SyntaxError: Cannot use the keyword 'var' as a parameter name.`); >-testSyntaxError(String.raw`(function a({ 0: {value:v\u0061r}}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`(function a({ 0: {value:v\u{0061}r}}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`(function a({ 0: {value:v\u0061r}}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`(function a({ 0: {value:v\u{0061}r}}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`(function a({ 0: [var]}) { })`, String.raw`SyntaxError: Cannot use the keyword 'var' as a parameter name.`); >-testSyntaxError(String.raw`(function a({ 0: [v\u0061r]}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`(function a({ 0: [v\u{0061}r]}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`(function a({ 0: [v\u0061r]}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`(function a({ 0: [v\u{0061}r]}) { })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`try { } catch(var) { }`, String.raw`SyntaxError: Cannot use the keyword 'var' as a catch parameter name.`); >-testSyntaxError(String.raw`try { } catch(v\u0061r) { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`try { } catch(v\u{0061}r) { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`try { } catch(v\u0061r) { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`try { } catch(v\u{0061}r) { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > > testSyntaxError(String.raw`class var { }`, String.raw`SyntaxError: Cannot use the keyword 'var' as a class name.`); >-testSyntaxError(String.raw`class v\u0061r { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`class v\u{0061}r { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`class v\u0061r { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`class v\u{0061}r { }`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > >-testSyntaxError(String.raw`({ v\u0061r: 'Cocoa' })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u0061r'`); >-testSyntaxError(String.raw`({ v\u{0061}r: 'Cocoa' })`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'v\u{0061}r'`); >+testSyntaxError(String.raw`({ v\u0061r: 'Cocoa' })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u0061r'`); >+testSyntaxError(String.raw`({ v\u{0061}r: 'Cocoa' })`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'v\u{0061}r'`); > >-testSyntaxError(String.raw`{for(o i\u006E {}){}}`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'i\u006E'`); >-testSyntaxError(String.raw`{for(o i\u{006E} {}){}}`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'i\u{006E}'`); >+testSyntaxError(String.raw`{for(o i\u006E {}){}}`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'i\u006E'`); >+testSyntaxError(String.raw`{for(o i\u{006E} {}){}}`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'i\u{006E}'`); > > > testSyntaxError(String.raw`implements`, String.raw`ReferenceError: Can't find variable: implements`); >@@ -148,5 +148,5 @@ testSyntaxError(String.raw`impleme\u006Ets`, String.raw`ReferenceError: Can't fi > testSyntaxError(String.raw`impleme\u{006E}ts`, String.raw`ReferenceError: Can't find variable: implements`); > > testSyntaxError(String.raw`'use strict'; implements`, String.raw`SyntaxError: Unexpected use of reserved word 'implements' in strict mode`); >-testSyntaxError(String.raw`'use strict'; impleme\u006Ets`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'impleme\u006Ets'`); >-testSyntaxError(String.raw`'use strict'; impleme\u{006E}ts`, String.raw`SyntaxError: Unexpected escaped characters in keyword tocken: 'impleme\u{006E}ts'`); >+testSyntaxError(String.raw`'use strict'; impleme\u006Ets`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'impleme\u006Ets'`); >+testSyntaxError(String.raw`'use strict'; impleme\u{006E}ts`, String.raw`SyntaxError: Unexpected escaped characters in keyword token: 'impleme\u{006E}ts'`); >diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog >index 7582352686..6cd4179ba8 100644 >--- a/Source/JavaScriptCore/ChangeLog >+++ b/Source/JavaScriptCore/ChangeLog >@@ -1,3 +1,49 @@ >+2018-04-26 Rick Waldron <waldron.rick@gmail.com> >+ >+ Token misspelled "tocken" in error message string >+ https://bugs.webkit.org/show_bug.cgi?id=185030 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * parser/Parser.cpp: Fix typo "tocken" => "token" in SyntaxError message string >+ (JSC::Parser<LexerType>::Parser): >+ (JSC::Parser<LexerType>::didFinishParsing): >+ (JSC::Parser<LexerType>::parseSourceElements): >+ (JSC::Parser<LexerType>::parseAsyncGeneratorFunctionSourceElements): >+ (JSC::Parser<LexerType>::parseVariableDeclaration): >+ (JSC::Parser<LexerType>::parseWhileStatement): >+ (JSC::Parser<LexerType>::parseVariableDeclarationList): >+ (JSC::Parser<LexerType>::createBindingPattern): >+ (JSC::Parser<LexerType>::parseArrowFunctionSingleExpressionBodySourceElements): >+ (JSC::Parser<LexerType>::parseObjectRestElement): >+ (JSC::Parser<LexerType>::parseDestructuringPattern): >+ (JSC::Parser<LexerType>::parseForStatement): >+ (JSC::Parser<LexerType>::parseBreakStatement): >+ (JSC::Parser<LexerType>::parseContinueStatement): >+ (JSC::Parser<LexerType>::parseThrowStatement): >+ (JSC::Parser<LexerType>::parseWithStatement): >+ (JSC::Parser<LexerType>::parseSwitchStatement): >+ (JSC::Parser<LexerType>::parseSwitchClauses): >+ (JSC::Parser<LexerType>::parseTryStatement): >+ (JSC::Parser<LexerType>::parseBlockStatement): >+ (JSC::Parser<LexerType>::parseFormalParameters): >+ (JSC::Parser<LexerType>::parseFunctionParameters): >+ (JSC::Parser<LexerType>::parseFunctionInfo): >+ (JSC::Parser<LexerType>::parseExpressionOrLabelStatement): >+ (JSC::Parser<LexerType>::parseExpressionStatement): >+ (JSC::Parser<LexerType>::parseIfStatement): >+ (JSC::Parser<LexerType>::parseAssignmentExpression): >+ (JSC::Parser<LexerType>::parseConditionalExpression): >+ (JSC::Parser<LexerType>::parseBinaryExpression): >+ (JSC::Parser<LexerType>::parseObjectLiteral): >+ (JSC::Parser<LexerType>::parseStrictObjectLiteral): >+ (JSC::Parser<LexerType>::parseArrayLiteral): >+ (JSC::Parser<LexerType>::parseArguments): >+ (JSC::Parser<LexerType>::parseMemberExpression): >+ (JSC::operatorString): >+ (JSC::Parser<LexerType>::parseUnaryExpression): >+ (JSC::Parser<LexerType>::printUnexpectedTokenText): >+ > 2018-04-26 Dominik Infuehr <dinfuehr@igalia.com> > > [MIPS] Fix branch offsets in branchNeg32 >diff --git a/Source/JavaScriptCore/parser/Parser.cpp b/Source/JavaScriptCore/parser/Parser.cpp >index 6fa3ad1fa7..89053a7200 100644 >--- a/Source/JavaScriptCore/parser/Parser.cpp >+++ b/Source/JavaScriptCore/parser/Parser.cpp >@@ -5043,7 +5043,7 @@ template <typename LexerType> void Parser<LexerType>::printUnexpectedTokenText(W > out.print("Invalid escape in identifier: '", getToken(), "'"); > return; > case UNEXPECTED_ESCAPE_ERRORTOK: >- out.print("Unexpected escaped characters in keyword tocken: '", getToken(), "'"); >+ out.print("Unexpected escaped characters in keyword token: '", getToken(), "'"); > return; > case INVALID_IDENTIFIER_UNICODE_ESCAPE_ERRORTOK: > out.print("Invalid unicode escape in identifier: '", getToken(), "'"); >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index 92e52145c5..cc709f8a2a 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,12 @@ >+2018-04-26 Rick Waldron <waldron.rick@gmail.com> >+ >+ Token misspelled "tocken" in error message string >+ https://bugs.webkit.org/show_bug.cgi?id=185030 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * Scripts/test262/test262-expectations.yaml: Fix typo "tocken" => "token" >+ > 2018-04-25 Michael Catanzaro <mcatanzaro@igalia.com> > > [WPE] Build and link against latest WPEBackend and WPEBackend-fdo >diff --git a/Tools/Scripts/test262/test262-expectations.yaml b/Tools/Scripts/test262/test262-expectations.yaml >index 945cc969f7..1d7bc7b216 100644 >--- a/Tools/Scripts/test262/test262-expectations.yaml >+++ b/Tools/Scripts/test262/test262-expectations.yaml >@@ -4173,10 +4173,10 @@ test/language/statements/labeled/decl-gen.js: > test/language/statements/labeled/let-array-with-newline.js: > default: 'Test262: This statement should not be evaluated.' > test/language/statements/labeled/value-await-non-module-escaped.js: >- default: "SyntaxError: Unexpected escaped characters in keyword tocken: 'aw\\u0061it'" >- strict mode: "SyntaxError: Unexpected escaped characters in keyword tocken: 'aw\\u0061it'" >+ default: "SyntaxError: Unexpected escaped characters in keyword token: 'aw\\u0061it'" >+ strict mode: "SyntaxError: Unexpected escaped characters in keyword token: 'aw\\u0061it'" > test/language/statements/labeled/value-yield-non-strict-escaped.js: >- default: "SyntaxError: Unexpected escaped characters in keyword tocken: 'yi\\u0065ld'" >+ default: "SyntaxError: Unexpected escaped characters in keyword token: 'yi\\u0065ld'" > test/language/statements/labeled/value-yield-non-strict.js: > strict mode: "SyntaxError: Cannot use 'yield' as a label in strict mode." > test/language/statements/labeled/value-yield-strict.js: >@@ -4192,7 +4192,7 @@ test/language/statements/let/syntax/attempt-to-redeclare-let-binding-with-var.js > default: 'Test262: This statement should not be evaluated.' > strict mode: 'Test262: This statement should not be evaluated.' > test/language/statements/let/syntax/escaped-let.js: >- default: "SyntaxError: Unexpected escaped characters in keyword tocken: 'l\\u0065t'" >+ default: "SyntaxError: Unexpected escaped characters in keyword token: 'l\\u0065t'" > test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js: > default: 'Test262: This statement should not be evaluated.' > test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js: >-- >2.15.1 (Apple Git-101) >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=338888">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 185030
:
338885
| 338888