source: webkit/trunk/JavaScriptCore/parser/Parser.cpp@ 43479

Last change on this file since 43479 was 43479, checked in by Darin Adler, 16 years ago

2009-05-10 Darin Adler <Darin Adler>

Reviewed by Cameron Zwarich.

Bug 25674: syntax tree nodes should use arena allocation
https://bugs.webkit.org/show_bug.cgi?id=25674

Part two: Remove reference counting from most nodes.

  • JavaScriptCore.xcodeproj/project.pbxproj: Added ParserArena.h and .cpp.
  • parser/Grammar.y: Replaced uses of ParserRefCountedData with uses of ParserArenaData. Took out now-nonfunctional code that tries to manually release declaration list. Changed the new calls that create FuncDeclNode and FuncExprNode so that they use the proper version of operator new for the reference-counted idiom, not the deletion idiom.
  • parser/NodeConstructors.h: (JSC::ParserArenaDeletable::operator new): Added. (JSC::ParserArenaRefCounted::ParserArenaRefCounted): Added. (JSC::Node::Node): Removed ParserRefCounted initializer. (JSC::ElementNode::ElementNode): Ditto. (JSC::PropertyNode::PropertyNode): Ditto. (JSC::ArgumentsNode::ArgumentsNode): Ditto. (JSC::SourceElements::SourceElements): Ditto. (JSC::ParameterNode::ParameterNode): Ditto. (JSC::FuncExprNode::FuncExprNode): Added ParserArenaRefCounted initializer. (JSC::FuncDeclNode::FuncDeclNode): Ditto. (JSC::CaseClauseNode::CaseClauseNode): Removed ParserRefCounted initializer. (JSC::ClauseListNode::ClauseListNode): Ditto. (JSC::CaseBlockNode::CaseBlockNode): Ditto.
  • parser/NodeInfo.h: Replaced uses of ParserRefCountedData with uses of ParserArenaData.
  • parser/Nodes.cpp: (JSC::ScopeNode::ScopeNode): Added ParserArenaRefCounted initializer. (JSC::ProgramNode::create): Use the proper version of operator new for the reference-counted idiom, not the deletion idiom. Use the arena contains function instead of the vecctor find function. (JSC::EvalNode::create): Use the proper version of operator new for the reference-counted idiom, not the deletion idiom. Use the arena reset function instead of the vector shrink function. (JSC::FunctionBodyNode::createNativeThunk): Use the proper version of operator new for the reference-counted idiom, not the deletion idiom. (JSC::FunctionBodyNode::create): More of the same.
  • parser/Nodes.h: Added ParserArenaDeletable and ParserArenaRefCounted to replace ParserRefCounted. Fixed inheritance so only the classes that need reference counting inherit from ParserArenaRefCounted.
  • parser/Parser.cpp: (JSC::Parser::parse): Set m_sourceElements to 0 since it now starts uninitialized. Just set it to 0 again in the failure case, since it's now just a raw pointer, not an owning one. (JSC::Parser::reparseInPlace): Removed now-unneeded get() function. (JSC::Parser::didFinishParsing): Replaced uses of ParserRefCountedData with uses of ParserArenaData.
  • parser/Parser.h: Less RefPtr, more arena.
  • parser/ParserArena.cpp: Added.
  • parser/ParserArena.h: Added.
  • runtime/JSGlobalData.cpp: (JSC::JSGlobalData::~JSGlobalData): Removed arena-related code, since it's now in the Parser. (JSC::JSGlobalData::createLeaked): Removed unneeded #ifndef. (JSC::JSGlobalData::createNativeThunk): Tweaked #if a bit.
  • runtime/JSGlobalData.h: Removed parserArena, which is now in Parser.
  • wtf/RefCounted.h: Added deletionHasBegun function, for use in assertions to catch deletion not done by the deref function.
  • Property svn:eol-style set to native
File size: 3.2 KB
Line 
1/*
2 * Copyright (C) 1999-2001 Harri Porten ([email protected])
3 * Copyright (C) 2001 Peter Kelly ([email protected])
4 * Copyright (C) 2003, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
5 *
6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version.
10 *
11 * This library is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 * Library General Public License for more details.
15 *
16 * You should have received a copy of the GNU Library General Public License
17 * along with this library; see the file COPYING.LIB. If not, write to
18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
19 * Boston, MA 02110-1301, USA.
20 *
21 */
22
23#include "config.h"
24#include "Parser.h"
25
26#include "Debugger.h"
27#include "Lexer.h"
28#include <wtf/HashSet.h>
29#include <wtf/Vector.h>
30#include <memory>
31
32using std::auto_ptr;
33
34#ifndef yyparse
35extern int jscyyparse(void*);
36#endif
37
38namespace JSC {
39
40void Parser::parse(JSGlobalData* globalData, int* errLine, UString* errMsg)
41{
42 m_sourceElements = 0;
43
44 int defaultErrLine;
45 UString defaultErrMsg;
46
47 if (!errLine)
48 errLine = &defaultErrLine;
49 if (!errMsg)
50 errMsg = &defaultErrMsg;
51
52 *errLine = -1;
53 *errMsg = 0;
54
55 Lexer& lexer = *globalData->lexer;
56 lexer.setCode(*m_source);
57
58 int parseError = jscyyparse(globalData);
59 bool lexError = lexer.sawError();
60 int lineNumber = lexer.lineNumber();
61 lexer.clear();
62
63 if (parseError || lexError) {
64 *errLine = lineNumber;
65 *errMsg = "Parse error";
66 m_sourceElements = 0;
67 }
68}
69
70void Parser::reparseInPlace(JSGlobalData* globalData, FunctionBodyNode* functionBodyNode)
71{
72 ASSERT(!functionBodyNode->data());
73
74 m_source = &functionBodyNode->source();
75 globalData->lexer->setIsReparsing();
76 parse(globalData, 0, 0);
77 ASSERT(m_sourceElements);
78
79 functionBodyNode->adoptData(std::auto_ptr<ScopeNodeData>(new ScopeNodeData(globalData->parser->arena(),
80 m_sourceElements,
81 m_varDeclarations ? &m_varDeclarations->data : 0,
82 m_funcDeclarations ? &m_funcDeclarations->data : 0,
83 m_numConstants)));
84 bool usesArguments = functionBodyNode->usesArguments();
85 functionBodyNode->setFeatures(m_features);
86 if (usesArguments && !functionBodyNode->usesArguments())
87 functionBodyNode->setUsesArguments();
88
89 ASSERT(globalData->parser->arena().isEmpty());
90
91 m_source = 0;
92 m_sourceElements = 0;
93 m_varDeclarations = 0;
94 m_funcDeclarations = 0;
95}
96
97void Parser::didFinishParsing(SourceElements* sourceElements, ParserArenaData<DeclarationStacks::VarStack>* varStack,
98 ParserArenaData<DeclarationStacks::FunctionStack>* funcStack, CodeFeatures features, int lastLine, int numConstants)
99{
100 m_sourceElements = sourceElements;
101 m_varDeclarations = varStack;
102 m_funcDeclarations = funcStack;
103 m_features = features;
104 m_lastLine = lastLine;
105 m_numConstants = numConstants;
106}
107
108} // namespace JSC
Note: See TracBrowser for help on using the repository browser.