Changeset 37275 in webkit for trunk/JavaScriptCore/kjs/Parser.h

Timestamp:

Oct 3, 2008, 6:39:43 PM (17 years ago)

Author:

[email protected]

Message:

2008-10-03 Maciej Stachowiak <​[email protected]>

Reviewed by Cameron Zwarich.

• Some code cleanup to how we handle code features.

1) Rename FeatureInfo typedef to CodeFeatures.
2) Rename NodeFeatureInfo template to NodeInfo.
3) Keep CodeFeature bitmask in ScopeNode instead of trying to break it out into individual bools.
4) Rename misleadingly named "needsClosure" method to "containsClosures", which better describes the meaning
of ClosureFeature.
5) Make setUsersArguments() not take an argument since it only goes one way.

• JavaScriptCore.exp:
• VM/CodeBlock.h: (JSC::CodeBlock::CodeBlock):
• kjs/NodeInfo.h:
• kjs/Parser.cpp: (JSC::Parser::didFinishParsing):
• kjs/Parser.h: (JSC::Parser::parse):
• kjs/grammar.y:
• kjs/nodes.cpp: (JSC::ScopeNode::ScopeNode): (JSC::ProgramNode::ProgramNode): (JSC::ProgramNode::create): (JSC::EvalNode::EvalNode): (JSC::EvalNode::create): (JSC::FunctionBodyNode::FunctionBodyNode): (JSC::FunctionBodyNode::create):
• kjs/nodes.h: (JSC::ScopeNode::usesEval): (JSC::ScopeNode::containsClosures): (JSC::ScopeNode::usesArguments): (JSC::ScopeNode::setUsesArguments):

File:

• trunk/JavaScriptCore/kjs/Parser.h (modified) (3 diffs)

trunk/JavaScriptCore/kjs/Parser.h

@@ -53 +53 @@
 
         void didFinishParsing(SourceElements*, ParserRefCountedData<DeclarationStacks::VarStack>*, 
-                              ParserRefCountedData<DeclarationStacks::FunctionStack>*, bool usesEval, bool needsClosure, bool usesArguments, int lastLine, int numConstants);
+                              ParserRefCountedData<DeclarationStacks::FunctionStack>*, CodeFeatures features, int lastLine, int numConstants);
 
     private:
@@ -64 +64 @@
         RefPtr<ParserRefCountedData<DeclarationStacks::VarStack> > m_varDeclarations;
         RefPtr<ParserRefCountedData<DeclarationStacks::FunctionStack> > m_funcDeclarations;
-        bool m_usesEval;
-        bool m_needsClosure;
-        bool m_usesArguments;
+        CodeFeatures m_features;
         int m_lastLine;
         int m_numConstants;
@@ -82 +80 @@
                                          m_funcDeclarations ? &m_funcDeclarations->data : 0,
                                          *m_source,
-                                         m_usesEval,
-                                         m_needsClosure,
-                                         m_usesArguments,
+                                         m_features,
                                          m_numConstants);
             result->setLoc(m_source->firstLine(), m_lastLine);