Changeset 181831 in webkit

Timestamp:

Mar 21, 2015, 9:08:23 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Fix a typo in Parser error message
​https://bugs.webkit.org/show_bug.cgi?id=142942

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2015-03-21
Reviewed by Alexey Proskuryakov.

Source/JavaScriptCore:

• jit/JITPropertyAccess.cpp:

(JSC::JIT::emitSlow_op_resolve_scope):

• jit/JITPropertyAccess32_64.cpp:

(JSC::JIT::emitSlow_op_resolve_scope):

• parser/Parser.cpp:

(JSC::Parser<LexerType>::parseClass):
Fix a common identifier typo.

LayoutTests:

• js/class-syntax-declaration-expected.txt:
• js/class-syntax-expression-expected.txt:
• js/class-syntax-super-expected.txt:
• js/script-tests/class-syntax-declaration.js:
• js/script-tests/class-syntax-expression.js:
• js/script-tests/class-syntax-super.js:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/js/class-syntax-declaration-expected.txt (modified) (1 diff)
• LayoutTests/js/class-syntax-expression-expected.txt (modified) (1 diff)
• LayoutTests/js/class-syntax-super-expected.txt (modified) (1 diff)
• LayoutTests/js/script-tests/class-syntax-declaration.js (modified) (1 diff)
• LayoutTests/js/script-tests/class-syntax-expression.js (modified) (1 diff)
• LayoutTests/js/script-tests/class-syntax-super.js (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/jit/JITPropertyAccess.cpp (modified) (1 diff)
• Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp (modified) (1 diff)
• Source/JavaScriptCore/parser/Parser.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-03-21  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Fix a typo in Parser error message
+        https://bugs.webkit.org/show_bug.cgi?id=142942
+
+        Reviewed by Alexey Proskuryakov.
+
+        * js/class-syntax-declaration-expected.txt:
+        * js/class-syntax-expression-expected.txt:
+        * js/class-syntax-super-expected.txt:
+        * js/script-tests/class-syntax-declaration.js:
+        * js/script-tests/class-syntax-expression.js:
+        * js/script-tests/class-syntax-super.js:
+
 2015-03-21  Brent Fulgham  <bfulgham@apple.com>
 

trunk/LayoutTests/js/class-syntax-declaration-expected.txt

@@ -18 +18 @@
 PASS class threw exception SyntaxError: Unexpected end of script.
 PASS class X { threw exception SyntaxError: Unexpected end of script.
-PASS class X { ( } threw exception SyntaxError: Unexpected token '('. Expected an indentifier..
+PASS class X { ( } threw exception SyntaxError: Unexpected token '('. Expected an identifier..
 PASS class X {} did not throw exception.
 PASS class X { constructor() {} constructor() {} } threw exception SyntaxError: Cannot declare multiple constructors in a single class..

trunk/LayoutTests/js/class-syntax-expression-expected.txt

@@ -18 +18 @@
 PASS x = class threw exception SyntaxError: Unexpected end of script.
 PASS x = class { threw exception SyntaxError: Unexpected end of script.
-PASS x = class { ( } threw exception SyntaxError: Unexpected token '('. Expected an indentifier..
+PASS x = class { ( } threw exception SyntaxError: Unexpected token '('. Expected an identifier..
 PASS x = class {} did not throw exception.
 PASS x = class { constructor() {} constructor() {} } threw exception SyntaxError: Cannot declare multiple constructors in a single class..

trunk/LayoutTests/js/class-syntax-super-expected.txt

@@ -14 +14 @@
 PASS Derived.staticMethod() is "base3"
 PASS (new SecondDerived).chainMethod() is ["base", "derived", "secondDerived"]
-PASS x = class extends Base { constructor() { super(); } super() {} } threw exception SyntaxError: Unexpected keyword 'super'. Expected an indentifier..
+PASS x = class extends Base { constructor() { super(); } super() {} } threw exception SyntaxError: Unexpected keyword 'super'. Expected an identifier..
 PASS x = class extends Base { constructor() { super(); } method() { super() } } threw exception SyntaxError: Cannot call super() outside of a class constructor..
 PASS x = class extends Base { constructor() { super(); } method() { super } } threw exception SyntaxError: Cannot reference super..

trunk/LayoutTests/js/script-tests/class-syntax-declaration.js

@@ -30 +30 @@
 shouldThrow("class", "'SyntaxError: Unexpected end of script'");
 shouldThrow("class X {", "'SyntaxError: Unexpected end of script'");
-shouldThrow("class X { ( }", "'SyntaxError: Unexpected token \\'(\\'. Expected an indentifier.'");
+shouldThrow("class X { ( }", "'SyntaxError: Unexpected token \\'(\\'. Expected an identifier.'");
 shouldNotThrow("class X {}");
 shouldThrow("class X { constructor() {} constructor() {} }", "'SyntaxError: Cannot declare multiple constructors in a single class.'");

trunk/LayoutTests/js/script-tests/class-syntax-expression.js

@@ -30 +30 @@
 shouldThrow("x = class", "'SyntaxError: Unexpected end of script'");
 shouldThrow("x = class {", "'SyntaxError: Unexpected end of script'");
-shouldThrow("x = class { ( }", "'SyntaxError: Unexpected token \\'(\\'. Expected an indentifier.'");
+shouldThrow("x = class { ( }", "'SyntaxError: Unexpected token \\'(\\'. Expected an identifier.'");
 shouldNotThrow("x = class {}");
 shouldThrow("x = class { constructor() {} constructor() {} }", "'SyntaxError: Cannot declare multiple constructors in a single class.'");

trunk/LayoutTests/js/script-tests/class-syntax-super.js

@@ -38 +38 @@
 shouldBe('Derived.staticMethod()', '"base3"');
 shouldBe('(new SecondDerived).chainMethod()', '["base", "derived", "secondDerived"]');
-shouldThrow('x = class extends Base { constructor() { super(); } super() {} }', '"SyntaxError: Unexpected keyword \'super\'. Expected an indentifier."');
+shouldThrow('x = class extends Base { constructor() { super(); } super() {} }', '"SyntaxError: Unexpected keyword \'super\'. Expected an identifier."');
 shouldThrow('x = class extends Base { constructor() { super(); } method() { super() } }',
     '"SyntaxError: Cannot call super() outside of a class constructor."');

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-03-21  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Fix a typo in Parser error message
+        https://bugs.webkit.org/show_bug.cgi?id=142942
+
+        Reviewed by Alexey Proskuryakov.
+
+        * jit/JITPropertyAccess.cpp:
+        (JSC::JIT::emitSlow_op_resolve_scope):
+        * jit/JITPropertyAccess32_64.cpp:
+        (JSC::JIT::emitSlow_op_resolve_scope):
+        * parser/Parser.cpp:
+        (JSC::Parser<LexerType>::parseClass):
+        Fix a common identifier typo.
+
 2015-03-21  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp

@@ -638 +638 @@
     linkSlowCase(iter);
     int32_t scope = currentInstruction[2].u.operand;
-    int32_t indentifierIndex = currentInstruction[3].u.operand;
-    callOperation(operationResolveScope, dst, scope, indentifierIndex);
+    int32_t identifierIndex = currentInstruction[3].u.operand;
+    callOperation(operationResolveScope, dst, scope, identifierIndex);
 }
 

trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp

@@ -662 +662 @@
     linkSlowCase(iter);
     int32_t scope = currentInstruction[2].u.operand;
-    int32_t indentifierIndex = currentInstruction[3].u.operand;
-    callOperation(operationResolveScope, dst, scope, indentifierIndex);
+    int32_t identifierIndex = currentInstruction[3].u.operand;
+    callOperation(operationResolveScope, dst, scope, identifierIndex);
 }
 

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -1514 +1514 @@
             next();
 
-        matchOrFail(IDENT, "Expected an indentifier");
+        matchOrFail(IDENT, "Expected an identifier");
 
         const CommonIdentifiers& propertyNames = *m_vm->propertyNames;