diff options
author | Alexis Menard <alexis.menard@nokia.com> | 2009-12-07 13:55:23 +0100 |
---|---|---|
committer | Alexis Menard <alexis.menard@nokia.com> | 2009-12-07 13:55:23 +0100 |
commit | 211c0a1dd5c10c60c3383748b13e17e6bdeaea54 (patch) | |
tree | 268920a5f40744663dd4bf8d405d35d324926f95 /src/3rdparty/webkit/JavaScriptCore/parser/Parser.cpp | |
parent | fd44f52df9275e717292f5c7e90015fc9bf14603 (diff) | |
parent | 35a740fa663d4669a45ada9c37c46546e59bbb82 (diff) |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into widgets-ng
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/parser/Parser.cpp')
-rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/parser/Parser.cpp | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/parser/Parser.cpp b/src/3rdparty/webkit/JavaScriptCore/parser/Parser.cpp index 96f4ae6ae..4c046d062 100644 --- a/src/3rdparty/webkit/JavaScriptCore/parser/Parser.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/parser/Parser.cpp @@ -53,7 +53,7 @@ void Parser::parse(JSGlobalData* globalData, int* errLine, UString* errMsg) *errMsg = 0; Lexer& lexer = *globalData->lexer; - lexer.setCode(*m_source); + lexer.setCode(*m_source, m_arena); int parseError = jscyyparse(globalData); bool lexError = lexer.sawError(); @@ -67,33 +67,6 @@ void Parser::parse(JSGlobalData* globalData, int* errLine, UString* errMsg) } } -void Parser::reparseInPlace(JSGlobalData* globalData, FunctionBodyNode* functionBodyNode) -{ - ASSERT(!functionBodyNode->data()); - - m_source = &functionBodyNode->source(); - globalData->lexer->setIsReparsing(); - parse(globalData, 0, 0); - ASSERT(m_sourceElements); - - functionBodyNode->adoptData(std::auto_ptr<ScopeNodeData>(new ScopeNodeData(globalData->parser->arena(), - m_sourceElements, - m_varDeclarations ? &m_varDeclarations->data : 0, - m_funcDeclarations ? &m_funcDeclarations->data : 0, - m_numConstants))); - bool usesArguments = functionBodyNode->usesArguments(); - functionBodyNode->setFeatures(m_features); - if (usesArguments && !functionBodyNode->usesArguments()) - functionBodyNode->setUsesArguments(); - - ASSERT(globalData->parser->arena().isEmpty()); - - m_source = 0; - m_sourceElements = 0; - m_varDeclarations = 0; - m_funcDeclarations = 0; -} - void Parser::didFinishParsing(SourceElements* sourceElements, ParserArenaData<DeclarationStacks::VarStack>* varStack, ParserArenaData<DeclarationStacks::FunctionStack>* funcStack, CodeFeatures features, int lastLine, int numConstants) { |