Attachment 251059 Details for Bug 140855 – Patch.1(Init)

[patch] Patch.1(Init)

bug-140855-20150418014944.patch (text/plain), 4.58 KB, created by GSkachkov on 2015-04-17 15:50:45 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: GSkachkov

Created: 2015-04-17 15:50:45 PDT

Size: 4.58 KB

patch

obsolete

>Subversion Revision: 182967
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index d92cea2cc7c1fb438d3c49aebed15260969131b5..de051fd101f9d0c3fede942f87b16244ee0541c6 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,11 @@
>+2015-04-12  Alexandr Skachkov  <gskachkov@gmail.com>
>+        Small refactoring of the parcer.cpp file. It is necessary to increase readability of the patch
>+        with ES6 Arrow function implementation
>+        https://bugs.webkit.org/show_bug.cgi?id=140855
>+
>+        * parser/Parser.h:
>+        * parser/Parser.cpp:
>+
> 2015-04-17  Yusuke Suzuki  <utatane.tea@gmail.com>
> 
>         [ES6] Fix name enumeration of static functions for Symbol constructor
>diff --git a/Source/JavaScriptCore/parser/Parser.cpp b/Source/JavaScriptCore/parser/Parser.cpp
>index 32d250ca7cc53f4bea61f61b6dabfe64bcbc6846..647820ad83df443d30d04cfae2254faec9707ab5 100644
>--- a/Source/JavaScriptCore/parser/Parser.cpp
>+++ b/Source/JavaScriptCore/parser/Parser.cpp
>@@ -1297,15 +1297,8 @@ static const char* stringForFunctionMode(FunctionParseMode mode)
>     return nullptr;
> }
> 
>-template <typename LexerType>
>-template <class TreeBuilder> bool Parser<LexerType>::parseFunctionInfo(TreeBuilder& context, FunctionRequirements requirements, FunctionParseMode mode,
>-    bool nameIsInContainingScope, ConstructorKind ownerClassKind, int functionKeywordStart, ParserFunctionInfo<TreeBuilder>& info)
>+template <typename LexerType> template <class TreeBuilder> int Parser<LexerType>::parseFunctionParamters(TreeBuilder& context, FunctionRequirements requirements, FunctionParseMode mode, bool nameIsInContainingScope, AutoPopScopeRef& functionScope, ParserFunctionInfo<TreeBuilder>& info)
> {
>-    AutoPopScopeRef functionScope(this, pushScope());
>-    functionScope->setIsFunction();
>-    int functionNameStart = m_token.m_location.startOffset;
>-    const Identifier* lastFunctionName = m_lastFunctionName;
>-    m_lastFunctionName = nullptr;
>     if (match(IDENT)) {
>         info.name = m_token.m_data.ident;
>         m_lastFunctionName = info.name;
>@@ -1324,7 +1317,7 @@ template <class TreeBuilder> bool Parser<LexerType>::parseFunctionInfo(TreeBuild
>         semanticFailureDueToKeyword(stringForFunctionMode(mode), " name");
>         failWithMessage("Expected an opening '(' before a ", stringForFunctionMode(mode), "'s parameter list");
>     }
>-
>+    
>     if (mode == GetterMode)
>         consumeOrFail(CLOSEPAREN, "getter functions must have no parameters");
>     else if (mode == SetterMode) {
>@@ -1341,6 +1334,21 @@ template <class TreeBuilder> bool Parser<LexerType>::parseFunctionInfo(TreeBuild
>         }
>         consumeOrFail(CLOSEPAREN, "Expected a ')' or a ',' after a parameter declaration");
>     }
>+    
>+    return parametersStart;
>+}
>+    
>+template <typename LexerType>
>+template <class TreeBuilder> bool Parser<LexerType>::parseFunctionInfo(TreeBuilder& context, FunctionRequirements requirements, FunctionParseMode mode,
>+    bool nameIsInContainingScope, ConstructorKind ownerClassKind, int functionKeywordStart, ParserFunctionInfo<TreeBuilder>& info)
>+{
>+    AutoPopScopeRef functionScope(this, pushScope());
>+    functionScope->setIsFunction();
>+    int functionNameStart = m_token.m_location.startOffset;
>+    const Identifier* lastFunctionName = m_lastFunctionName;
>+    m_lastFunctionName = nullptr;
>+    
>+    int parametersStart = parseFunctionParamters(context, requirements, mode, nameIsInContainingScope, functionScope, info);
> 
>     matchOrFail(OPENBRACE, "Expected an opening '{' at the start of a ", stringForFunctionMode(mode), " body");
> 
>diff --git a/Source/JavaScriptCore/parser/Parser.h b/Source/JavaScriptCore/parser/Parser.h
>index 0f2728f8621f8010c410bf7987619bf23e50af8b..78baffa0e1773c820698b9203f0f6a3d7ad32ec4 100644
>--- a/Source/JavaScriptCore/parser/Parser.h
>+++ b/Source/JavaScriptCore/parser/Parser.h
>@@ -773,6 +773,8 @@ private:
>     template <class TreeBuilder> NEVER_INLINE TreeDeconstructionPattern tryParseDeconstructionPatternExpression(TreeBuilder&);
> 
>     template <class TreeBuilder> NEVER_INLINE bool parseFunctionInfo(TreeBuilder&, FunctionRequirements, FunctionParseMode, bool nameIsInContainingScope, ConstructorKind, int functionKeywordStart, ParserFunctionInfo<TreeBuilder>&);
>+    
>+    template <class TreeBuilder> NEVER_INLINE int parseFunctionParamters(TreeBuilder&, FunctionRequirements, FunctionParseMode, bool, AutoPopScopeRef&, ParserFunctionInfo<TreeBuilder>&);
> #if ENABLE(ES6_CLASS_SYNTAX)
>     template <class TreeBuilder> NEVER_INLINE TreeClassExpression parseClass(TreeBuilder&, FunctionRequirements, ParserClassInfo<TreeBuilder>&);
> #endif

Actions: View | Formatted Diff | Diff

Attachments on bug 140855: 247543 | 247579 | 247598 | 247599 | 247600 | 247601 | 247886 | 247894 | 247906 | 247909 | 247934 | 248363 | 248414 | 249479 | 249529 | 249563 | 249565 | 249587 | 249664 | 249862 | 249940 | 249942 | 249946 | 249965 | 249966 | 249967 | 249968 | 250421 | 250425 | 250430 | 250437 | 250438 | 250618 | 250626 | 250628 | 250629 | 250633 | 250643 | 250647 | 250649 | 250651 | 250656 | 250911 | 250912 | 251029 | 251037 | 251050 | 251055 | 251056 | 251057 | 251059 | 251061 | 251063 | 251129 | 252149 | 252164 | 252174 | 252175 | 252184 | 252189 | 252191 | 252199 | 252201 | 252204 | 252205 | 252411 | 252412 | 252416 | 252606 | 252633 | 252637