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

Last change on this file since 38205 was 38205, checked in by [email protected], 17 years ago

2008-11-06 Cameron Zwarich <[email protected]>

Reviewed by Geoff Garen.

Move the remaining files in the kjs subdirectory of JavaScriptCore to
a new parser subdirectory, and remove the kjs subdirectory entirely.

JavaScriptCore:

  • AllInOneFile.cpp:
  • DerivedSources.make:
  • GNUmakefile.am:
  • JavaScriptCore.pri:
  • JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
  • JavaScriptCore.vcproj/WTF/WTF.vcproj:
  • JavaScriptCore.vcproj/jsc/jsc.vcproj:
  • JavaScriptCore.xcodeproj/project.pbxproj:
  • JavaScriptCoreSources.bkl:
  • VM/CodeBlock.h:
  • VM/ExceptionHelpers.cpp:
  • VM/SamplingTool.h:
  • bytecompiler/CodeGenerator.h:
  • jsc.pro:
  • jscore.bkl:
  • kjs: Removed.
  • kjs/NodeInfo.h: Removed.
  • kjs/Parser.cpp: Removed.
  • kjs/Parser.h: Removed.
  • kjs/ResultType.h: Removed.
  • kjs/SourceCode.h: Removed.
  • kjs/SourceProvider.h: Removed.
  • kjs/grammar.y: Removed.
  • kjs/keywords.table: Removed.
  • kjs/lexer.cpp: Removed.
  • kjs/lexer.h: Removed.
  • kjs/nodes.cpp: Removed.
  • kjs/nodes.h: Removed.
  • kjs/nodes2string.cpp: Removed.
  • parser: Added.
  • parser/Grammar.y: Copied from kjs/grammar.y.
  • parser/Keywords.table: Copied from kjs/keywords.table.
  • parser/Lexer.cpp: Copied from kjs/lexer.cpp.
  • parser/Lexer.h: Copied from kjs/lexer.h.
  • parser/NodeInfo.h: Copied from kjs/NodeInfo.h.
  • parser/Nodes.cpp: Copied from kjs/nodes.cpp.
  • parser/Nodes.h: Copied from kjs/nodes.h.
  • parser/Parser.cpp: Copied from kjs/Parser.cpp.
  • parser/Parser.h: Copied from kjs/Parser.h.
  • parser/ResultType.h: Copied from kjs/ResultType.h.
  • parser/SourceCode.h: Copied from kjs/SourceCode.h.
  • parser/SourceProvider.h: Copied from kjs/SourceProvider.h.
  • parser/nodes2string.cpp: Copied from kjs/nodes2string.cpp.
  • pcre/pcre.pri:
  • pcre/pcre_exec.cpp:
  • runtime/FunctionConstructor.cpp:
  • runtime/JSActivation.h:
  • runtime/JSFunction.h:
  • runtime/JSGlobalData.cpp:
  • runtime/JSGlobalObjectFunctions.cpp:
  • runtime/JSObject.cpp: (JSC::JSObject::toNumber):
  • runtime/RegExp.cpp:

WebCore:

  • ForwardingHeaders/kjs: Removed.
  • ForwardingHeaders/kjs/Parser.h: Removed.
  • ForwardingHeaders/kjs/SavedBuiltins.h: Removed.
  • ForwardingHeaders/kjs/SourceCode.h: Removed.
  • ForwardingHeaders/kjs/SourceProvider.h: Removed.
  • ForwardingHeaders/parser: Added.
  • ForwardingHeaders/parser/Parser.h: Copied from ForwardingHeaders/kjs/Parser.h.
  • ForwardingHeaders/parser/SourceCode.h: Copied from ForwardingHeaders/kjs/SourceCode.h.
  • ForwardingHeaders/parser/SourceProvider.h: Copied from ForwardingHeaders/kjs/SourceProvider.h.
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • bindings/js/StringSourceProvider.h:
  • bindings/js/WorkerScriptController.cpp:
  • bridge/NP_jsobject.cpp:
  • bridge/jni/jni_jsobject.mm:
  • bridge/testbindings.pro:
  • inspector/JavaScriptDebugServer.cpp:

WebKit/mac:

  • ForwardingHeaders/kjs: Removed.
  • ForwardingHeaders/kjs/SavedBuiltins.h: Removed.
  • Property svn:eol-style set to native
File size: 2.3 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 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
31extern int kjsyyparse(void*);
32
33namespace JSC {
34
35void Parser::parse(JSGlobalData* globalData, int* errLine, UString* errMsg)
36{
37 ASSERT(!m_sourceElements);
38
39 int defaultErrLine;
40 UString defaultErrMsg;
41
42 if (!errLine)
43 errLine = &defaultErrLine;
44 if (!errMsg)
45 errMsg = &defaultErrMsg;
46
47 *errLine = -1;
48 *errMsg = 0;
49
50 Lexer& lexer = *globalData->lexer;
51 lexer.setCode(*m_source);
52
53 int parseError = kjsyyparse(globalData);
54 bool lexError = lexer.sawError();
55 lexer.clear();
56
57 ParserRefCounted::deleteNewObjects(globalData);
58
59 if (parseError || lexError) {
60 *errLine = lexer.lineNo();
61 *errMsg = "Parse error";
62 m_sourceElements.clear();
63 }
64}
65
66void Parser::didFinishParsing(SourceElements* sourceElements, ParserRefCountedData<DeclarationStacks::VarStack>* varStack,
67 ParserRefCountedData<DeclarationStacks::FunctionStack>* funcStack, CodeFeatures features, int lastLine, int numConstants)
68{
69 m_sourceElements = sourceElements;
70 m_varDeclarations = varStack;
71 m_funcDeclarations = funcStack;
72 m_features = features;
73 m_lastLine = lastLine;
74 m_numConstants = numConstants;
75}
76
77} // namespace JSC
Note: See TracBrowser for help on using the repository browser.