From a94275402997c11dd2e778633dacf4b7e630a35d Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Fri, 22 Oct 2010 13:02:20 +0100 Subject: Merge WebKit at r70209: Initial merge by Git Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e --- JavaScriptCore/parser/Nodes.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'JavaScriptCore/parser/Nodes.cpp') diff --git a/JavaScriptCore/parser/Nodes.cpp b/JavaScriptCore/parser/Nodes.cpp index 534e28a..34aa674 100644 --- a/JavaScriptCore/parser/Nodes.cpp +++ b/JavaScriptCore/parser/Nodes.cpp @@ -89,10 +89,10 @@ ScopeNodeData::ScopeNodeData(ParserArena& arena, SourceElements* statements, Var // ------------------------------ ScopeNode ----------------------------- -ScopeNode::ScopeNode(JSGlobalData* globalData) +ScopeNode::ScopeNode(JSGlobalData* globalData, bool inStrictContext) : StatementNode(globalData) , ParserArenaRefCounted(globalData) - , m_features(NoFeatures) + , m_features(inStrictContext ? StrictModeFeature : NoFeatures) { } @@ -154,8 +154,8 @@ FunctionParameters::FunctionParameters(ParameterNode* firstParameter) append(parameter->ident()); } -inline FunctionBodyNode::FunctionBodyNode(JSGlobalData* globalData) - : ScopeNode(globalData) +inline FunctionBodyNode::FunctionBodyNode(JSGlobalData* globalData, bool inStrictContext) + : ScopeNode(globalData, inStrictContext) { } @@ -177,9 +177,9 @@ void FunctionBodyNode::finishParsing(PassRefPtr parameters, m_ident = ident; } -FunctionBodyNode* FunctionBodyNode::create(JSGlobalData* globalData) +FunctionBodyNode* FunctionBodyNode::create(JSGlobalData* globalData, bool inStrictContext) { - return new FunctionBodyNode(globalData); + return new FunctionBodyNode(globalData, inStrictContext); } PassRefPtr FunctionBodyNode::create(JSGlobalData* globalData, SourceElements* children, VarStack* varStack, FunctionStack* funcStack, IdentifierSet& capturedVariables, const SourceCode& sourceCode, CodeFeatures features, int numConstants) -- cgit v1.1