Changeset 188928 in webkit for trunk/Source/JavaScriptCore/parser/ASTBuilder.h

Timestamp:

Aug 25, 2015, 12:10:29 PM (10 years ago)

Author:

[email protected]

Message:

Function.prototype.toString is incorrect for ArrowFunction
​https://bugs.webkit.org/show_bug.cgi?id=148148

Source/JavaScriptCore:

Patch by Aleksandr Skachkov <​[email protected]> on 2015-08-25
Reviewed by Saam Barati.

Added correct support of toString() method for arrow function.

• parser/ASTBuilder.h:

(JSC::ASTBuilder::createFunctionMetadata):
(JSC::ASTBuilder::createArrowFunctionExpr):

• parser/Nodes.cpp:

(JSC::FunctionMetadataNode::FunctionMetadataNode):

• parser/Nodes.h:
• parser/Parser.cpp:

(JSC::Parser<LexerType>::parseFunctionBody):
(JSC::Parser<LexerType>::parseFunctionInfo):

• parser/SyntaxChecker.h:

(JSC::SyntaxChecker::createFunctionMetadata):

• runtime/FunctionPrototype.cpp:

(JSC::functionProtoFuncToString):

• tests/stress/arrowfunction-tostring.js: Added.

LayoutTests:

Patch by Skachkov Oleksandr <​[email protected]> on 2015-08-25
Reviewed by Saam Barati.

Added test of toString() method.

• js/arrowfunction-tostring-expected.txt: Added.
• js/arrowfunction-tostring.html: Added.
• js/script-tests/arrowfunction-tostring.js: Added.

File:

• trunk/Source/JavaScriptCore/parser/ASTBuilder.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/parser/ASTBuilder.h

@@ -362 +362 @@
         unsigned startColumn, unsigned endColumn, int functionKeywordStart, 
         int functionNameStart, int parametersStart, bool inStrictContext, 
-        ConstructorKind constructorKind, unsigned parameterCount, SourceParseMode mode, bool isArrowFunction)
+        ConstructorKind constructorKind, unsigned parameterCount, SourceParseMode mode, bool isArrowFunction, bool isArrowFunctionBodyExpression)
     {
         return new (m_parserArena) FunctionMetadataNode(
             m_parserArena, startLocation, endLocation, startColumn, endColumn, 
             functionKeywordStart, functionNameStart, parametersStart, 
-            inStrictContext, constructorKind, parameterCount, mode, isArrowFunction);
+            inStrictContext, constructorKind, parameterCount, mode, isArrowFunction, isArrowFunctionBodyExpression);
     }
 
@@ -373 +373 @@
     {
         usesThis();
-        SourceCode source = m_sourceCode->subExpression(functionInfo.startOffset, functionInfo.endOffset, functionInfo.startLine, functionInfo.bodyStartColumn);
+        SourceCode source = m_sourceCode->subExpression(functionInfo.startOffset, functionInfo.body->isArrowFunctionBodyExpression() ? functionInfo.endOffset - 1 : functionInfo.endOffset, functionInfo.startLine, functionInfo.bodyStartColumn);
         ArrowFuncExprNode* result = new (m_parserArena) ArrowFuncExprNode(location, *functionInfo.name, functionInfo.body, source);
         functionInfo.body->setLoc(functionInfo.startLine, functionInfo.endLine, location.startOffset, location.lineStartOffset);