Commit 4240a319 authored by ggaren@apple.com's avatar ggaren@apple.com

JavaScriptCore:

2008-11-17  Geoffrey Garen  <ggaren@apple.com>

        Reviewed by Sam Weinig.
        
        Moved runtime/Interpreter.cpp => runtime/Completion.cpp.

        Moved functions from Interpreter.h to Completion.h, and removed
        Interpreter.h from the project.

        * API/JSBase.cpp:
        * AllInOneFile.cpp:
        * GNUmakefile.am:
        * JavaScriptCore.pri:
        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
        * JavaScriptCore.xcodeproj/project.pbxproj:
        * JavaScriptCoreSources.bkl:
        * jsc.cpp:
        * runtime/Completion.cpp: Copied from runtime/Interpreter.cpp.
        * runtime/Completion.h:
        * runtime/Interpreter.cpp: Removed.
        * runtime/Interpreter.h: Removed.

WebCore:

2008-11-17  Geoffrey Garen  <ggaren@apple.com>

        Reviewed by Sam Weinig.

        Updated for JavaScriptCore renames.

        * ForwardingHeaders/runtime/Interpreter.h: Removed.
        * WebCore.vcproj/WebCore.vcproj:
        * bindings/js/JSDOMBinding.h:
        * bindings/js/WorkerScriptController.cpp:
        * bindings/objc/WebScriptObject.mm:
        * bridge/NP_jsobject.cpp:
        * bridge/jni/jni_jsobject.mm:
        * html/CanvasRenderingContext2D.cpp:
        * inspector/JavaScriptCallFrame.cpp:
        * page/Console.cpp:

WebKit/mac:

2008-11-17  Geoffrey Garen  <ggaren@apple.com>

        Reviewed by Sam Weinig.

        Updated for JavaScriptCore renames.

        * ForwardingHeaders/runtime/Completion.h: Copied from ForwardingHeaders/runtime/Interpreter.h.
        * ForwardingHeaders/runtime/Interpreter.h: Removed.
        * WebView/WebScriptDebugDelegate.mm:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@38509 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent dc571522
......@@ -33,7 +33,7 @@
#include "SourceCode.h"
#include <runtime/ExecState.h>
#include <runtime/InitializeThreading.h>
#include <runtime/Interpreter.h>
#include <runtime/Completion.h>
#include <runtime/JSGlobalObject.h>
#include <runtime/JSLock.h>
#include <runtime/JSObject.h>
......
......@@ -62,7 +62,7 @@
#include "runtime/JSNumberCell.cpp"
#include "runtime/GetterSetter.cpp"
#include "runtime/InternalFunction.cpp"
#include "runtime/Interpreter.cpp"
#include "runtime/Completion.cpp"
#include "runtime/JSImmediate.cpp"
#include "runtime/JSLock.cpp"
#include "runtime/JSWrapperObject.cpp"
......
2008-11-17 Geoffrey Garen <ggaren@apple.com>
Reviewed by Sam Weinig.
Moved runtime/Interpreter.cpp => runtime/Completion.cpp.
Moved functions from Interpreter.h to Completion.h, and removed
Interpreter.h from the project.
* API/JSBase.cpp:
* AllInOneFile.cpp:
* GNUmakefile.am:
* JavaScriptCore.pri:
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* JavaScriptCore.xcodeproj/project.pbxproj:
* JavaScriptCoreSources.bkl:
* jsc.cpp:
* runtime/Completion.cpp: Copied from runtime/Interpreter.cpp.
* runtime/Completion.h:
* runtime/Interpreter.cpp: Removed.
* runtime/Interpreter.h: Removed.
2008-11-17 Gabor Loki <loki@inf.u-szeged.hu>
Reviewed by Darin Adler.
......
......@@ -300,8 +300,7 @@ javascriptcore_sources += \
JavaScriptCore/runtime/Identifier.h \
JavaScriptCore/runtime/InternalFunction.cpp \
JavaScriptCore/runtime/InternalFunction.h \
JavaScriptCore/runtime/Interpreter.cpp \
JavaScriptCore/runtime/Interpreter.h \
JavaScriptCore/runtime/Completion.cpp \
JavaScriptCore/runtime/JSArray.cpp \
JavaScriptCore/runtime/JSArray.h \
JavaScriptCore/runtime/JSCell.cpp \
......
......@@ -96,7 +96,7 @@ SOURCES += \
runtime/GlobalEvalFunction.cpp \
runtime/Identifier.cpp \
runtime/InternalFunction.cpp \
runtime/Interpreter.cpp \
runtime/Completion.cpp \
runtime/JSArray.cpp \
runtime/JSCell.cpp \
runtime/JSFunction.cpp \
......
......@@ -501,7 +501,7 @@
>
</File>
<File
RelativePath="..\..\runtime\Interpreter.cpp"
RelativePath="..\..\runtime\Completion.cpp"
>
</File>
<File
......
......@@ -180,7 +180,6 @@
BC18C40E0E16F5CD00B34460 /* HashTraits.h in Headers */ = {isa = PBXBuildFile; fileRef = 65DFC92F08EA173A00F7300B /* HashTraits.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC18C40F0E16F5CD00B34460 /* Identifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 933A349A038AE7C6008635CE /* Identifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC18C4100E16F5CD00B34460 /* InitializeThreading.h in Headers */ = {isa = PBXBuildFile; fileRef = E178633F0D9BEC0000D74E75 /* InitializeThreading.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC18C4120E16F5CD00B34460 /* Interpreter.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8640255597D01FF60F7 /* Interpreter.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC18C4130E16F5CD00B34460 /* JavaScript.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CAA8B4A0D32C39A0041BCFF /* JavaScript.h */; settings = {ATTRIBUTES = (Public, ); }; };
BC18C4140E16F5CD00B34460 /* JavaScriptCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CAA8B4B0D32C39A0041BCFF /* JavaScriptCore.h */; settings = {ATTRIBUTES = (Public, ); }; };
BC18C4150E16F5CD00B34460 /* JavaScriptCorePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = F5C290E60284F98E018635CA /* JavaScriptCorePrefix.h */; };
......@@ -593,6 +592,7 @@
969A07930ED1D3AE00F1F681 /* Instruction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Instruction.h; sourceTree = "<group>"; };
969A07940ED1D3AE00F1F681 /* Opcode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Opcode.cpp; sourceTree = "<group>"; };
969A07950ED1D3AE00F1F681 /* Opcode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Opcode.h; sourceTree = "<group>"; };
969A09220ED1E09C00F1F681 /* Completion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Completion.cpp; sourceTree = "<group>"; };
A72700770DAC605600E548D7 /* JSNotAnObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSNotAnObject.h; sourceTree = "<group>"; };
A72700780DAC605600E548D7 /* JSNotAnObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSNotAnObject.cpp; sourceTree = "<group>"; };
A72701B30DADE94900E548D7 /* ExceptionHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExceptionHelpers.h; path = VM/ExceptionHelpers.h; sourceTree = "<group>"; };
......@@ -727,8 +727,6 @@
F692A85E0255597D01FF60F7 /* JSFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFunction.cpp; sourceTree = "<group>"; tabWidth = 8; };
F692A85F0255597D01FF60F7 /* JSFunction.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = JSFunction.h; sourceTree = "<group>"; tabWidth = 8; };
F692A8620255597D01FF60F7 /* JSString.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = JSString.h; sourceTree = "<group>"; tabWidth = 8; };
F692A8630255597D01FF60F7 /* Interpreter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Interpreter.cpp; sourceTree = "<group>"; tabWidth = 8; };
F692A8640255597D01FF60F7 /* Interpreter.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Interpreter.h; sourceTree = "<group>"; tabWidth = 8; };
F692A8650255597D01FF60F7 /* Lexer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Lexer.cpp; sourceTree = "<group>"; tabWidth = 8; };
F692A8660255597D01FF60F7 /* Lexer.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Lexer.h; sourceTree = "<group>"; tabWidth = 8; };
F692A8680255597D01FF60F7 /* Lookup.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Lookup.cpp; sourceTree = "<group>"; tabWidth = 8; };
......@@ -1136,6 +1134,7 @@
14F3488E0E95EF8A003648BC /* CollectorHeapIterator.h */,
65EA73620BAE35D1001BB560 /* CommonIdentifiers.cpp */,
65EA73630BAE35D1001BB560 /* CommonIdentifiers.h */,
969A09220ED1E09C00F1F681 /* Completion.cpp */,
F5BB2BC5030F772101FCFE1D /* Completion.h */,
BCA62DFF0E2826310004F30D /* ConstructData.cpp */,
BC8F3CCF0DAF17BA00577A80 /* ConstructData.h */,
......@@ -1171,8 +1170,6 @@
E178633F0D9BEC0000D74E75 /* InitializeThreading.h */,
BC9BB95B0E19680600DF8855 /* InternalFunction.cpp */,
BC11667A0E199C05008066DD /* InternalFunction.h */,
F692A8630255597D01FF60F7 /* Interpreter.cpp */,
F692A8640255597D01FF60F7 /* Interpreter.h */,
14DA818F0D99FD2000B0A4FB /* JSActivation.cpp */,
14DA818E0D99FD2000B0A4FB /* JSActivation.h */,
93ADFCE60CCBD7AC00D30B08 /* JSArray.cpp */,
......@@ -1420,7 +1417,6 @@
BC18C40E0E16F5CD00B34460 /* HashTraits.h in Headers */,
BC18C40F0E16F5CD00B34460 /* Identifier.h in Headers */,
BC18C4100E16F5CD00B34460 /* InitializeThreading.h in Headers */,
BC18C4120E16F5CD00B34460 /* Interpreter.h in Headers */,
BC18C4130E16F5CD00B34460 /* JavaScript.h in Headers */,
BC18C4140E16F5CD00B34460 /* JavaScriptCore.h in Headers */,
BC18C4150E16F5CD00B34460 /* JavaScriptCorePrefix.h in Headers */,
......
......@@ -100,7 +100,7 @@ Source files for JSCore.
runtime/Identifier.cpp
runtime/InitializeThreading.cpp
runtime/InternalFunction.cpp
runtime/Interpreter.cpp
runtime/Completion.cpp
runtime/JSActivation.cpp
runtime/JSArray.cpp
runtime/JSCell.cpp
......
......@@ -25,7 +25,6 @@
#include "BytecodeGenerator.h"
#include "Completion.h"
#include "InitializeThreading.h"
#include "Interpreter.h"
#include "JSArray.h"
#include "JSLock.h"
#include "PrototypeFunction.h"
......
......@@ -21,9 +21,8 @@
*/
#include "config.h"
#include "Interpreter.h"
#include "Completion.h"
#include "ExecState.h"
#include "JSGlobalObject.h"
#include "JSLock.h"
......
......@@ -20,13 +20,17 @@
*
*/
#ifndef KJS_COMPLETION_H
#define KJS_COMPLETION_H
#ifndef Completion_h
#define Completion_h
#include "JSValue.h"
namespace JSC {
class ExecState;
class ScopeChain;
class SourceCode;
enum ComplType { Normal, Break, Continue, ReturnValue, Throw, Interrupted };
/*
......@@ -51,6 +55,9 @@ namespace JSC {
JSValue* m_value;
};
Completion checkSyntax(ExecState*, const SourceCode&);
Completion evaluate(ExecState*, ScopeChain&, const SourceCode&, JSValue* thisValue = noValue());
} // namespace JSC
#endif // KJS_COMPLETION_H
#endif // Completion_h
/*
* Copyright (C) 1999-2001 Harri Porten (porten@kde.org)
* Copyright (C) 2001 Peter Kelly (pmk@post.com)
* Copyright (C) 2003, 2007 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public License
* along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*
*/
#ifndef KJS_Interpreter_h
#define KJS_Interpreter_h
#include "JSValue.h"
#include <wtf/PassRefPtr.h>
#include <wtf/unicode/Unicode.h>
namespace JSC {
class Completion;
class ExecState;
class ScopeChain;
class SourceCode;
Completion checkSyntax(ExecState*, const SourceCode&);
Completion evaluate(ExecState*, ScopeChain&, const SourceCode&, JSValue* thisValue = noValue());
} // namespace JSC
#endif // KJS_Interpreter_h
......@@ -32,7 +32,7 @@
#include "JavaScriptGlue.h"
#include <JavaScriptCore/Collector.h>
#include <JavaScriptCore/Interpreter.h>
#include <JavaScriptCore/Completion.h>
#include <JavaScriptCore/JSValue.h>
#include <JavaScriptCore/JSLock.h>
#include <JavaScriptCore/JSObject.h>
......
2008-11-17 Geoffrey Garen <ggaren@apple.com>
Reviewed by Sam Weinig.
Updated for JavaScriptCore renames.
* ForwardingHeaders/runtime/Interpreter.h: Removed.
* WebCore.vcproj/WebCore.vcproj:
* bindings/js/JSDOMBinding.h:
* bindings/js/WorkerScriptController.cpp:
* bindings/objc/WebScriptObject.mm:
* bridge/NP_jsobject.cpp:
* bridge/jni/jni_jsobject.mm:
* html/CanvasRenderingContext2D.cpp:
* inspector/JavaScriptCallFrame.cpp:
* page/Console.cpp:
2008-11-17 Geoffrey Garen <ggaren@apple.com>
Not reviewed.
#include <JavaScriptCore/Interpreter.h>
......@@ -15856,10 +15856,6 @@
RelativePath="..\ForwardingHeaders\runtime\Identifier.h"
>
</File>
<File
RelativePath="..\ForwardingHeaders\runtime\Interpreter.h"
>
</File>
<File
RelativePath="..\ForwardingHeaders\runtime\JSLock.h"
>
......
......@@ -22,7 +22,7 @@
#define JSDOMBinding_h
#include "JSDOMGlobalObject.h"
#include <runtime/Interpreter.h>
#include <runtime/Completion.h>
#include <runtime/Lookup.h>
#include <runtime/JSFunction.h>
#include <wtf/Noncopyable.h>
......
......@@ -34,7 +34,7 @@
#include "WorkerContext.h"
#include <parser/SourceCode.h>
#include <runtime/Completion.h>
#include <runtime/Interpreter.h>
#include <runtime/Completion.h>
#include <runtime/JSLock.h>
using namespace JSC;
......
......@@ -44,7 +44,7 @@
#import <runtime/JSGlobalObject.h>
#import <runtime/JSLock.h>
#import <runtime/Completion.h>
#import <runtime/Interpreter.h>
#import <runtime/Completion.h>
#ifdef BUILDING_ON_TIGER
typedef unsigned NSUInteger;
......
......@@ -41,7 +41,7 @@
#include <runtime/PropertyNameArray.h>
#include <parser/SourceCode.h>
#include <runtime/Completion.h>
#include <runtime/Interpreter.h>
#include <runtime/Completion.h>
using WebCore::String;
using WebCore::StringSourceProvider;
......
......@@ -39,7 +39,7 @@
#include <runtime/JSGlobalObject.h>
#include <runtime/JSLock.h>
#include <runtime/Completion.h>
#include <runtime/Interpreter.h>
#include <runtime/Completion.h>
#include <wtf/Assertions.h>
#include <parser/SourceProvider.h>
......
......@@ -55,7 +55,7 @@
#include "SecurityOrigin.h"
#include "Settings.h"
#include "TextMetrics.h"
#include <runtime/Interpreter.h>
#include <runtime/Completion.h>
#include <stdio.h>
#include <wtf/MathExtras.h>
......
......@@ -29,7 +29,7 @@
#include "PlatformString.h"
#include <debugger/DebuggerCallFrame.h>
#include <runtime/JSGlobalObject.h>
#include <runtime/Interpreter.h>
#include <runtime/Completion.h>
#include <runtime/JSLock.h>
#include <runtime/JSObject.h>
#include <runtime/JSValue.h>
......
......@@ -40,7 +40,7 @@
#include "PageGroup.h"
#include "PlatformString.h"
#include <runtime/ArgList.h>
#include <runtime/Interpreter.h>
#include <runtime/Completion.h>
#include <runtime/JSObject.h>
#include <VM/Machine.h>
#include <profiler/Profiler.h>
......
2008-11-17 Geoffrey Garen <ggaren@apple.com>
Reviewed by Sam Weinig.
Updated for JavaScriptCore renames.
* ForwardingHeaders/runtime/Completion.h: Copied from ForwardingHeaders/runtime/Interpreter.h.
* ForwardingHeaders/runtime/Interpreter.h: Removed.
* WebView/WebScriptDebugDelegate.mm:
2008-11-16 Greg Bolsinga <bolsinga@apple.com>
Reviewed by Darin Adler.
......
#import <JavaScriptCore/Completion.h>
......@@ -37,7 +37,7 @@
#import <runtime/JSGlobalObject.h>
#import <runtime/JSFunction.h>
#import <runtime/JSLock.h>
#import <runtime/Interpreter.h>
#import <runtime/Completion.h>
#import <WebCore/Frame.h>
#import <WebCore/WebScriptObjectPrivate.h>
#import <WebCore/ScriptController.h>
......
......@@ -32,7 +32,7 @@
#include "COMEnumVariant.h"
#include "WebKitDLL.h"
#include <JavaScriptCore/Interpreter.h>
#include <JavaScriptCore/Completion.h>
#include <JavaScriptCore/JSFunction.h>
#include <JavaScriptCore/JSGlobalObject.h>
#include <JavaScriptCore/JSLock.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment