Changeset 198349 in webkit

Timestamp:

Mar 17, 2016, 1:38:56 PM (10 years ago)

Author:

mark.lam@apple.com

Message:

Make FunctionMode an enum class.
​https://bugs.webkit.org/show_bug.cgi?id=155587

Reviewed by Saam Barati.

• bytecode/UnlinkedFunctionExecutable.cpp:

(JSC::UnlinkedFunctionExecutable::UnlinkedFunctionExecutable):

• parser/NodeConstructors.h:

(JSC::BaseFuncExprNode::BaseFuncExprNode):
(JSC::FuncExprNode::FuncExprNode):
(JSC::FuncDeclNode::FuncDeclNode):
(JSC::ArrowFuncExprNode::ArrowFuncExprNode):
(JSC::MethodDefinitionNode::MethodDefinitionNode):

• parser/ParserModes.h:

(JSC::functionNameIsInScope):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/UnlinkedFunctionExecutable.cpp (modified) (2 diffs)
• parser/NodeConstructors.h (modified) (2 diffs)
• parser/Nodes.cpp (modified) (2 diffs)
• parser/ParserModes.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-03-17  Mark Lam  <mark.lam@apple.com>
+
+        Make FunctionMode an enum class.
+        https://bugs.webkit.org/show_bug.cgi?id=155587
+
+        Reviewed by Saam Barati.
+
+        * bytecode/UnlinkedFunctionExecutable.cpp:
+        (JSC::UnlinkedFunctionExecutable::UnlinkedFunctionExecutable):
+        * parser/NodeConstructors.h:
+        (JSC::BaseFuncExprNode::BaseFuncExprNode):
+        (JSC::FuncExprNode::FuncExprNode):
+        (JSC::FuncDeclNode::FuncDeclNode):
+        (JSC::ArrowFuncExprNode::ArrowFuncExprNode):
+        (JSC::MethodDefinitionNode::MethodDefinitionNode):
+        * parser/ParserModes.h:
+        (JSC::functionNameIsInScope):
+
 2016-03-17  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.cpp

@@ -98 +98 @@
     , m_constructAbility(static_cast<unsigned>(constructAbility))
     , m_constructorKind(static_cast<unsigned>(node->constructorKind()))
-    , m_functionMode(node->functionMode())
+    , m_functionMode(static_cast<unsigned>(node->functionMode()))
     , m_superBinding(static_cast<unsigned>(node->superBinding()))
     , m_derivedContextType(static_cast<unsigned>(derivedContextType))
@@ -111 +111 @@
     ASSERT(m_constructAbility == static_cast<unsigned>(constructAbility));
     ASSERT(m_constructorKind == static_cast<unsigned>(node->constructorKind()));
-    ASSERT(m_functionMode == node->functionMode());
+    ASSERT(m_functionMode == static_cast<unsigned>(node->functionMode()));
     ASSERT(m_superBinding == static_cast<unsigned>(node->superBinding()));
     ASSERT(m_derivedContextType == static_cast<unsigned>(derivedContextType));

trunk/Source/JavaScriptCore/parser/NodeConstructors.h

@@ -899 +899 @@
 
     inline FuncExprNode::FuncExprNode(const JSTokenLocation& location, const Identifier& ident, FunctionMetadataNode* metadata, const SourceCode& source)
-        : BaseFuncExprNode(location, ident, metadata, source, FunctionExpression)
+        : BaseFuncExprNode(location, ident, metadata, source, FunctionMode::FunctionExpression)
     {
     }
@@ -912 +912 @@
         , m_metadata(metadata)
     {
-        m_metadata->finishParsing(source, ident, FunctionDeclaration);
+        m_metadata->finishParsing(source, ident, FunctionMode::FunctionDeclaration);
     }
 
     inline ArrowFuncExprNode::ArrowFuncExprNode(const JSTokenLocation& location, const Identifier& ident, FunctionMetadataNode* metadata, const SourceCode& source)
-        : BaseFuncExprNode(location, ident, metadata, source, FunctionExpression)
+        : BaseFuncExprNode(location, ident, metadata, source, FunctionMode::FunctionExpression)
     {
     }
 
     inline MethodDefinitionNode::MethodDefinitionNode(const JSTokenLocation& location, const Identifier& ident, FunctionMetadataNode* metadata, const SourceCode& source)
-        : FuncExprNode(location, ident, metadata, source, MethodDefinition)
+        : FuncExprNode(location, ident, metadata, source, FunctionMode::MethodDefinition)
     {
     }

trunk/Source/JavaScriptCore/parser/Nodes.cpp

@@ -167 +167 @@
 }
 
-void FunctionMetadataNode::finishParsing(const SourceCode& source, const Identifier& ident, enum FunctionMode functionMode)
+void FunctionMetadataNode::finishParsing(const SourceCode& source, const Identifier& ident, FunctionMode functionMode)
 {
     m_source = source;
@@ -190 +190 @@
 }
 
-void FunctionNode::finishParsing(const Identifier& ident, enum FunctionMode functionMode)
+void FunctionNode::finishParsing(const Identifier& ident, FunctionMode functionMode)
 {
     ASSERT(!source().isNull());

trunk/Source/JavaScriptCore/parser/ParserModes.h

@@ -43 +43 @@
 enum DebuggerMode { DebuggerOff, DebuggerOn };
 
-enum FunctionMode { FunctionExpression, FunctionDeclaration, MethodDefinition };
+enum class FunctionMode { FunctionExpression, FunctionDeclaration, MethodDefinition };
 
 enum class SourceParseMode : uint8_t {
@@ -126 +126 @@
         return false;
 
-    if (functionMode != FunctionExpression)
+    if (functionMode != FunctionMode::FunctionExpression)
         return false;