Changeset 36264 in webkit


Ignore:
Timestamp:
Sep 7, 2008 9:25:32 PM (16 years ago)
Author:
cwzwarich@webkit.org
Message:

2008-09-07 Cameron Zwarich <cwzwarich@uwaterloo.ca>

Reviewed by Oliver Hunt.

Bug 20711: Change KJS prefix on preprocessor macros to JSC
<https://bugs.webkit.org/show_bug.cgi?id=20711>

JavaScriptCore:

  • kjs/CommonIdentifiers.cpp: (JSC::CommonIdentifiers::CommonIdentifiers):
  • kjs/CommonIdentifiers.h:
  • kjs/PropertySlot.h: (JSC::PropertySlot::getValue): (JSC::PropertySlot::putValue): (JSC::PropertySlot::setValueSlot): (JSC::PropertySlot::setValue): (JSC::PropertySlot::setRegisterSlot):
  • kjs/lookup.h:
  • kjs/nodes.cpp:
  • kjs/nodes.h: (JSC::Node::): (JSC::ExpressionNode::): (JSC::StatementNode::): (JSC::NullNode::): (JSC::BooleanNode::): (JSC::NumberNode::): (JSC::ImmediateNumberNode::): (JSC::StringNode::): (JSC::RegExpNode::): (JSC::ThisNode::): (JSC::ResolveNode::): (JSC::ElementNode::): (JSC::ArrayNode::): (JSC::PropertyNode::): (JSC::PropertyListNode::): (JSC::ObjectLiteralNode::): (JSC::BracketAccessorNode::): (JSC::DotAccessorNode::): (JSC::ArgumentListNode::): (JSC::ArgumentsNode::): (JSC::NewExprNode::): (JSC::EvalFunctionCallNode::): (JSC::FunctionCallValueNode::): (JSC::FunctionCallResolveNode::): (JSC::FunctionCallBracketNode::): (JSC::FunctionCallDotNode::): (JSC::PrePostResolveNode::): (JSC::PostfixResolveNode::): (JSC::PostfixBracketNode::): (JSC::PostfixDotNode::): (JSC::PostfixErrorNode::): (JSC::DeleteResolveNode::): (JSC::DeleteBracketNode::): (JSC::DeleteDotNode::): (JSC::DeleteValueNode::): (JSC::VoidNode::): (JSC::TypeOfResolveNode::): (JSC::TypeOfValueNode::): (JSC::PrefixResolveNode::): (JSC::PrefixBracketNode::): (JSC::PrefixDotNode::): (JSC::PrefixErrorNode::): (JSC::UnaryPlusNode::): (JSC::NegateNode::): (JSC::BitwiseNotNode::): (JSC::LogicalNotNode::): (JSC::MultNode::): (JSC::DivNode::): (JSC::ModNode::): (JSC::AddNode::): (JSC::SubNode::): (JSC::LeftShiftNode::): (JSC::RightShiftNode::): (JSC::UnsignedRightShiftNode::): (JSC::LessNode::): (JSC::GreaterNode::): (JSC::LessEqNode::): (JSC::GreaterEqNode::): (JSC::ThrowableBinaryOpNode::): (JSC::InstanceOfNode::): (JSC::InNode::): (JSC::EqualNode::): (JSC::NotEqualNode::): (JSC::StrictEqualNode::): (JSC::NotStrictEqualNode::): (JSC::BitAndNode::): (JSC::BitOrNode::): (JSC::BitXOrNode::): (JSC::LogicalOpNode::): (JSC::ConditionalNode::): (JSC::ReadModifyResolveNode::): (JSC::AssignResolveNode::): (JSC::ReadModifyBracketNode::): (JSC::AssignBracketNode::): (JSC::AssignDotNode::): (JSC::ReadModifyDotNode::): (JSC::AssignErrorNode::): (JSC::CommaNode::): (JSC::VarDeclCommaNode::): (JSC::ConstDeclNode::): (JSC::ConstStatementNode::): (JSC::EmptyStatementNode::): (JSC::DebuggerStatementNode::): (JSC::ExprStatementNode::): (JSC::VarStatementNode::): (JSC::IfNode::): (JSC::IfElseNode::): (JSC::DoWhileNode::): (JSC::WhileNode::): (JSC::ForNode::): (JSC::ContinueNode::): (JSC::BreakNode::): (JSC::ReturnNode::): (JSC::WithNode::): (JSC::LabelNode::): (JSC::ThrowNode::): (JSC::TryNode::): (JSC::ParameterNode::): (JSC::ScopeNode::): (JSC::ProgramNode::): (JSC::EvalNode::): (JSC::FunctionBodyNode::): (JSC::FuncExprNode::): (JSC::FuncDeclNode::): (JSC::CaseClauseNode::): (JSC::ClauseListNode::): (JSC::CaseBlockNode::): (JSC::SwitchNode::):

WebCore:

  • bindings/js/JSEventTargetBase.h:
  • bindings/js/JSHTMLInputElementBase.cpp:
  • bindings/js/JSHTMLInputElementBase.h:
  • bindings/scripts/CodeGeneratorJS.pm:
Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • trunk/JavaScriptCore/ChangeLog

    r36263 r36264  
     12008-09-07  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
     2
     3        Reviewed by Oliver Hunt.
     4
     5        Bug 20711: Change KJS prefix on preprocessor macros to JSC
     6        <https://bugs.webkit.org/show_bug.cgi?id=20711>
     7
     8        * kjs/CommonIdentifiers.cpp:
     9        (JSC::CommonIdentifiers::CommonIdentifiers):
     10        * kjs/CommonIdentifiers.h:
     11        * kjs/PropertySlot.h:
     12        (JSC::PropertySlot::getValue):
     13        (JSC::PropertySlot::putValue):
     14        (JSC::PropertySlot::setValueSlot):
     15        (JSC::PropertySlot::setValue):
     16        (JSC::PropertySlot::setRegisterSlot):
     17        * kjs/lookup.h:
     18        * kjs/nodes.cpp:
     19        * kjs/nodes.h:
     20        (JSC::Node::):
     21        (JSC::ExpressionNode::):
     22        (JSC::StatementNode::):
     23        (JSC::NullNode::):
     24        (JSC::BooleanNode::):
     25        (JSC::NumberNode::):
     26        (JSC::ImmediateNumberNode::):
     27        (JSC::StringNode::):
     28        (JSC::RegExpNode::):
     29        (JSC::ThisNode::):
     30        (JSC::ResolveNode::):
     31        (JSC::ElementNode::):
     32        (JSC::ArrayNode::):
     33        (JSC::PropertyNode::):
     34        (JSC::PropertyListNode::):
     35        (JSC::ObjectLiteralNode::):
     36        (JSC::BracketAccessorNode::):
     37        (JSC::DotAccessorNode::):
     38        (JSC::ArgumentListNode::):
     39        (JSC::ArgumentsNode::):
     40        (JSC::NewExprNode::):
     41        (JSC::EvalFunctionCallNode::):
     42        (JSC::FunctionCallValueNode::):
     43        (JSC::FunctionCallResolveNode::):
     44        (JSC::FunctionCallBracketNode::):
     45        (JSC::FunctionCallDotNode::):
     46        (JSC::PrePostResolveNode::):
     47        (JSC::PostfixResolveNode::):
     48        (JSC::PostfixBracketNode::):
     49        (JSC::PostfixDotNode::):
     50        (JSC::PostfixErrorNode::):
     51        (JSC::DeleteResolveNode::):
     52        (JSC::DeleteBracketNode::):
     53        (JSC::DeleteDotNode::):
     54        (JSC::DeleteValueNode::):
     55        (JSC::VoidNode::):
     56        (JSC::TypeOfResolveNode::):
     57        (JSC::TypeOfValueNode::):
     58        (JSC::PrefixResolveNode::):
     59        (JSC::PrefixBracketNode::):
     60        (JSC::PrefixDotNode::):
     61        (JSC::PrefixErrorNode::):
     62        (JSC::UnaryPlusNode::):
     63        (JSC::NegateNode::):
     64        (JSC::BitwiseNotNode::):
     65        (JSC::LogicalNotNode::):
     66        (JSC::MultNode::):
     67        (JSC::DivNode::):
     68        (JSC::ModNode::):
     69        (JSC::AddNode::):
     70        (JSC::SubNode::):
     71        (JSC::LeftShiftNode::):
     72        (JSC::RightShiftNode::):
     73        (JSC::UnsignedRightShiftNode::):
     74        (JSC::LessNode::):
     75        (JSC::GreaterNode::):
     76        (JSC::LessEqNode::):
     77        (JSC::GreaterEqNode::):
     78        (JSC::ThrowableBinaryOpNode::):
     79        (JSC::InstanceOfNode::):
     80        (JSC::InNode::):
     81        (JSC::EqualNode::):
     82        (JSC::NotEqualNode::):
     83        (JSC::StrictEqualNode::):
     84        (JSC::NotStrictEqualNode::):
     85        (JSC::BitAndNode::):
     86        (JSC::BitOrNode::):
     87        (JSC::BitXOrNode::):
     88        (JSC::LogicalOpNode::):
     89        (JSC::ConditionalNode::):
     90        (JSC::ReadModifyResolveNode::):
     91        (JSC::AssignResolveNode::):
     92        (JSC::ReadModifyBracketNode::):
     93        (JSC::AssignBracketNode::):
     94        (JSC::AssignDotNode::):
     95        (JSC::ReadModifyDotNode::):
     96        (JSC::AssignErrorNode::):
     97        (JSC::CommaNode::):
     98        (JSC::VarDeclCommaNode::):
     99        (JSC::ConstDeclNode::):
     100        (JSC::ConstStatementNode::):
     101        (JSC::EmptyStatementNode::):
     102        (JSC::DebuggerStatementNode::):
     103        (JSC::ExprStatementNode::):
     104        (JSC::VarStatementNode::):
     105        (JSC::IfNode::):
     106        (JSC::IfElseNode::):
     107        (JSC::DoWhileNode::):
     108        (JSC::WhileNode::):
     109        (JSC::ForNode::):
     110        (JSC::ContinueNode::):
     111        (JSC::BreakNode::):
     112        (JSC::ReturnNode::):
     113        (JSC::WithNode::):
     114        (JSC::LabelNode::):
     115        (JSC::ThrowNode::):
     116        (JSC::TryNode::):
     117        (JSC::ParameterNode::):
     118        (JSC::ScopeNode::):
     119        (JSC::ProgramNode::):
     120        (JSC::EvalNode::):
     121        (JSC::FunctionBodyNode::):
     122        (JSC::FuncExprNode::):
     123        (JSC::FuncDeclNode::):
     124        (JSC::CaseClauseNode::):
     125        (JSC::ClauseListNode::):
     126        (JSC::CaseBlockNode::):
     127        (JSC::SwitchNode::):
     128
    11292008-09-07  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
    2130
  • trunk/JavaScriptCore/kjs/CommonIdentifiers.cpp

    r36263 r36264  
    3232    , underscoreProto(globalData, "__proto__")
    3333    , thisIdentifier(globalData, "this")
    34     KJS_COMMON_IDENTIFIERS_EACH_PROPERTY_NAME(INITIALIZE_PROPERTY_NAME)
     34    JSC_COMMON_IDENTIFIERS_EACH_PROPERTY_NAME(INITIALIZE_PROPERTY_NAME)
    3535{
    3636}
  • trunk/JavaScriptCore/kjs/CommonIdentifiers.h

    r36263 r36264  
    2727// ArgList of property names, passed to a macro so we can do set them up various
    2828// ways without repeating the list.
    29 #define KJS_COMMON_IDENTIFIERS_EACH_PROPERTY_NAME(macro) \
     29#define JSC_COMMON_IDENTIFIERS_EACH_PROPERTY_NAME(macro) \
    3030    macro(__defineGetter__) \
    3131    macro(__defineSetter__) \
     
    7878        const Identifier thisIdentifier;
    7979
    80 #define KJS_IDENTIFIER_DECLARE_PROPERTY_NAME_GLOBAL(name) const Identifier name;
    81         KJS_COMMON_IDENTIFIERS_EACH_PROPERTY_NAME(KJS_IDENTIFIER_DECLARE_PROPERTY_NAME_GLOBAL)
    82 #undef KJS_IDENTIFIER_DECLARE_PROPERTY_NAME_GLOBAL
     80#define JSC_IDENTIFIER_DECLARE_PROPERTY_NAME_GLOBAL(name) const Identifier name;
     81        JSC_COMMON_IDENTIFIERS_EACH_PROPERTY_NAME(JSC_IDENTIFIER_DECLARE_PROPERTY_NAME_GLOBAL)
     82#undef JSC_IDENTIFIER_DECLARE_PROPERTY_NAME_GLOBAL
    8383    };
    8484
  • trunk/JavaScriptCore/kjs/PropertySlot.h

    r36263 r36264  
    3434    struct HashEntry;
    3535
    36 #define KJS_VALUE_SLOT_MARKER 0
    37 #define KJS_REGISTER_SLOT_MARKER reinterpret_cast<GetValueFunc>(1)
     36#define JSC_VALUE_SLOT_MARKER 0
     37#define JSC_REGISTER_SLOT_MARKER reinterpret_cast<GetValueFunc>(1)
    3838
    3939    class PropertySlot {
     
    5757        JSValue* getValue(ExecState* exec, const Identifier& propertyName) const
    5858        {
    59             if (m_getValue == KJS_VALUE_SLOT_MARKER)
     59            if (m_getValue == JSC_VALUE_SLOT_MARKER)
    6060                return *m_data.valueSlot;
    61             if (m_getValue == KJS_REGISTER_SLOT_MARKER)
     61            if (m_getValue == JSC_REGISTER_SLOT_MARKER)
    6262                return (*m_data.registerSlot).jsValue(exec);
    6363            return m_getValue(exec, propertyName, *this);
     
    6666        JSValue* getValue(ExecState* exec, unsigned propertyName) const
    6767        {
    68             if (m_getValue == KJS_VALUE_SLOT_MARKER)
     68            if (m_getValue == JSC_VALUE_SLOT_MARKER)
    6969                return *m_data.valueSlot;
    70             if (m_getValue == KJS_REGISTER_SLOT_MARKER)
     70            if (m_getValue == JSC_REGISTER_SLOT_MARKER)
    7171                return (*m_data.registerSlot).jsValue(exec);
    7272            return m_getValue(exec, Identifier::from(exec, propertyName), *this);
     
    8282        void putValue(JSValue* value)
    8383        {
    84             if (m_getValue == KJS_VALUE_SLOT_MARKER) {
     84            if (m_getValue == JSC_VALUE_SLOT_MARKER) {
    8585                *m_data.valueSlot = value;
    8686                return;
    8787            }
    88             ASSERT(m_getValue == KJS_REGISTER_SLOT_MARKER);
     88            ASSERT(m_getValue == JSC_REGISTER_SLOT_MARKER);
    8989            *m_data.registerSlot = value;
    9090        }
     
    9393        {
    9494            ASSERT(valueSlot);
    95             m_getValue = KJS_VALUE_SLOT_MARKER;
     95            m_getValue = JSC_VALUE_SLOT_MARKER;
    9696            clearBase();
    9797            m_data.valueSlot = valueSlot;
     
    101101        {
    102102            ASSERT(valueSlot);
    103             m_getValue = KJS_VALUE_SLOT_MARKER;
     103            m_getValue = JSC_VALUE_SLOT_MARKER;
    104104            m_slotBase = slotBase;
    105105            m_data.valueSlot = valueSlot;
     
    109109        {
    110110            ASSERT(valueSlot);
    111             m_getValue = KJS_VALUE_SLOT_MARKER;
     111            m_getValue = JSC_VALUE_SLOT_MARKER;
    112112            m_slotBase = slotBase;
    113113            m_data.valueSlot = valueSlot;
     
    118118        {
    119119            ASSERT(value);
    120             m_getValue = KJS_VALUE_SLOT_MARKER;
     120            m_getValue = JSC_VALUE_SLOT_MARKER;
    121121            clearBase();
    122122            m_value = value;
     
    127127        {
    128128            ASSERT(registerSlot);
    129             m_getValue = KJS_REGISTER_SLOT_MARKER;
     129            m_getValue = JSC_REGISTER_SLOT_MARKER;
    130130            clearBase();
    131131            m_data.registerSlot = registerSlot;
  • trunk/JavaScriptCore/kjs/lookup.h

    r36263 r36264  
    256256 *
    257257 * Using those macros is very simple: define the hashtable (e.g. "DOMNodePrototypeTable"), then
    258  * KJS_DEFINE_PROTOTYPE(DOMNodePrototype)
    259  * KJS_IMPLEMENT_PROTOTYPE("DOMNode", DOMNodePrototype, DOMNodePrototypeFunction)
     258 * JSC_DEFINE_PROTOTYPE(DOMNodePrototype)
     259 * JSC_IMPLEMENT_PROTOTYPE("DOMNode", DOMNodePrototype, DOMNodePrototypeFunction)
    260260 * and use DOMNodePrototype::self(exec) as prototype in the DOMNode constructor.
    261261 * If the prototype has a "parent prototype", e.g. DOMElementPrototype falls back on DOMNodePrototype,
    262  * then the first line will use KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE, with DOMNodePrototype as the second argument.
     262 * then the first line will use JSC_DEFINE_PROTOTYPE_WITH_PROTOTYPE, with DOMNodePrototype as the second argument.
    263263 */
    264264
    265265// These macros assume that a prototype's only properties are functions
    266 #define KJS_DEFINE_PROTOTYPE(ClassPrototype) \
     266#define JSC_DEFINE_PROTOTYPE(ClassPrototype) \
    267267  class ClassPrototype : public JSC::JSObject { \
    268268  public: \
     
    276276  };
    277277
    278 #define KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(ClassPrototype, ClassPrototypePrototype) \
     278#define JSC_DEFINE_PROTOTYPE_WITH_PROTOTYPE(ClassPrototype, ClassPrototypePrototype) \
    279279    class ClassPrototype : public JSC::JSObject { \
    280280    public: \
     
    288288    };
    289289
    290 #define KJS_IMPLEMENT_PROTOTYPE(ClassName, ClassPrototype) \
     290#define JSC_IMPLEMENT_PROTOTYPE(ClassName, ClassPrototype) \
    291291    const ClassInfo ClassPrototype::info = { ClassName"Prototype", 0, &ClassPrototype##Table, 0  }; \
    292292    JSObject* ClassPrototype::self(ExecState* exec) \
  • trunk/JavaScriptCore/kjs/nodes.cpp

    r36263 r36264  
    154154}
    155155
    156 static void substitute(UString& string, const UString& substring) KJS_FAST_CALL;
     156static void substitute(UString& string, const UString& substring) JSC_FAST_CALL;
    157157static void substitute(UString& string, const UString& substring)
    158158{
  • trunk/JavaScriptCore/kjs/nodes.h

    r36263 r36264  
    4343
    4444#if PLATFORM(X86) && COMPILER(GCC)
    45 #define KJS_FAST_CALL __attribute__((regparm(3)))
     45#define JSC_FAST_CALL __attribute__((regparm(3)))
    4646#else
    47 #define KJS_FAST_CALL
     47#define JSC_FAST_CALL
    4848#endif
    4949
     
    132132    class ParserRefCounted : Noncopyable {
    133133    protected:
    134         ParserRefCounted(JSGlobalData*) KJS_FAST_CALL;
     134        ParserRefCounted(JSGlobalData*) JSC_FAST_CALL;
    135135
    136136        JSGlobalData* m_globalData;
    137137
    138138    public:
    139         void ref() KJS_FAST_CALL;
    140         void deref() KJS_FAST_CALL;
    141         bool hasOneRef() KJS_FAST_CALL;
    142 
    143         static void deleteNewObjects(JSGlobalData*) KJS_FAST_CALL;
     139        void ref() JSC_FAST_CALL;
     140        void deref() JSC_FAST_CALL;
     141        bool hasOneRef() JSC_FAST_CALL;
     142
     143        static void deleteNewObjects(JSGlobalData*) JSC_FAST_CALL;
    144144
    145145        virtual ~ParserRefCounted();
     
    152152        typedef DeclarationStacks::FunctionStack FunctionStack;
    153153
    154         Node(JSGlobalData*) KJS_FAST_CALL;
     154        Node(JSGlobalData*) JSC_FAST_CALL;
    155155
    156156        /*
     
    176176            node, "1".
    177177        */
    178         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* dst = 0) KJS_FAST_CALL
     178        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* dst = 0) JSC_FAST_CALL
    179179        {
    180180            ASSERT_WITH_MESSAGE(0, "Don't know how to generate code for:\n%s\n", toString().ascii());
     
    183183        } // FIXME: Make this pure virtual.
    184184
    185         UString toString() const KJS_FAST_CALL;
     185        UString toString() const JSC_FAST_CALL;
    186186        int lineNo() const { return m_line; }
    187187
    188         virtual bool isReturnNode() const KJS_FAST_CALL { return false; }
     188        virtual bool isReturnNode() const JSC_FAST_CALL { return false; }
    189189
    190190        // Serialization.
    191         virtual void streamTo(SourceStream&) const KJS_FAST_CALL = 0;
     191        virtual void streamTo(SourceStream&) const JSC_FAST_CALL = 0;
    192192        virtual Precedence precedence() const = 0;
    193193        virtual bool needsParensIfLeftmost() const { return false; }
    194194       
    195195    protected:
    196         Node(JSGlobalData*, JSType) KJS_FAST_CALL; // used by ExpressionNode
     196        Node(JSGlobalData*, JSType) JSC_FAST_CALL; // used by ExpressionNode
    197197
    198198        int m_line : 28;
     
    202202    class ExpressionNode : public Node {
    203203    public:
    204         ExpressionNode(JSGlobalData* globalData) KJS_FAST_CALL : Node(globalData) {}
    205         ExpressionNode(JSGlobalData* globalData, JSType expectedReturn) KJS_FAST_CALL
     204        ExpressionNode(JSGlobalData* globalData) JSC_FAST_CALL : Node(globalData) {}
     205        ExpressionNode(JSGlobalData* globalData, JSType expectedReturn) JSC_FAST_CALL
    206206            : Node(globalData, expectedReturn)
    207207        {
    208208        }
    209209
    210         virtual bool isNumber() const KJS_FAST_CALL { return false; }
    211         virtual bool isString() const KJS_FAST_CALL { return false; }
    212         virtual bool isNull() const KJS_FAST_CALL { return false; }
    213         virtual bool isPure(CodeGenerator&) const KJS_FAST_CALL { return false; }       
    214         virtual bool isLocation() const KJS_FAST_CALL { return false; }
    215         virtual bool isResolveNode() const KJS_FAST_CALL { return false; }
    216         virtual bool isBracketAccessorNode() const KJS_FAST_CALL { return false; }
    217         virtual bool isDotAccessorNode() const KJS_FAST_CALL { return false; }
    218 
    219         JSType expectedReturnType() const KJS_FAST_CALL { return static_cast<JSType>(m_expectedReturnType); }
     210        virtual bool isNumber() const JSC_FAST_CALL { return false; }
     211        virtual bool isString() const JSC_FAST_CALL { return false; }
     212        virtual bool isNull() const JSC_FAST_CALL { return false; }
     213        virtual bool isPure(CodeGenerator&) const JSC_FAST_CALL { return false; }       
     214        virtual bool isLocation() const JSC_FAST_CALL { return false; }
     215        virtual bool isResolveNode() const JSC_FAST_CALL { return false; }
     216        virtual bool isBracketAccessorNode() const JSC_FAST_CALL { return false; }
     217        virtual bool isDotAccessorNode() const JSC_FAST_CALL { return false; }
     218
     219        JSType expectedReturnType() const JSC_FAST_CALL { return static_cast<JSType>(m_expectedReturnType); }
    220220
    221221        // This needs to be in public in order to compile using GCC 3.x
     
    225225    class StatementNode : public Node {
    226226    public:
    227         StatementNode(JSGlobalData*) KJS_FAST_CALL;
    228         void setLoc(int line0, int line1) KJS_FAST_CALL;
    229         int firstLine() const KJS_FAST_CALL { return lineNo(); }
    230         int lastLine() const KJS_FAST_CALL { return m_lastLine; }
    231 
    232         virtual void pushLabel(const Identifier& ident) KJS_FAST_CALL { m_labelStack.push(ident); }
     227        StatementNode(JSGlobalData*) JSC_FAST_CALL;
     228        void setLoc(int line0, int line1) JSC_FAST_CALL;
     229        int firstLine() const JSC_FAST_CALL { return lineNo(); }
     230        int lastLine() const JSC_FAST_CALL { return m_lastLine; }
     231
     232        virtual void pushLabel(const Identifier& ident) JSC_FAST_CALL { m_labelStack.push(ident); }
    233233        virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
    234         virtual bool isEmptyStatement() const KJS_FAST_CALL { return false; }
     234        virtual bool isEmptyStatement() const JSC_FAST_CALL { return false; }
    235235
    236236    protected:
     
    243243    class NullNode : public ExpressionNode {
    244244    public:
    245         NullNode(JSGlobalData* globalData) KJS_FAST_CALL
     245        NullNode(JSGlobalData* globalData) JSC_FAST_CALL
    246246            : ExpressionNode(globalData, NullType)
    247247        {
    248248        }
    249249
    250         virtual bool isNull() const KJS_FAST_CALL { return true; }
    251 
    252         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    253 
    254         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     250        virtual bool isNull() const JSC_FAST_CALL { return true; }
     251
     252        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     253
     254        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    255255        virtual Precedence precedence() const { return PrecPrimary; }
    256256    };
     
    258258    class BooleanNode : public ExpressionNode {
    259259    public:
    260         BooleanNode(JSGlobalData* globalData, bool value) KJS_FAST_CALL
     260        BooleanNode(JSGlobalData* globalData, bool value) JSC_FAST_CALL
    261261            : ExpressionNode(globalData, BooleanType)
    262262            , m_value(value)
     
    264264        }
    265265
    266         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    267 
    268         virtual bool isPure(CodeGenerator&) const KJS_FAST_CALL { return true; }
    269         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     266        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     267
     268        virtual bool isPure(CodeGenerator&) const JSC_FAST_CALL { return true; }
     269        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    270270        virtual Precedence precedence() const { return PrecPrimary; }
    271271
     
    276276    class NumberNode : public ExpressionNode {
    277277    public:
    278         NumberNode(JSGlobalData* globalData, double v) KJS_FAST_CALL
     278        NumberNode(JSGlobalData* globalData, double v) JSC_FAST_CALL
    279279            : ExpressionNode(globalData, NumberType)
    280280            , m_double(v)
     
    282282        }
    283283
    284         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    285 
    286         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     284        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     285
     286        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    287287        virtual Precedence precedence() const { return signbit(m_double) ? PrecUnary : PrecPrimary; }
    288288
    289         virtual bool isNumber() const KJS_FAST_CALL { return true; }
    290         virtual bool isPure(CodeGenerator&) const KJS_FAST_CALL { return true; }
    291         double value() const KJS_FAST_CALL { return m_double; }
    292         virtual void setValue(double d) KJS_FAST_CALL { m_double = d; }
     289        virtual bool isNumber() const JSC_FAST_CALL { return true; }
     290        virtual bool isPure(CodeGenerator&) const JSC_FAST_CALL { return true; }
     291        double value() const JSC_FAST_CALL { return m_double; }
     292        virtual void setValue(double d) JSC_FAST_CALL { m_double = d; }
    293293
    294294    protected:
     
    298298    class ImmediateNumberNode : public NumberNode {
    299299    public:
    300         ImmediateNumberNode(JSGlobalData* globalData, JSValue* v, double d) KJS_FAST_CALL
     300        ImmediateNumberNode(JSGlobalData* globalData, JSValue* v, double d) JSC_FAST_CALL
    301301            : NumberNode(globalData, d)
    302302            , m_value(v)
     
    305305        }
    306306
    307         virtual void setValue(double d) KJS_FAST_CALL { m_double = d; m_value = JSImmediate::from(d); ASSERT(m_value); }
     307        virtual void setValue(double d) JSC_FAST_CALL { m_double = d; m_value = JSImmediate::from(d); ASSERT(m_value); }
    308308
    309309    private:
     
    313313    class StringNode : public ExpressionNode {
    314314    public:
    315         StringNode(JSGlobalData* globalData, const UString* v) KJS_FAST_CALL
     315        StringNode(JSGlobalData* globalData, const UString* v) JSC_FAST_CALL
    316316            : ExpressionNode(globalData, StringType)
    317317            , m_value(*v)
     
    319319        }
    320320
    321         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
     321        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    322322       
    323         virtual bool isString() const KJS_FAST_CALL { return true; }
     323        virtual bool isString() const JSC_FAST_CALL { return true; }
    324324        UString& value() { return m_value; }
    325         virtual bool isPure(CodeGenerator&) const KJS_FAST_CALL { return true; }
    326         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     325        virtual bool isPure(CodeGenerator&) const JSC_FAST_CALL { return true; }
     326        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    327327        virtual Precedence precedence() const { return PrecPrimary; }
    328328
     
    426426    class RegExpNode : public ExpressionNode, public ThrowableExpressionData {
    427427    public:
    428         RegExpNode(JSGlobalData* globalData, const UString& pattern, const UString& flags) KJS_FAST_CALL
     428        RegExpNode(JSGlobalData* globalData, const UString& pattern, const UString& flags) JSC_FAST_CALL
    429429            : ExpressionNode(globalData)
    430430            , m_pattern(pattern)
     
    433433        }
    434434
    435         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    436 
    437         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     435        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     436
     437        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    438438        virtual Precedence precedence() const { return PrecPrimary; }
    439439
     
    445445    class ThisNode : public ExpressionNode {
    446446    public:
    447         ThisNode(JSGlobalData* globalData) KJS_FAST_CALL
    448             : ExpressionNode(globalData)
    449         {
    450         }
    451 
    452         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    453 
    454         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     447        ThisNode(JSGlobalData* globalData) JSC_FAST_CALL
     448            : ExpressionNode(globalData)
     449        {
     450        }
     451
     452        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     453
     454        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    455455        virtual Precedence precedence() const { return PrecPrimary; }
    456456    };
     
    458458    class ResolveNode : public ExpressionNode {
    459459    public:
    460         ResolveNode(JSGlobalData* globalData, const Identifier& ident, int startOffset) KJS_FAST_CALL
     460        ResolveNode(JSGlobalData* globalData, const Identifier& ident, int startOffset) JSC_FAST_CALL
    461461            : ExpressionNode(globalData)
    462462            , m_ident(ident)
     
    465465        }
    466466
    467         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    468 
    469         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     467        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     468
     469        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    470470        virtual Precedence precedence() const { return PrecPrimary; }
    471471
    472         virtual bool isPure(CodeGenerator&) const KJS_FAST_CALL;
    473         virtual bool isLocation() const KJS_FAST_CALL { return true; }
    474         virtual bool isResolveNode() const KJS_FAST_CALL { return true; }
    475         const Identifier& identifier() const KJS_FAST_CALL { return m_ident; }
     472        virtual bool isPure(CodeGenerator&) const JSC_FAST_CALL;
     473        virtual bool isLocation() const JSC_FAST_CALL { return true; }
     474        virtual bool isResolveNode() const JSC_FAST_CALL { return true; }
     475        const Identifier& identifier() const JSC_FAST_CALL { return m_ident; }
    476476
    477477    protected:
     
    483483    class ElementNode : public Node {
    484484    public:
    485         ElementNode(JSGlobalData* globalData, int elision, ExpressionNode* node) KJS_FAST_CALL
     485        ElementNode(JSGlobalData* globalData, int elision, ExpressionNode* node) JSC_FAST_CALL
    486486            : Node(globalData)
    487487            , m_elision(elision)
     
    490490        }
    491491
    492         ElementNode(JSGlobalData* globalData, ElementNode* l, int elision, ExpressionNode* node) KJS_FAST_CALL
     492        ElementNode(JSGlobalData* globalData, ElementNode* l, int elision, ExpressionNode* node) JSC_FAST_CALL
    493493            : Node(globalData)
    494494            , m_elision(elision)
     
    499499
    500500        virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
    501         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     501        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    502502
    503503        int elision() const { return m_elision; }
     
    505505
    506506        ElementNode* next() { return m_next.get(); }
    507         PassRefPtr<ElementNode> releaseNext() KJS_FAST_CALL { return m_next.release(); }
     507        PassRefPtr<ElementNode> releaseNext() JSC_FAST_CALL { return m_next.release(); }
    508508
    509509    private:
     
    515515    class ArrayNode : public ExpressionNode {
    516516    public:
    517         ArrayNode(JSGlobalData* globalData, int elision) KJS_FAST_CALL
     517        ArrayNode(JSGlobalData* globalData, int elision) JSC_FAST_CALL
    518518            : ExpressionNode(globalData)
    519519            , m_elision(elision)
     
    522522        }
    523523
    524         ArrayNode(JSGlobalData* globalData, ElementNode* element) KJS_FAST_CALL
     524        ArrayNode(JSGlobalData* globalData, ElementNode* element) JSC_FAST_CALL
    525525            : ExpressionNode(globalData)
    526526            , m_element(element)
     
    530530        }
    531531
    532         ArrayNode(JSGlobalData* globalData, int elision, ElementNode* element) KJS_FAST_CALL
     532        ArrayNode(JSGlobalData* globalData, int elision, ElementNode* element) JSC_FAST_CALL
    533533            : ExpressionNode(globalData)
    534534            , m_element(element)
     
    538538        }
    539539
    540         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    541 
    542         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     540        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     541
     542        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    543543        virtual Precedence precedence() const { return PrecPrimary; }
    544544
     
    553553        enum Type { Constant, Getter, Setter };
    554554
    555         PropertyNode(JSGlobalData* globalData, const Identifier& name, ExpressionNode* assign, Type type) KJS_FAST_CALL
     555        PropertyNode(JSGlobalData* globalData, const Identifier& name, ExpressionNode* assign, Type type) JSC_FAST_CALL
    556556            : Node(globalData)
    557557            , m_name(name)
     
    561561        }
    562562
    563         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     563        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    564564        virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
    565565
     
    575575    class PropertyListNode : public Node {
    576576    public:
    577         PropertyListNode(JSGlobalData* globalData, PropertyNode* node) KJS_FAST_CALL
     577        PropertyListNode(JSGlobalData* globalData, PropertyNode* node) JSC_FAST_CALL
    578578            : Node(globalData)
    579579            , m_node(node)
     
    581581        }
    582582
    583         PropertyListNode(JSGlobalData* globalData, PropertyNode* node, PropertyListNode* list) KJS_FAST_CALL
     583        PropertyListNode(JSGlobalData* globalData, PropertyNode* node, PropertyListNode* list) JSC_FAST_CALL
    584584            : Node(globalData)
    585585            , m_node(node)
     
    588588        }
    589589
    590         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    591         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     590        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     591        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    592592        virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
    593593
    594         PassRefPtr<PropertyListNode> releaseNext() KJS_FAST_CALL { return m_next.release(); }
     594        PassRefPtr<PropertyListNode> releaseNext() JSC_FAST_CALL { return m_next.release(); }
    595595
    596596    private:
     
    602602    class ObjectLiteralNode : public ExpressionNode {
    603603    public:
    604         ObjectLiteralNode(JSGlobalData* globalData) KJS_FAST_CALL
    605             : ExpressionNode(globalData)
    606         {
    607         }
    608 
    609         ObjectLiteralNode(JSGlobalData* globalData, PropertyListNode* list) KJS_FAST_CALL
     604        ObjectLiteralNode(JSGlobalData* globalData) JSC_FAST_CALL
     605            : ExpressionNode(globalData)
     606        {
     607        }
     608
     609        ObjectLiteralNode(JSGlobalData* globalData, PropertyListNode* list) JSC_FAST_CALL
    610610            : ExpressionNode(globalData)
    611611            , m_list(list)
     
    613613        }
    614614
    615         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    616         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     615        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     616        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    617617        virtual Precedence precedence() const { return PrecPrimary; }
    618618        virtual bool needsParensIfLeftmost() const { return true; }
     
    624624    class BracketAccessorNode : public ExpressionNode, public ThrowableExpressionData {
    625625    public:
    626         BracketAccessorNode(JSGlobalData* globalData, ExpressionNode* base, ExpressionNode* subscript, bool subscriptHasAssignments) KJS_FAST_CALL
     626        BracketAccessorNode(JSGlobalData* globalData, ExpressionNode* base, ExpressionNode* subscript, bool subscriptHasAssignments) JSC_FAST_CALL
    627627            : ExpressionNode(globalData)
    628628            , m_base(base)
     
    632632        }
    633633
    634         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    635 
    636         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     634        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     635
     636        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    637637        virtual Precedence precedence() const { return PrecMember; }
    638638
    639         virtual bool isLocation() const KJS_FAST_CALL { return true; }
    640         virtual bool isBracketAccessorNode() const KJS_FAST_CALL { return true; }
    641         ExpressionNode* base() KJS_FAST_CALL { return m_base.get(); }
    642         ExpressionNode* subscript() KJS_FAST_CALL { return m_subscript.get(); }
     639        virtual bool isLocation() const JSC_FAST_CALL { return true; }
     640        virtual bool isBracketAccessorNode() const JSC_FAST_CALL { return true; }
     641        ExpressionNode* base() JSC_FAST_CALL { return m_base.get(); }
     642        ExpressionNode* subscript() JSC_FAST_CALL { return m_subscript.get(); }
    643643
    644644    private:
     
    650650    class DotAccessorNode : public ExpressionNode, public ThrowableExpressionData {
    651651    public:
    652         DotAccessorNode(JSGlobalData* globalData, ExpressionNode* base, const Identifier& ident) KJS_FAST_CALL
     652        DotAccessorNode(JSGlobalData* globalData, ExpressionNode* base, const Identifier& ident) JSC_FAST_CALL
    653653            : ExpressionNode(globalData)
    654654            , m_base(base)
     
    657657        }
    658658
    659         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    660         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     659        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     660        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    661661        virtual Precedence precedence() const { return PrecMember; }
    662662
    663         virtual bool isLocation() const KJS_FAST_CALL { return true; }
    664         virtual bool isDotAccessorNode() const KJS_FAST_CALL { return true; }
    665         ExpressionNode* base() const KJS_FAST_CALL { return m_base.get(); }
    666         const Identifier& identifier() const KJS_FAST_CALL { return m_ident; }
     663        virtual bool isLocation() const JSC_FAST_CALL { return true; }
     664        virtual bool isDotAccessorNode() const JSC_FAST_CALL { return true; }
     665        ExpressionNode* base() const JSC_FAST_CALL { return m_base.get(); }
     666        const Identifier& identifier() const JSC_FAST_CALL { return m_ident; }
    667667
    668668    private:
     
    673673    class ArgumentListNode : public Node {
    674674    public:
    675         ArgumentListNode(JSGlobalData* globalData, ExpressionNode* expr) KJS_FAST_CALL
     675        ArgumentListNode(JSGlobalData* globalData, ExpressionNode* expr) JSC_FAST_CALL
    676676            : Node(globalData)
    677677            , m_expr(expr)
     
    679679        }
    680680
    681         ArgumentListNode(JSGlobalData* globalData, ArgumentListNode* listNode, ExpressionNode* expr) KJS_FAST_CALL
     681        ArgumentListNode(JSGlobalData* globalData, ArgumentListNode* listNode, ExpressionNode* expr) JSC_FAST_CALL
    682682            : Node(globalData)
    683683            , m_expr(expr)
     
    686686        }
    687687
    688         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    689         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     688        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     689        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    690690        virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
    691691
    692         PassRefPtr<ArgumentListNode> releaseNext() KJS_FAST_CALL { return m_next.release(); }
     692        PassRefPtr<ArgumentListNode> releaseNext() JSC_FAST_CALL { return m_next.release(); }
    693693
    694694        ListRefPtr<ArgumentListNode> m_next;
     
    698698    class ArgumentsNode : public Node {
    699699    public:
    700         ArgumentsNode(JSGlobalData* globalData) KJS_FAST_CALL
     700        ArgumentsNode(JSGlobalData* globalData) JSC_FAST_CALL
    701701            : Node(globalData)
    702702        {
    703703        }
    704704
    705         ArgumentsNode(JSGlobalData* globalData, ArgumentListNode* listNode) KJS_FAST_CALL
     705        ArgumentsNode(JSGlobalData* globalData, ArgumentListNode* listNode) JSC_FAST_CALL
    706706            : Node(globalData)
    707707            , m_listNode(listNode)
     
    709709        }
    710710
    711         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     711        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    712712        virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
    713713
     
    717717    class NewExprNode : public ExpressionNode, public ThrowableExpressionData {
    718718    public:
    719         NewExprNode(JSGlobalData* globalData, ExpressionNode* expr) KJS_FAST_CALL
     719        NewExprNode(JSGlobalData* globalData, ExpressionNode* expr) JSC_FAST_CALL
    720720            : ExpressionNode(globalData)
    721721            , m_expr(expr)
     
    723723        }
    724724
    725         NewExprNode(JSGlobalData* globalData, ExpressionNode* expr, ArgumentsNode* args) KJS_FAST_CALL
     725        NewExprNode(JSGlobalData* globalData, ExpressionNode* expr, ArgumentsNode* args) JSC_FAST_CALL
    726726            : ExpressionNode(globalData)
    727727            , m_expr(expr)
     
    730730        }
    731731
    732         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    733 
    734         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     732        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     733
     734        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    735735        virtual Precedence precedence() const { return PrecLeftHandSide; }
    736736
     
    742742    class EvalFunctionCallNode : public ExpressionNode, public ThrowableExpressionData {
    743743    public:
    744         EvalFunctionCallNode(JSGlobalData* globalData, ArgumentsNode* args, unsigned divot, unsigned startOffset, unsigned endOffset) KJS_FAST_CALL
     744        EvalFunctionCallNode(JSGlobalData* globalData, ArgumentsNode* args, unsigned divot, unsigned startOffset, unsigned endOffset) JSC_FAST_CALL
    745745            : ExpressionNode(globalData)
    746746            , ThrowableExpressionData(divot, startOffset, endOffset)
     
    749749        }
    750750
    751         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    752         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     751        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     752        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    753753        virtual Precedence precedence() const { return PrecCall; }
    754754
     
    759759    class FunctionCallValueNode : public ExpressionNode, public ThrowableExpressionData {
    760760    public:
    761         FunctionCallValueNode(JSGlobalData* globalData, ExpressionNode* expr, ArgumentsNode* args, unsigned divot, unsigned startOffset, unsigned endOffset) KJS_FAST_CALL
     761        FunctionCallValueNode(JSGlobalData* globalData, ExpressionNode* expr, ArgumentsNode* args, unsigned divot, unsigned startOffset, unsigned endOffset) JSC_FAST_CALL
    762762            : ExpressionNode(globalData)
    763763            , ThrowableExpressionData(divot, startOffset, endOffset)
     
    767767        }
    768768
    769         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    770         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     769        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     770        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    771771        virtual Precedence precedence() const { return PrecCall; }
    772772
     
    778778    class FunctionCallResolveNode : public ExpressionNode, public ThrowableExpressionData {
    779779    public:
    780         FunctionCallResolveNode(JSGlobalData* globalData, const Identifier& ident, ArgumentsNode* args, unsigned divot, unsigned startOffset, unsigned endOffset) KJS_FAST_CALL
     780        FunctionCallResolveNode(JSGlobalData* globalData, const Identifier& ident, ArgumentsNode* args, unsigned divot, unsigned startOffset, unsigned endOffset) JSC_FAST_CALL
    781781            : ExpressionNode(globalData)
    782782            , ThrowableExpressionData(divot, startOffset, endOffset)
     
    786786        }
    787787
    788         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    789 
    790         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     788        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     789
     790        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    791791        virtual Precedence precedence() const { return PrecCall; }
    792792
     
    800800    class FunctionCallBracketNode : public ExpressionNode, public ThrowableSubExpressionData {
    801801    public:
    802         FunctionCallBracketNode(JSGlobalData* globalData, ExpressionNode* base, ExpressionNode* subscript, ArgumentsNode* args, unsigned divot, unsigned startOffset, unsigned endOffset) KJS_FAST_CALL
     802        FunctionCallBracketNode(JSGlobalData* globalData, ExpressionNode* base, ExpressionNode* subscript, ArgumentsNode* args, unsigned divot, unsigned startOffset, unsigned endOffset) JSC_FAST_CALL
    803803            : ExpressionNode(globalData)
    804804            , ThrowableSubExpressionData(divot, startOffset, endOffset)
     
    809809        }
    810810
    811         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    812         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     811        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     812        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    813813        virtual Precedence precedence() const { return PrecCall; }
    814814
     
    821821    class FunctionCallDotNode : public ExpressionNode, public ThrowableSubExpressionData {
    822822    public:
    823         FunctionCallDotNode(JSGlobalData* globalData, ExpressionNode* base, const Identifier& ident, ArgumentsNode* args, unsigned divot, unsigned startOffset, unsigned endOffset) KJS_FAST_CALL
     823        FunctionCallDotNode(JSGlobalData* globalData, ExpressionNode* base, const Identifier& ident, ArgumentsNode* args, unsigned divot, unsigned startOffset, unsigned endOffset) JSC_FAST_CALL
    824824            : ExpressionNode(globalData)
    825825            , ThrowableSubExpressionData(divot, startOffset, endOffset)
     
    830830        }
    831831
    832         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    833         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     832        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     833        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    834834        virtual Precedence precedence() const { return PrecCall; }
    835835
     
    842842    class PrePostResolveNode : public ExpressionNode, public ThrowableExpressionData {
    843843    public:
    844         PrePostResolveNode(JSGlobalData* globalData, const Identifier& ident, unsigned divot, unsigned startOffset, unsigned endOffset) KJS_FAST_CALL
     844        PrePostResolveNode(JSGlobalData* globalData, const Identifier& ident, unsigned divot, unsigned startOffset, unsigned endOffset) JSC_FAST_CALL
    845845            : ExpressionNode(globalData, NumberType)
    846846            , ThrowableExpressionData(divot, startOffset, endOffset)
     
    855855    class PostfixResolveNode : public PrePostResolveNode {
    856856    public:
    857         PostfixResolveNode(JSGlobalData* globalData, const Identifier& ident, Operator oper, unsigned divot, unsigned startOffset, unsigned endOffset) KJS_FAST_CALL
     857        PostfixResolveNode(JSGlobalData* globalData, const Identifier& ident, Operator oper, unsigned divot, unsigned startOffset, unsigned endOffset) JSC_FAST_CALL
    858858            : PrePostResolveNode(globalData, ident, divot, startOffset, endOffset)
    859859            , m_operator(oper)
     
    861861        }
    862862
    863         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    864         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     863        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     864        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    865865        virtual Precedence precedence() const { return PrecPostfix; }
    866866
     
    871871    class PostfixBracketNode : public ExpressionNode, public ThrowableSubExpressionData {
    872872    public:
    873         PostfixBracketNode(JSGlobalData* globalData, ExpressionNode* base, ExpressionNode* subscript, Operator oper, unsigned divot, unsigned startOffset, unsigned endOffset) KJS_FAST_CALL
     873        PostfixBracketNode(JSGlobalData* globalData, ExpressionNode* base, ExpressionNode* subscript, Operator oper, unsigned divot, unsigned startOffset, unsigned endOffset) JSC_FAST_CALL
    874874            : ExpressionNode(globalData)
    875875            , ThrowableSubExpressionData(divot, startOffset, endOffset)
     
    880880        }
    881881
    882         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    883         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     882        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     883        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    884884        virtual Precedence precedence() const { return PrecPostfix; }
    885885
     
    892892    class PostfixDotNode : public ExpressionNode, public ThrowableSubExpressionData {
    893893    public:
    894         PostfixDotNode(JSGlobalData* globalData, ExpressionNode* base, const Identifier& ident, Operator oper, unsigned divot, unsigned startOffset, unsigned endOffset) KJS_FAST_CALL
     894        PostfixDotNode(JSGlobalData* globalData, ExpressionNode* base, const Identifier& ident, Operator oper, unsigned divot, unsigned startOffset, unsigned endOffset) JSC_FAST_CALL
    895895            : ExpressionNode(globalData)
    896896            , ThrowableSubExpressionData(divot, startOffset, endOffset)
     
    901901        }
    902902
    903         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    904         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     903        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     904        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    905905        virtual Precedence precedence() const { return PrecPostfix; }
    906906
     
    913913    class PostfixErrorNode : public ExpressionNode, public ThrowableSubExpressionData {
    914914    public:
    915         PostfixErrorNode(JSGlobalData* globalData, ExpressionNode* expr, Operator oper, unsigned divot, unsigned startOffset, unsigned endOffset) KJS_FAST_CALL
     915        PostfixErrorNode(JSGlobalData* globalData, ExpressionNode* expr, Operator oper, unsigned divot, unsigned startOffset, unsigned endOffset) JSC_FAST_CALL
    916916            : ExpressionNode(globalData)
    917917            , ThrowableSubExpressionData(divot, startOffset, endOffset)
     
    921921        }
    922922
    923         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    924         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     923        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     924        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    925925        virtual Precedence precedence() const { return PrecPostfix; }
    926926
     
    932932    class DeleteResolveNode : public ExpressionNode, public ThrowableExpressionData {
    933933    public:
    934         DeleteResolveNode(JSGlobalData* globalData, const Identifier& ident, unsigned divot, unsigned startOffset, unsigned endOffset) KJS_FAST_CALL
     934        DeleteResolveNode(JSGlobalData* globalData, const Identifier& ident, unsigned divot, unsigned startOffset, unsigned endOffset) JSC_FAST_CALL
    935935            : ExpressionNode(globalData)
    936936            , ThrowableExpressionData(divot, startOffset, endOffset)
     
    939939        }
    940940
    941         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    942 
    943         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     941        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     942
     943        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    944944        virtual Precedence precedence() const { return PrecUnary; }
    945945
     
    950950    class DeleteBracketNode : public ExpressionNode, public ThrowableExpressionData {
    951951    public:
    952         DeleteBracketNode(JSGlobalData* globalData, ExpressionNode* base, ExpressionNode* subscript, unsigned divot, unsigned startOffset, unsigned endOffset) KJS_FAST_CALL
     952        DeleteBracketNode(JSGlobalData* globalData, ExpressionNode* base, ExpressionNode* subscript, unsigned divot, unsigned startOffset, unsigned endOffset) JSC_FAST_CALL
    953953            : ExpressionNode(globalData)
    954954            , ThrowableExpressionData(divot, startOffset, endOffset)
     
    958958        }
    959959
    960         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    961 
    962         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     960        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     961
     962        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    963963        virtual Precedence precedence() const { return PrecUnary; }
    964964
     
    970970    class DeleteDotNode : public ExpressionNode, public ThrowableExpressionData {
    971971    public:
    972         DeleteDotNode(JSGlobalData* globalData, ExpressionNode* base, const Identifier& ident, unsigned divot, unsigned startOffset, unsigned endOffset) KJS_FAST_CALL
     972        DeleteDotNode(JSGlobalData* globalData, ExpressionNode* base, const Identifier& ident, unsigned divot, unsigned startOffset, unsigned endOffset) JSC_FAST_CALL
    973973            : ExpressionNode(globalData)
    974974            , ThrowableExpressionData(divot, startOffset, endOffset)
     
    978978        }
    979979
    980         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    981 
    982         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     980        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     981
     982        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    983983        virtual Precedence precedence() const { return PrecUnary; }
    984984
     
    990990    class DeleteValueNode : public ExpressionNode {
    991991    public:
    992         DeleteValueNode(JSGlobalData* globalData, ExpressionNode* expr) KJS_FAST_CALL
     992        DeleteValueNode(JSGlobalData* globalData, ExpressionNode* expr) JSC_FAST_CALL
    993993            : ExpressionNode(globalData)
    994994            , m_expr(expr)
     
    996996        }
    997997
    998         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    999 
    1000         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     998        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     999
     1000        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    10011001        virtual Precedence precedence() const { return PrecUnary; }
    10021002
     
    10071007    class VoidNode : public ExpressionNode {
    10081008    public:
    1009         VoidNode(JSGlobalData* globalData, ExpressionNode* expr) KJS_FAST_CALL
     1009        VoidNode(JSGlobalData* globalData, ExpressionNode* expr) JSC_FAST_CALL
    10101010            : ExpressionNode(globalData)
    10111011            , m_expr(expr)
     
    10131013        }
    10141014
    1015         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1016 
    1017         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1015        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1016
     1017        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    10181018        virtual Precedence precedence() const { return PrecUnary; }
    10191019
     
    10241024    class TypeOfResolveNode : public ExpressionNode {
    10251025    public:
    1026         TypeOfResolveNode(JSGlobalData* globalData, const Identifier& ident) KJS_FAST_CALL
     1026        TypeOfResolveNode(JSGlobalData* globalData, const Identifier& ident) JSC_FAST_CALL
    10271027            : ExpressionNode(globalData, StringType)
    10281028            , m_ident(ident)
     
    10301030        }
    10311031
    1032         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1033 
    1034         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1032        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1033
     1034        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    10351035        virtual Precedence precedence() const { return PrecUnary; }
    10361036
    1037         const Identifier& identifier() const KJS_FAST_CALL { return m_ident; }
     1037        const Identifier& identifier() const JSC_FAST_CALL { return m_ident; }
    10381038
    10391039    protected:
     
    10441044    class TypeOfValueNode : public ExpressionNode {
    10451045    public:
    1046         TypeOfValueNode(JSGlobalData* globalData, ExpressionNode* expr) KJS_FAST_CALL
     1046        TypeOfValueNode(JSGlobalData* globalData, ExpressionNode* expr) JSC_FAST_CALL
    10471047            : ExpressionNode(globalData, StringType)
    10481048            , m_expr(expr)
     
    10501050        }
    10511051
    1052         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1053 
    1054         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1052        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1053
     1054        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    10551055        virtual Precedence precedence() const { return PrecUnary; }
    10561056
     
    10611061    class PrefixResolveNode : public PrePostResolveNode {
    10621062    public:
    1063         PrefixResolveNode(JSGlobalData* globalData, const Identifier& ident, Operator oper, unsigned divot, unsigned startOffset, unsigned endOffset) KJS_FAST_CALL
     1063        PrefixResolveNode(JSGlobalData* globalData, const Identifier& ident, Operator oper, unsigned divot, unsigned startOffset, unsigned endOffset) JSC_FAST_CALL
    10641064            : PrePostResolveNode(globalData, ident, divot, startOffset, endOffset)
    10651065            , m_operator(oper)
     
    10671067        }
    10681068
    1069         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1070 
    1071         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1069        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1070
     1071        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    10721072        virtual Precedence precedence() const { return PrecUnary; }
    10731073
     
    10781078    class PrefixBracketNode : public ExpressionNode, public ThrowablePrefixedSubExpressionData {
    10791079    public:
    1080         PrefixBracketNode(JSGlobalData* globalData, ExpressionNode* base, ExpressionNode* subscript, Operator oper, unsigned divot, unsigned startOffset, unsigned endOffset) KJS_FAST_CALL
     1080        PrefixBracketNode(JSGlobalData* globalData, ExpressionNode* base, ExpressionNode* subscript, Operator oper, unsigned divot, unsigned startOffset, unsigned endOffset) JSC_FAST_CALL
    10811081            : ExpressionNode(globalData)
    10821082            , ThrowablePrefixedSubExpressionData(divot, startOffset, endOffset)
     
    10871087        }
    10881088
    1089         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1090         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1089        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1090        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    10911091        virtual Precedence precedence() const { return PrecUnary; }
    10921092
     
    10991099    class PrefixDotNode : public ExpressionNode, public ThrowablePrefixedSubExpressionData {
    11001100    public:
    1101         PrefixDotNode(JSGlobalData* globalData, ExpressionNode* base, const Identifier& ident, Operator oper, unsigned divot, unsigned startOffset, unsigned endOffset) KJS_FAST_CALL
     1101        PrefixDotNode(JSGlobalData* globalData, ExpressionNode* base, const Identifier& ident, Operator oper, unsigned divot, unsigned startOffset, unsigned endOffset) JSC_FAST_CALL
    11021102            : ExpressionNode(globalData)
    11031103            , ThrowablePrefixedSubExpressionData(divot, startOffset, endOffset)
     
    11081108        }
    11091109
    1110         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1111         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1110        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1111        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    11121112        virtual Precedence precedence() const { return PrecPostfix; }
    11131113
     
    11201120    class PrefixErrorNode : public ExpressionNode, public ThrowableExpressionData {
    11211121    public:
    1122         PrefixErrorNode(JSGlobalData* globalData, ExpressionNode* expr, Operator oper, unsigned divot, unsigned startOffset, unsigned endOffset) KJS_FAST_CALL
     1122        PrefixErrorNode(JSGlobalData* globalData, ExpressionNode* expr, Operator oper, unsigned divot, unsigned startOffset, unsigned endOffset) JSC_FAST_CALL
    11231123            : ExpressionNode(globalData)
    11241124            , ThrowableExpressionData(divot, startOffset, endOffset)
     
    11281128        }
    11291129
    1130         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1131         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1130        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1131        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    11321132        virtual Precedence precedence() const { return PrecUnary; }
    11331133
     
    11511151        }
    11521152
    1153         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1154         virtual OpcodeID opcode() const KJS_FAST_CALL = 0;
     1153        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1154        virtual OpcodeID opcode() const JSC_FAST_CALL = 0;
    11551155
    11561156    protected:
     
    11601160    class UnaryPlusNode : public UnaryOpNode {
    11611161    public:
    1162         UnaryPlusNode(JSGlobalData* globalData, ExpressionNode* expr) KJS_FAST_CALL
     1162        UnaryPlusNode(JSGlobalData* globalData, ExpressionNode* expr) JSC_FAST_CALL
    11631163            : UnaryOpNode(globalData, NumberType, expr)
    11641164        {
    11651165        }
    11661166
    1167         virtual OpcodeID opcode() const KJS_FAST_CALL { return op_to_jsnumber; }
    1168         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1167        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_to_jsnumber; }
     1168        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    11691169        virtual Precedence precedence() const { return PrecUnary; }
    11701170    };
     
    11721172    class NegateNode : public UnaryOpNode {
    11731173    public:
    1174         NegateNode(JSGlobalData* globalData, ExpressionNode* expr) KJS_FAST_CALL
     1174        NegateNode(JSGlobalData* globalData, ExpressionNode* expr) JSC_FAST_CALL
    11751175            : UnaryOpNode(globalData, NumberType, expr)
    11761176        {
    11771177        }
    11781178
    1179         virtual OpcodeID opcode() const KJS_FAST_CALL { return op_negate; }
    1180         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1179        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_negate; }
     1180        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    11811181        virtual Precedence precedence() const { return PrecUnary; }
    11821182    };
     
    11841184    class BitwiseNotNode : public UnaryOpNode {
    11851185    public:
    1186         BitwiseNotNode(JSGlobalData* globalData, ExpressionNode* expr) KJS_FAST_CALL
     1186        BitwiseNotNode(JSGlobalData* globalData, ExpressionNode* expr) JSC_FAST_CALL
    11871187            : UnaryOpNode(globalData, NumberType, expr)
    11881188        {
    11891189        }
    11901190
    1191         virtual OpcodeID opcode() const KJS_FAST_CALL { return op_bitnot; }
    1192         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1191        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_bitnot; }
     1192        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    11931193        virtual Precedence precedence() const { return PrecUnary; }
    11941194    };
     
    11961196    class LogicalNotNode : public UnaryOpNode {
    11971197    public:
    1198         LogicalNotNode(JSGlobalData* globalData, ExpressionNode* expr) KJS_FAST_CALL
     1198        LogicalNotNode(JSGlobalData* globalData, ExpressionNode* expr) JSC_FAST_CALL
    11991199            : UnaryOpNode(globalData, BooleanType, expr)
    12001200        {
    12011201        }
    12021202
    1203         virtual OpcodeID opcode() const KJS_FAST_CALL { return op_not; }
    1204         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1203        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_not; }
     1204        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    12051205        virtual Precedence precedence() const { return PrecUnary; }
    12061206    };
     
    12241224        }
    12251225
    1226         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1227         virtual OpcodeID opcode() const KJS_FAST_CALL = 0;
     1226        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1227        virtual OpcodeID opcode() const JSC_FAST_CALL = 0;
    12281228
    12291229    protected:
     
    12511251        }
    12521252
    1253         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1254         virtual OpcodeID opcode() const KJS_FAST_CALL = 0;
     1253        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1254        virtual OpcodeID opcode() const JSC_FAST_CALL = 0;
    12551255
    12561256    protected:
     
    12621262    class MultNode : public BinaryOpNode {
    12631263    public:
    1264         MultNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1264        MultNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
    12651265            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
    12661266        {
    12671267        }
    12681268
    1269         virtual OpcodeID opcode() const KJS_FAST_CALL { return op_mul; }
    1270         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1269        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_mul; }
     1270        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    12711271        virtual Precedence precedence() const { return PrecMultiplicative; }
    12721272    };
     
    12741274    class DivNode : public BinaryOpNode {
    12751275    public:
    1276         DivNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1276        DivNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
    12771277            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
    12781278        {
    12791279        }
    12801280
    1281         virtual OpcodeID opcode() const KJS_FAST_CALL { return op_div; }
    1282         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1281        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_div; }
     1282        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    12831283        virtual Precedence precedence() const { return PrecMultiplicative; }
    12841284    };
     
    12861286    class ModNode : public BinaryOpNode {
    12871287    public:
    1288         ModNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1288        ModNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
    12891289            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
    12901290        {
    12911291        }
    12921292
    1293         virtual OpcodeID opcode() const KJS_FAST_CALL { return op_mod; }
    1294         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1293        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_mod; }
     1294        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    12951295        virtual Precedence precedence() const { return PrecMultiplicative; }
    12961296    };
     
    12981298    class AddNode : public BinaryOpNode {
    12991299    public:
    1300         AddNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1300        AddNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
    13011301            : BinaryOpNode(globalData, expr1, expr2, rightHasAssignments)
    13021302        {
    13031303        }
    13041304
    1305         virtual OpcodeID opcode() const KJS_FAST_CALL { return op_add; }
    1306         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1305        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_add; }
     1306        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    13071307        virtual Precedence precedence() const { return PrecAdditive; }
    13081308    };
     
    13101310    class SubNode : public BinaryOpNode {
    13111311    public:
    1312         SubNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1312        SubNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
    13131313            : BinaryOpNode(globalData, expr1, expr2, rightHasAssignments)
    13141314        {
    13151315        }
    13161316
    1317         virtual OpcodeID opcode() const KJS_FAST_CALL { return op_sub; }
    1318         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1317        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_sub; }
     1318        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    13191319        virtual Precedence precedence() const { return PrecAdditive; }
    13201320    };
     
    13221322    class LeftShiftNode : public BinaryOpNode {
    13231323    public:
    1324         LeftShiftNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1324        LeftShiftNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
    13251325            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
    13261326        {
    13271327        }
    13281328
    1329         virtual OpcodeID opcode() const KJS_FAST_CALL { return op_lshift; }
    1330         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1329        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_lshift; }
     1330        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    13311331        virtual Precedence precedence() const { return PrecShift; }
    13321332    };
     
    13341334    class RightShiftNode : public BinaryOpNode {
    13351335    public:
    1336         RightShiftNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1336        RightShiftNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
    13371337            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
    13381338        {
    13391339        }
    13401340
    1341         virtual OpcodeID opcode() const KJS_FAST_CALL { return op_rshift; }
    1342         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1341        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_rshift; }
     1342        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    13431343        virtual Precedence precedence() const { return PrecShift; }
    13441344    };
     
    13461346    class UnsignedRightShiftNode : public BinaryOpNode {
    13471347    public:
    1348         UnsignedRightShiftNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1348        UnsignedRightShiftNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
    13491349            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
    13501350        {
    13511351        }
    13521352
    1353         virtual OpcodeID opcode() const KJS_FAST_CALL { return op_urshift; }
    1354         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1353        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_urshift; }
     1354        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    13551355        virtual Precedence precedence() const { return PrecShift; }
    13561356    };
     
    13581358    class LessNode : public BinaryOpNode {
    13591359    public:
    1360         LessNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1360        LessNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
    13611361            : BinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
    13621362        {
    13631363        }
    13641364
    1365         virtual OpcodeID opcode() const KJS_FAST_CALL { return op_less; }
    1366         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1365        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_less; }
     1366        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    13671367        virtual Precedence precedence() const { return PrecRelational; }
    13681368    };
     
    13701370    class GreaterNode : public ReverseBinaryOpNode {
    13711371    public:
    1372         GreaterNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1372        GreaterNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
    13731373            : ReverseBinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
    13741374        {
    13751375        }
    13761376
    1377         virtual OpcodeID opcode() const KJS_FAST_CALL { return op_less; }
    1378         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1377        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_less; }
     1378        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    13791379        virtual Precedence precedence() const { return PrecRelational; }
    13801380    };
     
    13821382    class LessEqNode : public BinaryOpNode {
    13831383    public:
    1384         LessEqNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1384        LessEqNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
    13851385            : BinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
    13861386        {
    13871387        }
    13881388
    1389         virtual OpcodeID opcode() const KJS_FAST_CALL { return op_lesseq; }
    1390         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1389        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_lesseq; }
     1390        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    13911391        virtual Precedence precedence() const { return PrecRelational; }
    13921392    };
     
    13941394    class GreaterEqNode : public ReverseBinaryOpNode {
    13951395    public:
    1396         GreaterEqNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1396        GreaterEqNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
    13971397            : ReverseBinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
    13981398        {
    13991399        }
    14001400
    1401         virtual OpcodeID opcode() const KJS_FAST_CALL { return op_lesseq; }
    1402         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1401        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_lesseq; }
     1402        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    14031403        virtual Precedence precedence() const { return PrecRelational; }
    14041404    };
     
    14061406    class ThrowableBinaryOpNode : public BinaryOpNode, public ThrowableExpressionData {
    14071407    public:
    1408         ThrowableBinaryOpNode(JSGlobalData* globalData, JSType type, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1408        ThrowableBinaryOpNode(JSGlobalData* globalData, JSType type, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
    14091409            : BinaryOpNode(globalData, type, expr1, expr2, rightHasAssignments)
    14101410        {
    14111411        }
    1412         ThrowableBinaryOpNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1412        ThrowableBinaryOpNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
    14131413            : BinaryOpNode(globalData, expr1, expr2, rightHasAssignments)
    14141414        {
    14151415        }
    1416         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
     1416        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    14171417    };
    14181418   
    14191419    class InstanceOfNode : public ThrowableBinaryOpNode {
    14201420    public:
    1421         InstanceOfNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1421        InstanceOfNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
    14221422            : ThrowableBinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
    14231423        {
    14241424        }
    14251425
    1426         virtual OpcodeID opcode() const KJS_FAST_CALL { return op_instanceof; }
    1427         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1426        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_instanceof; }
     1427        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    14281428        virtual Precedence precedence() const { return PrecRelational; }
    14291429    };
     
    14311431    class InNode : public ThrowableBinaryOpNode {
    14321432    public:
    1433         InNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1433        InNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
    14341434            : ThrowableBinaryOpNode(globalData, expr1, expr2, rightHasAssignments)
    14351435        {
    14361436        }
    14371437
    1438         virtual OpcodeID opcode() const KJS_FAST_CALL { return op_in; }
    1439         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1438        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_in; }
     1439        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    14401440        virtual Precedence precedence() const { return PrecRelational; }
    14411441    };
     
    14431443    class EqualNode : public BinaryOpNode {
    14441444    public:
    1445         EqualNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1445        EqualNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
    14461446            : BinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
    14471447        {
    14481448        }
    14491449
    1450         virtual OpcodeID opcode() const KJS_FAST_CALL { return op_eq; }
    1451         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1450        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_eq; }
     1451        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    14521452        virtual Precedence precedence() const { return PrecEquality; }
    14531453    };
     
    14551455    class NotEqualNode : public BinaryOpNode {
    14561456    public:
    1457         NotEqualNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1457        NotEqualNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
    14581458            : BinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
    14591459        {
    14601460        }
    14611461
    1462         virtual OpcodeID opcode() const KJS_FAST_CALL { return op_neq; }
    1463         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1462        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_neq; }
     1463        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    14641464        virtual Precedence precedence() const { return PrecEquality; }
    14651465    };
     
    14671467    class StrictEqualNode : public BinaryOpNode {
    14681468    public:
    1469         StrictEqualNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1469        StrictEqualNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
    14701470            : BinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
    14711471        {
    14721472        }
    14731473
    1474         virtual OpcodeID opcode() const KJS_FAST_CALL { return op_stricteq; }
    1475         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1474        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_stricteq; }
     1475        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    14761476        virtual Precedence precedence() const { return PrecEquality; }
    14771477    };
     
    14791479    class NotStrictEqualNode : public BinaryOpNode {
    14801480    public:
    1481         NotStrictEqualNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1481        NotStrictEqualNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
    14821482            : BinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
    14831483        {
    14841484        }
    14851485
    1486         virtual OpcodeID opcode() const KJS_FAST_CALL { return op_nstricteq; }
    1487         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1486        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_nstricteq; }
     1487        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    14881488        virtual Precedence precedence() const { return PrecEquality; }
    14891489    };
     
    14911491    class BitAndNode : public BinaryOpNode {
    14921492    public:
    1493         BitAndNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1493        BitAndNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
    14941494            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
    14951495        {
    14961496        }
    14971497
    1498         virtual OpcodeID opcode() const KJS_FAST_CALL { return op_bitand; }
    1499         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1498        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_bitand; }
     1499        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    15001500        virtual Precedence precedence() const { return PrecBitwiseAnd; }
    15011501    };
     
    15031503    class BitOrNode : public BinaryOpNode {
    15041504    public:
    1505         BitOrNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1505        BitOrNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
    15061506            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
    15071507        {
    15081508        }
    15091509
    1510         virtual OpcodeID opcode() const KJS_FAST_CALL { return op_bitor; }
    1511         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1510        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_bitor; }
     1511        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    15121512        virtual Precedence precedence() const { return PrecBitwiseOr; }
    15131513    };
     
    15151515    class BitXOrNode : public BinaryOpNode {
    15161516    public:
    1517         BitXOrNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1517        BitXOrNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
    15181518            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
    15191519        {
    15201520        }
    15211521
    1522         virtual OpcodeID opcode() const KJS_FAST_CALL { return op_bitxor; }
    1523         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1522        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_bitxor; }
     1523        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    15241524        virtual Precedence precedence() const { return PrecBitwiseXor; }
    15251525    };
     
    15301530    class LogicalOpNode : public ExpressionNode {
    15311531    public:
    1532         LogicalOpNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, LogicalOperator oper) KJS_FAST_CALL
     1532        LogicalOpNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, LogicalOperator oper) JSC_FAST_CALL
    15331533            : ExpressionNode(globalData, BooleanType)
    15341534            , m_expr1(expr1)
     
    15381538        }
    15391539
    1540         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1541         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1540        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1541        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    15421542        virtual Precedence precedence() const { return (m_operator == OpLogicalAnd) ? PrecLogicalAnd : PrecLogicalOr; }
    15431543
     
    15531553    class ConditionalNode : public ExpressionNode {
    15541554    public:
    1555         ConditionalNode(JSGlobalData* globalData, ExpressionNode* logical, ExpressionNode* expr1, ExpressionNode* expr2) KJS_FAST_CALL
     1555        ConditionalNode(JSGlobalData* globalData, ExpressionNode* logical, ExpressionNode* expr1, ExpressionNode* expr2) JSC_FAST_CALL
    15561556            : ExpressionNode(globalData)
    15571557            , m_logical(logical)
     
    15611561        }
    15621562
    1563         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1564         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1563        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1564        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    15651565        virtual Precedence precedence() const { return PrecConditional; }
    15661566
     
    15731573    class ReadModifyResolveNode : public ExpressionNode, public ThrowableExpressionData {
    15741574    public:
    1575         ReadModifyResolveNode(JSGlobalData* globalData, const Identifier& ident, Operator oper, ExpressionNode*  right, bool rightHasAssignments, unsigned divot, unsigned startOffset, unsigned endOffset) KJS_FAST_CALL
     1575        ReadModifyResolveNode(JSGlobalData* globalData, const Identifier& ident, Operator oper, ExpressionNode*  right, bool rightHasAssignments, unsigned divot, unsigned startOffset, unsigned endOffset) JSC_FAST_CALL
    15761576            : ExpressionNode(globalData)
    15771577            , ThrowableExpressionData(divot, startOffset, endOffset)
     
    15831583        }
    15841584
    1585         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1586 
    1587         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1585        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1586
     1587        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    15881588        virtual Precedence precedence() const { return PrecAssignment; }
    15891589
     
    15981598    class AssignResolveNode : public ExpressionNode, public ThrowableExpressionData {
    15991599    public:
    1600         AssignResolveNode(JSGlobalData* globalData, const Identifier& ident, ExpressionNode* right, bool rightHasAssignments) KJS_FAST_CALL
     1600        AssignResolveNode(JSGlobalData* globalData, const Identifier& ident, ExpressionNode* right, bool rightHasAssignments) JSC_FAST_CALL
    16011601            : ExpressionNode(globalData)
    16021602            , m_ident(ident)
     
    16061606        }
    16071607
    1608         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1609 
    1610         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1608        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1609
     1610        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    16111611        virtual Precedence precedence() const { return PrecAssignment; }
    16121612
     
    16201620    class ReadModifyBracketNode : public ExpressionNode, public ThrowableSubExpressionData {
    16211621    public:
    1622         ReadModifyBracketNode(JSGlobalData* globalData, ExpressionNode* base, ExpressionNode* subscript, Operator oper, ExpressionNode* right, bool subscriptHasAssignments, bool rightHasAssignments, unsigned divot, unsigned startOffset, unsigned endOffset) KJS_FAST_CALL
     1622        ReadModifyBracketNode(JSGlobalData* globalData, ExpressionNode* base, ExpressionNode* subscript, Operator oper, ExpressionNode* right, bool subscriptHasAssignments, bool rightHasAssignments, unsigned divot, unsigned startOffset, unsigned endOffset) JSC_FAST_CALL
    16231623            : ExpressionNode(globalData)
    16241624            , ThrowableSubExpressionData(divot, startOffset, endOffset)
     
    16321632        }
    16331633
    1634         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1635 
    1636         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1634        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1635
     1636        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    16371637        virtual Precedence precedence() const { return PrecAssignment; }
    16381638
     
    16481648    class AssignBracketNode : public ExpressionNode, public ThrowableExpressionData {
    16491649    public:
    1650         AssignBracketNode(JSGlobalData* globalData, ExpressionNode* base, ExpressionNode* subscript, ExpressionNode* right, bool subscriptHasAssignments, bool rightHasAssignments, unsigned divot, unsigned startOffset, unsigned endOffset) KJS_FAST_CALL
     1650        AssignBracketNode(JSGlobalData* globalData, ExpressionNode* base, ExpressionNode* subscript, ExpressionNode* right, bool subscriptHasAssignments, bool rightHasAssignments, unsigned divot, unsigned startOffset, unsigned endOffset) JSC_FAST_CALL
    16511651            : ExpressionNode(globalData)
    16521652            , ThrowableExpressionData(divot, startOffset, endOffset)
     
    16591659        }
    16601660
    1661         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1662 
    1663         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1661        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1662
     1663        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    16641664        virtual Precedence precedence() const { return PrecAssignment; }
    16651665
     
    16741674    class AssignDotNode : public ExpressionNode, public ThrowableExpressionData {
    16751675    public:
    1676         AssignDotNode(JSGlobalData* globalData, ExpressionNode* base, const Identifier& ident, ExpressionNode* right, bool rightHasAssignments, unsigned divot, unsigned startOffset, unsigned endOffset) KJS_FAST_CALL
     1676        AssignDotNode(JSGlobalData* globalData, ExpressionNode* base, const Identifier& ident, ExpressionNode* right, bool rightHasAssignments, unsigned divot, unsigned startOffset, unsigned endOffset) JSC_FAST_CALL
    16771677            : ExpressionNode(globalData)
    16781678            , ThrowableExpressionData(divot, startOffset, endOffset)
     
    16841684        }
    16851685
    1686         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1687         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1686        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1687        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    16881688        virtual Precedence precedence() const { return PrecAssignment; }
    16891689
     
    16971697    class ReadModifyDotNode : public ExpressionNode, public ThrowableSubExpressionData {
    16981698    public:
    1699         ReadModifyDotNode(JSGlobalData* globalData, ExpressionNode* base, const Identifier& ident, Operator oper, ExpressionNode* right, bool rightHasAssignments, unsigned divot, unsigned startOffset, unsigned endOffset) KJS_FAST_CALL
     1699        ReadModifyDotNode(JSGlobalData* globalData, ExpressionNode* base, const Identifier& ident, Operator oper, ExpressionNode* right, bool rightHasAssignments, unsigned divot, unsigned startOffset, unsigned endOffset) JSC_FAST_CALL
    17001700            : ExpressionNode(globalData)
    17011701            , ThrowableSubExpressionData(divot, startOffset, endOffset)
     
    17081708        }
    17091709
    1710         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1711 
    1712         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1710        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1711
     1712        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    17131713        virtual Precedence precedence() const { return PrecAssignment; }
    17141714
     
    17231723    class AssignErrorNode : public ExpressionNode, public ThrowableExpressionData {
    17241724    public:
    1725         AssignErrorNode(JSGlobalData* globalData, ExpressionNode* left, Operator oper, ExpressionNode* right, unsigned divot, unsigned startOffset, unsigned endOffset) KJS_FAST_CALL
     1725        AssignErrorNode(JSGlobalData* globalData, ExpressionNode* left, Operator oper, ExpressionNode* right, unsigned divot, unsigned startOffset, unsigned endOffset) JSC_FAST_CALL
    17261726            : ExpressionNode(globalData)
    17271727            , ThrowableExpressionData(divot, startOffset, endOffset)
     
    17321732        }
    17331733
    1734         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1735         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1734        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1735        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    17361736        virtual Precedence precedence() const { return PrecAssignment; }
    17371737
     
    17441744    class CommaNode : public ExpressionNode {
    17451745    public:
    1746         CommaNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2) KJS_FAST_CALL
     1746        CommaNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2) JSC_FAST_CALL
    17471747            : ExpressionNode(globalData)
    17481748            , m_expr1(expr1)
     
    17511751        }
    17521752
    1753         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1754         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1753        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1754        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    17551755        virtual Precedence precedence() const { return PrecExpression; }
    17561756
     
    17621762    class VarDeclCommaNode : public CommaNode {
    17631763    public:
    1764         VarDeclCommaNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2) KJS_FAST_CALL
     1764        VarDeclCommaNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2) JSC_FAST_CALL
    17651765            : CommaNode(globalData, expr1, expr2)
    17661766        {
     
    17711771    class ConstDeclNode : public ExpressionNode {
    17721772    public:
    1773         ConstDeclNode(JSGlobalData* globalData, const Identifier& ident, ExpressionNode* in) KJS_FAST_CALL;
    1774 
    1775         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1773        ConstDeclNode(JSGlobalData* globalData, const Identifier& ident, ExpressionNode* in) JSC_FAST_CALL;
     1774
     1775        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    17761776        virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
    1777         PassRefPtr<ConstDeclNode> releaseNext() KJS_FAST_CALL { return m_next.release(); }
     1777        PassRefPtr<ConstDeclNode> releaseNext() JSC_FAST_CALL { return m_next.release(); }
    17781778
    17791779        Identifier m_ident;
     
    17811781        RefPtr<ExpressionNode> m_init;
    17821782       
    1783         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1784         virtual RegisterID* emitCodeSingle(CodeGenerator&) KJS_FAST_CALL;
     1783        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1784        virtual RegisterID* emitCodeSingle(CodeGenerator&) JSC_FAST_CALL;
    17851785    };
    17861786
    17871787    class ConstStatementNode : public StatementNode {
    17881788    public:
    1789         ConstStatementNode(JSGlobalData* globalData, ConstDeclNode* next) KJS_FAST_CALL
     1789        ConstStatementNode(JSGlobalData* globalData, ConstDeclNode* next) JSC_FAST_CALL
    17901790            : StatementNode(globalData)
    17911791            , m_next(next)
     
    17931793        }
    17941794
    1795         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1795        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    17961796       
    1797         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
     1797        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    17981798
    17991799    private:
     
    18201820    class BlockNode : public StatementNode {
    18211821    public:
    1822         BlockNode(JSGlobalData*, SourceElements* children) KJS_FAST_CALL;
    1823 
    1824         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1825         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1822        BlockNode(JSGlobalData*, SourceElements* children) JSC_FAST_CALL;
     1823
     1824        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1825        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    18261826
    18271827        StatementVector& children() { return m_children; }
     
    18331833    class EmptyStatementNode : public StatementNode {
    18341834    public:
    1835         EmptyStatementNode(JSGlobalData* globalData) KJS_FAST_CALL // debug
     1835        EmptyStatementNode(JSGlobalData* globalData) JSC_FAST_CALL // debug
    18361836            : StatementNode(globalData)
    18371837        {
    18381838        }
    18391839
    1840         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1841 
    1842         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
    1843         virtual bool isEmptyStatement() const KJS_FAST_CALL { return true; }
     1840        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1841
     1842        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
     1843        virtual bool isEmptyStatement() const JSC_FAST_CALL { return true; }
    18441844    };
    18451845   
    18461846    class DebuggerStatementNode : public StatementNode {
    18471847    public:
    1848         DebuggerStatementNode(JSGlobalData* globalData) KJS_FAST_CALL
     1848        DebuggerStatementNode(JSGlobalData* globalData) JSC_FAST_CALL
    18491849            : StatementNode(globalData)
    18501850        {
    18511851        }
    18521852       
    1853         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1854 
    1855         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1853        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1854
     1855        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    18561856    };
    18571857
    18581858    class ExprStatementNode : public StatementNode {
    18591859    public:
    1860         ExprStatementNode(JSGlobalData* globalData, ExpressionNode* expr) KJS_FAST_CALL
     1860        ExprStatementNode(JSGlobalData* globalData, ExpressionNode* expr) JSC_FAST_CALL
    18611861            : StatementNode(globalData)
    18621862            , m_expr(expr)
     
    18641864        }
    18651865
    1866         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1867         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1866        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1867        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    18681868
    18691869    private:
     
    18731873    class VarStatementNode : public StatementNode {
    18741874    public:
    1875         VarStatementNode(JSGlobalData* globalData, ExpressionNode* expr) KJS_FAST_CALL
     1875        VarStatementNode(JSGlobalData* globalData, ExpressionNode* expr) JSC_FAST_CALL
    18761876            : StatementNode(globalData)
    18771877            , m_expr(expr)
     
    18791879        }
    18801880       
    1881         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1882 
    1883         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1881        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1882
     1883        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    18841884
    18851885    private:
     
    18891889    class IfNode : public StatementNode {
    18901890    public:
    1891         IfNode(JSGlobalData* globalData, ExpressionNode* condition, StatementNode* ifBlock) KJS_FAST_CALL
     1891        IfNode(JSGlobalData* globalData, ExpressionNode* condition, StatementNode* ifBlock) JSC_FAST_CALL
    18921892            : StatementNode(globalData)
    18931893            , m_condition(condition)
     
    18961896        }
    18971897
    1898         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1899         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1898        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1899        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    19001900
    19011901    protected:
     
    19061906    class IfElseNode : public IfNode {
    19071907    public:
    1908         IfElseNode(JSGlobalData* globalData, ExpressionNode* condition, StatementNode* ifBlock, StatementNode* elseBlock) KJS_FAST_CALL
     1908        IfElseNode(JSGlobalData* globalData, ExpressionNode* condition, StatementNode* ifBlock, StatementNode* elseBlock) JSC_FAST_CALL
    19091909            : IfNode(globalData, condition, ifBlock)
    19101910            , m_elseBlock(elseBlock)
     
    19121912        }
    19131913
    1914         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1915         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1914        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1915        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    19161916
    19171917    private:
     
    19211921    class DoWhileNode : public StatementNode {
    19221922    public:
    1923         DoWhileNode(JSGlobalData* globalData, StatementNode* statement, ExpressionNode* expr) KJS_FAST_CALL
     1923        DoWhileNode(JSGlobalData* globalData, StatementNode* statement, ExpressionNode* expr) JSC_FAST_CALL
    19241924            : StatementNode(globalData)
    19251925            , m_statement(statement)
     
    19281928        }
    19291929
    1930         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1931         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1930        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1931        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    19321932
    19331933    private:
     
    19381938    class WhileNode : public StatementNode {
    19391939    public:
    1940         WhileNode(JSGlobalData* globalData, ExpressionNode* expr, StatementNode* statement) KJS_FAST_CALL
     1940        WhileNode(JSGlobalData* globalData, ExpressionNode* expr, StatementNode* statement) JSC_FAST_CALL
    19411941            : StatementNode(globalData)
    19421942            , m_expr(expr)
     
    19451945        }
    19461946
    1947         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1948         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1947        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1948        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    19491949
    19501950    private:
     
    19551955    class ForNode : public StatementNode {
    19561956    public:
    1957         ForNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, ExpressionNode* expr3, StatementNode* statement, bool expr1WasVarDecl) KJS_FAST_CALL
     1957        ForNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, ExpressionNode* expr3, StatementNode* statement, bool expr1WasVarDecl) JSC_FAST_CALL
    19581958            : StatementNode(globalData)
    19591959            , m_expr1(expr1)
     
    19661966        }
    19671967
    1968         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1969         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1968        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1969        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    19701970
    19711971    private:
     
    19791979    class ForInNode : public StatementNode, public ThrowableExpressionData {
    19801980    public:
    1981         ForInNode(JSGlobalData*, ExpressionNode*, ExpressionNode*, StatementNode*) KJS_FAST_CALL;
    1982         ForInNode(JSGlobalData*, const Identifier&, ExpressionNode*, ExpressionNode*, StatementNode*, int divot, int startOffset, int endOffset) KJS_FAST_CALL;
     1981        ForInNode(JSGlobalData*, ExpressionNode*, ExpressionNode*, StatementNode*) JSC_FAST_CALL;
     1982        ForInNode(JSGlobalData*, const Identifier&, ExpressionNode*, ExpressionNode*, StatementNode*, int divot, int startOffset, int endOffset) JSC_FAST_CALL;
    19831983       
    1984         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    1985         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     1984        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1985        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    19861986
    19871987    private:
     
    19961996    class ContinueNode : public StatementNode, public ThrowableExpressionData {
    19971997    public:
    1998         ContinueNode(JSGlobalData* globalData) KJS_FAST_CALL
     1998        ContinueNode(JSGlobalData* globalData) JSC_FAST_CALL
    19991999            : StatementNode(globalData)
    20002000        {
    20012001        }
    20022002
    2003         ContinueNode(JSGlobalData* globalData, const Identifier& ident) KJS_FAST_CALL
     2003        ContinueNode(JSGlobalData* globalData, const Identifier& ident) JSC_FAST_CALL
    20042004            : StatementNode(globalData)
    20052005            , m_ident(ident)
     
    20072007        }
    20082008       
    2009         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    2010         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     2009        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     2010        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    20112011
    20122012    private:
     
    20162016    class BreakNode : public StatementNode, public ThrowableExpressionData {
    20172017    public:
    2018         BreakNode(JSGlobalData* globalData) KJS_FAST_CALL
     2018        BreakNode(JSGlobalData* globalData) JSC_FAST_CALL
    20192019            : StatementNode(globalData)
    20202020        {
    20212021        }
    20222022
    2023         BreakNode(JSGlobalData* globalData, const Identifier& ident) KJS_FAST_CALL
     2023        BreakNode(JSGlobalData* globalData, const Identifier& ident) JSC_FAST_CALL
    20242024            : StatementNode(globalData)
    20252025            , m_ident(ident)
     
    20272027        }
    20282028       
    2029         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    2030         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     2029        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     2030        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    20312031
    20322032    private:
     
    20362036    class ReturnNode : public StatementNode, public ThrowableExpressionData {
    20372037    public:
    2038         ReturnNode(JSGlobalData* globalData, ExpressionNode* value) KJS_FAST_CALL
     2038        ReturnNode(JSGlobalData* globalData, ExpressionNode* value) JSC_FAST_CALL
    20392039            : StatementNode(globalData)
    20402040            , m_value(value)
     
    20422042        }
    20432043
    2044         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    2045         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
    2046         virtual bool isReturnNode() const KJS_FAST_CALL { return true; }
     2044        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     2045        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
     2046        virtual bool isReturnNode() const JSC_FAST_CALL { return true; }
    20472047
    20482048    private:
     
    20522052    class WithNode : public StatementNode {
    20532053    public:
    2054         WithNode(JSGlobalData* globalData, ExpressionNode* expr, StatementNode* statement, uint32_t divot, uint32_t expressionLength) KJS_FAST_CALL
     2054        WithNode(JSGlobalData* globalData, ExpressionNode* expr, StatementNode* statement, uint32_t divot, uint32_t expressionLength) JSC_FAST_CALL
    20552055            : StatementNode(globalData)
    20562056            , m_expr(expr)
     
    20612061        }
    20622062
    2063         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    2064         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     2063        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     2064        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    20652065
    20662066    private:
     
    20732073    class LabelNode : public StatementNode, public ThrowableExpressionData {
    20742074    public:
    2075         LabelNode(JSGlobalData* globalData, const Identifier& label, StatementNode* statement) KJS_FAST_CALL
     2075        LabelNode(JSGlobalData* globalData, const Identifier& label, StatementNode* statement) JSC_FAST_CALL
    20762076            : StatementNode(globalData)
    20772077            , m_label(label)
     
    20802080        }
    20812081
    2082         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    2083         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
    2084         virtual void pushLabel(const Identifier& ident) KJS_FAST_CALL { m_statement->pushLabel(ident); }
     2082        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     2083        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
     2084        virtual void pushLabel(const Identifier& ident) JSC_FAST_CALL { m_statement->pushLabel(ident); }
    20852085
    20862086    private:
     
    20912091    class ThrowNode : public StatementNode, public ThrowableExpressionData {
    20922092    public:
    2093         ThrowNode(JSGlobalData* globalData, ExpressionNode* expr) KJS_FAST_CALL
     2093        ThrowNode(JSGlobalData* globalData, ExpressionNode* expr) JSC_FAST_CALL
    20942094            : StatementNode(globalData)
    20952095            , m_expr(expr)
     
    20972097        }
    20982098
    2099         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    2100         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     2099        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     2100        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    21012101
    21022102    private:
     
    21062106    class TryNode : public StatementNode {
    21072107    public:
    2108         TryNode(JSGlobalData* globalData, StatementNode* tryBlock, const Identifier& exceptionIdent, StatementNode* catchBlock, StatementNode* finallyBlock) KJS_FAST_CALL
     2108        TryNode(JSGlobalData* globalData, StatementNode* tryBlock, const Identifier& exceptionIdent, StatementNode* catchBlock, StatementNode* finallyBlock) JSC_FAST_CALL
    21092109            : StatementNode(globalData)
    21102110            , m_tryBlock(tryBlock)
     
    21152115        }
    21162116
    2117         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
    2118 
    2119         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* dst = 0) KJS_FAST_CALL;
     2117        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
     2118
     2119        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* dst = 0) JSC_FAST_CALL;
    21202120
    21212121    private:
     
    21282128    class ParameterNode : public Node {
    21292129    public:
    2130         ParameterNode(JSGlobalData* globalData, const Identifier& ident) KJS_FAST_CALL
     2130        ParameterNode(JSGlobalData* globalData, const Identifier& ident) JSC_FAST_CALL
    21312131            : Node(globalData)
    21322132            , m_ident(ident)
     
    21342134        }
    21352135
    2136         ParameterNode(JSGlobalData* globalData, ParameterNode* l, const Identifier& ident) KJS_FAST_CALL
     2136        ParameterNode(JSGlobalData* globalData, ParameterNode* l, const Identifier& ident) JSC_FAST_CALL
    21372137            : Node(globalData)
    21382138            , m_ident(ident)
     
    21412141        }
    21422142
    2143         Identifier ident() KJS_FAST_CALL { return m_ident; }
    2144         ParameterNode *nextParam() KJS_FAST_CALL { return m_next.get(); }
    2145         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
    2146         PassRefPtr<ParameterNode> releaseNext() KJS_FAST_CALL { return m_next.release(); }
     2143        Identifier ident() JSC_FAST_CALL { return m_ident; }
     2144        ParameterNode *nextParam() JSC_FAST_CALL { return m_next.get(); }
     2145        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
     2146        PassRefPtr<ParameterNode> releaseNext() JSC_FAST_CALL { return m_next.release(); }
    21472147        virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
    21482148
     
    21562156    class ScopeNode : public BlockNode {
    21572157    public:
    2158         ScopeNode(JSGlobalData*, SourceElements*, VarStack*, FunctionStack*, bool usesEval, bool needsClosure, int numConstants) KJS_FAST_CALL;
    2159 
    2160         int sourceId() const KJS_FAST_CALL { return m_sourceId; }
    2161         const UString& sourceURL() const KJS_FAST_CALL { return m_sourceURL; }
    2162         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     2158        ScopeNode(JSGlobalData*, SourceElements*, VarStack*, FunctionStack*, bool usesEval, bool needsClosure, int numConstants) JSC_FAST_CALL;
     2159
     2160        int sourceId() const JSC_FAST_CALL { return m_sourceId; }
     2161        const UString& sourceURL() const JSC_FAST_CALL { return m_sourceURL; }
     2162        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    21632163       
    21642164        bool usesEval() const { return m_usesEval; }
     
    21892189    class ProgramNode : public ScopeNode {
    21902190    public:
    2191         static ProgramNode* create(JSGlobalData*, SourceElements*, VarStack*, FunctionStack*, SourceProvider*, bool usesEval, bool needsClosure, int numConstants) KJS_FAST_CALL;
    2192 
    2193         ProgramCodeBlock& byteCode(ScopeChainNode* scopeChain) KJS_FAST_CALL
     2191        static ProgramNode* create(JSGlobalData*, SourceElements*, VarStack*, FunctionStack*, SourceProvider*, bool usesEval, bool needsClosure, int numConstants) JSC_FAST_CALL;
     2192
     2193        ProgramCodeBlock& byteCode(ScopeChainNode* scopeChain) JSC_FAST_CALL
    21942194        {
    21952195            if (!m_code)
     
    21992199
    22002200    private:
    2201         ProgramNode(JSGlobalData*, SourceElements*, VarStack*, FunctionStack*, SourceProvider*, bool usesEval, bool needsClosure, int numConstants) KJS_FAST_CALL;
    2202 
    2203         void generateCode(ScopeChainNode*) KJS_FAST_CALL;
    2204         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
     2201        ProgramNode(JSGlobalData*, SourceElements*, VarStack*, FunctionStack*, SourceProvider*, bool usesEval, bool needsClosure, int numConstants) JSC_FAST_CALL;
     2202
     2203        void generateCode(ScopeChainNode*) JSC_FAST_CALL;
     2204        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    22052205
    22062206        Vector<size_t> m_varIndexes; // Storage indexes belonging to the nodes in m_varStack. (Recorded to avoid double lookup.)
     
    22142214    class EvalNode : public ScopeNode {
    22152215    public:
    2216         static EvalNode* create(JSGlobalData*, SourceElements*, VarStack*, FunctionStack*, SourceProvider*, bool usesEval, bool needsClosure, int numConstants) KJS_FAST_CALL;
    2217 
    2218         EvalCodeBlock& byteCode(ScopeChainNode* scopeChain) KJS_FAST_CALL
     2216        static EvalNode* create(JSGlobalData*, SourceElements*, VarStack*, FunctionStack*, SourceProvider*, bool usesEval, bool needsClosure, int numConstants) JSC_FAST_CALL;
     2217
     2218        EvalCodeBlock& byteCode(ScopeChainNode* scopeChain) JSC_FAST_CALL
    22192219        {
    22202220            if (!m_code)
     
    22242224
    22252225    private:
    2226         EvalNode(JSGlobalData*, SourceElements*, VarStack*, FunctionStack*, SourceProvider*, bool usesEval, bool needsClosure, int numConstants) KJS_FAST_CALL;
    2227 
    2228         void generateCode(ScopeChainNode*) KJS_FAST_CALL;
    2229         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
     2226        EvalNode(JSGlobalData*, SourceElements*, VarStack*, FunctionStack*, SourceProvider*, bool usesEval, bool needsClosure, int numConstants) JSC_FAST_CALL;
     2227
     2228        void generateCode(ScopeChainNode*) JSC_FAST_CALL;
     2229        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    22302230       
    22312231        RefPtr<SourceProvider> m_sourceProvider;
     
    22362236    class FunctionBodyNode : public ScopeNode {
    22372237    public:
    2238         static FunctionBodyNode* create(JSGlobalData*, SourceElements*, VarStack*, FunctionStack*, SourceProvider*, bool usesEval, bool needsClosure, int numConstants) KJS_FAST_CALL;
    2239         static FunctionBodyNode* create(JSGlobalData*, SourceElements*, VarStack*, FunctionStack*, bool usesEval, bool needsClosure, int numConstants) KJS_FAST_CALL;
    2240 
    2241         Vector<Identifier>& parameters() KJS_FAST_CALL { return m_parameters; }
    2242         UString paramString() const KJS_FAST_CALL;
    2243 
    2244         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
     2238        static FunctionBodyNode* create(JSGlobalData*, SourceElements*, VarStack*, FunctionStack*, SourceProvider*, bool usesEval, bool needsClosure, int numConstants) JSC_FAST_CALL;
     2239        static FunctionBodyNode* create(JSGlobalData*, SourceElements*, VarStack*, FunctionStack*, bool usesEval, bool needsClosure, int numConstants) JSC_FAST_CALL;
     2240
     2241        Vector<Identifier>& parameters() JSC_FAST_CALL { return m_parameters; }
     2242        UString paramString() const JSC_FAST_CALL;
     2243
     2244        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    22452245       
    22462246        SymbolTable& symbolTable() { return m_symbolTable; } // FIXME: Remove this
    22472247       
    2248         CodeBlock& byteCode(ScopeChainNode* scopeChain) KJS_FAST_CALL
     2248        CodeBlock& byteCode(ScopeChainNode* scopeChain) JSC_FAST_CALL
    22492249        {
    22502250            ASSERT(scopeChain);
     
    22542254        }
    22552255
    2256         CodeBlock& generatedByteCode() KJS_FAST_CALL
     2256        CodeBlock& generatedByteCode() JSC_FAST_CALL
    22572257        {
    22582258            ASSERT(m_code);
     
    22632263
    22642264        void setSource(const SourceRange& source) { m_source = source; }
    2265         UString toSourceString() const KJS_FAST_CALL { return UString("{") + m_source.toString() + UString("}"); }
    2266     protected:
    2267         FunctionBodyNode(JSGlobalData*, SourceElements*, VarStack*, FunctionStack*, bool usesEval, bool needsClosure, int numConstants) KJS_FAST_CALL;
    2268 
    2269     private:
    2270         void generateCode(ScopeChainNode*) KJS_FAST_CALL;
     2265        UString toSourceString() const JSC_FAST_CALL { return UString("{") + m_source.toString() + UString("}"); }
     2266    protected:
     2267        FunctionBodyNode(JSGlobalData*, SourceElements*, VarStack*, FunctionStack*, bool usesEval, bool needsClosure, int numConstants) JSC_FAST_CALL;
     2268
     2269    private:
     2270        void generateCode(ScopeChainNode*) JSC_FAST_CALL;
    22712271       
    22722272        Vector<Identifier> m_parameters;
     
    22782278    class FuncExprNode : public ExpressionNode {
    22792279    public:
    2280         FuncExprNode(JSGlobalData* globalData, const Identifier& ident, FunctionBodyNode* body, const SourceRange& source, ParameterNode* parameter = 0) KJS_FAST_CALL
     2280        FuncExprNode(JSGlobalData* globalData, const Identifier& ident, FunctionBodyNode* body, const SourceRange& source, ParameterNode* parameter = 0) JSC_FAST_CALL
    22812281            : ExpressionNode(globalData)
    22822282            , m_ident(ident)
     
    22882288        }
    22892289
    2290         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    2291         JSFunction* makeFunction(ExecState*, ScopeChainNode*) KJS_FAST_CALL;
    2292         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     2290        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     2291        JSFunction* makeFunction(ExecState*, ScopeChainNode*) JSC_FAST_CALL;
     2292        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    22932293        virtual Precedence precedence() const { return PrecMember; }
    22942294        virtual bool needsParensIfLeftmost() const { return true; }
     
    22972297
    22982298    private:
    2299         void addParams() KJS_FAST_CALL;
     2299        void addParams() JSC_FAST_CALL;
    23002300
    23012301        // Used for streamTo
     
    23082308    class FuncDeclNode : public StatementNode {
    23092309    public:
    2310         FuncDeclNode(JSGlobalData* globalData, const Identifier& ident, FunctionBodyNode* body, const SourceRange& source, ParameterNode* parameter = 0) KJS_FAST_CALL
     2310        FuncDeclNode(JSGlobalData* globalData, const Identifier& ident, FunctionBodyNode* body, const SourceRange& source, ParameterNode* parameter = 0) JSC_FAST_CALL
    23112311            : StatementNode(globalData)
    23122312            , m_ident(ident)
     
    23182318        }
    23192319
    2320         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    2321 
    2322         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
    2323         JSFunction* makeFunction(ExecState*, ScopeChainNode*) KJS_FAST_CALL;
     2320        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     2321
     2322        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
     2323        JSFunction* makeFunction(ExecState*, ScopeChainNode*) JSC_FAST_CALL;
    23242324
    23252325        Identifier m_ident;
     
    23282328
    23292329    private:
    2330         void addParams() KJS_FAST_CALL;
     2330        void addParams() JSC_FAST_CALL;
    23312331
    23322332        RefPtr<ParameterNode> m_parameter;
     
    23362336    class CaseClauseNode : public Node {
    23372337    public:
    2338         CaseClauseNode(JSGlobalData* globalData, ExpressionNode* expr) KJS_FAST_CALL
     2338        CaseClauseNode(JSGlobalData* globalData, ExpressionNode* expr) JSC_FAST_CALL
    23392339            : Node(globalData)
    23402340            , m_expr(expr)
     
    23422342        }
    23432343
    2344         CaseClauseNode(JSGlobalData* globalData, ExpressionNode* expr, SourceElements* children) KJS_FAST_CALL
     2344        CaseClauseNode(JSGlobalData* globalData, ExpressionNode* expr, SourceElements* children) JSC_FAST_CALL
    23452345            : Node(globalData)
    23462346            , m_expr(expr)
     
    23502350        }
    23512351
    2352         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     2352        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    23532353        virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
    23542354
     
    23632363    class ClauseListNode : public Node {
    23642364    public:
    2365         ClauseListNode(JSGlobalData* globalData, CaseClauseNode* clause) KJS_FAST_CALL
     2365        ClauseListNode(JSGlobalData* globalData, CaseClauseNode* clause) JSC_FAST_CALL
    23662366            : Node(globalData)
    23672367            , m_clause(clause)
     
    23692369        }
    23702370
    2371         ClauseListNode(JSGlobalData* globalData, ClauseListNode* clauseList, CaseClauseNode* clause) KJS_FAST_CALL
     2371        ClauseListNode(JSGlobalData* globalData, ClauseListNode* clauseList, CaseClauseNode* clause) JSC_FAST_CALL
    23722372            : Node(globalData)
    23732373            , m_clause(clause)
     
    23762376        }
    23772377
    2378         CaseClauseNode* getClause() const KJS_FAST_CALL { return m_clause.get(); }
    2379         ClauseListNode* getNext() const KJS_FAST_CALL { return m_next.get(); }
    2380         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
    2381         PassRefPtr<ClauseListNode> releaseNext() KJS_FAST_CALL { return m_next.release(); }
     2378        CaseClauseNode* getClause() const JSC_FAST_CALL { return m_clause.get(); }
     2379        ClauseListNode* getNext() const JSC_FAST_CALL { return m_next.get(); }
     2380        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
     2381        PassRefPtr<ClauseListNode> releaseNext() JSC_FAST_CALL { return m_next.release(); }
    23822382        virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
    23832383
     
    23902390    class CaseBlockNode : public Node {
    23912391    public:
    2392         CaseBlockNode(JSGlobalData* globalData, ClauseListNode* list1, CaseClauseNode* defaultClause, ClauseListNode* list2) KJS_FAST_CALL
     2392        CaseBlockNode(JSGlobalData* globalData, ClauseListNode* list1, CaseClauseNode* defaultClause, ClauseListNode* list2) JSC_FAST_CALL
    23932393            : Node(globalData)
    23942394            , m_list1(list1)
     
    23982398        }
    23992399
    2400         RegisterID* emitCodeForBlock(CodeGenerator&, RegisterID* input, RegisterID* dst = 0) KJS_FAST_CALL;
    2401 
    2402         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     2400        RegisterID* emitCodeForBlock(CodeGenerator&, RegisterID* input, RegisterID* dst = 0) JSC_FAST_CALL;
     2401
     2402        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    24032403        virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
    24042404
     
    24122412    class SwitchNode : public StatementNode {
    24132413    public:
    2414         SwitchNode(JSGlobalData* globalData, ExpressionNode* expr, CaseBlockNode* block) KJS_FAST_CALL
     2414        SwitchNode(JSGlobalData* globalData, ExpressionNode* expr, CaseBlockNode* block) JSC_FAST_CALL
    24152415            : StatementNode(globalData)
    24162416            , m_expr(expr)
     
    24192419        }
    24202420
    2421         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
    2422 
    2423         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     2421        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     2422
     2423        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    24242424
    24252425    private:
     
    24302430    class BreakpointCheckStatement : public StatementNode {
    24312431    public:
    2432         BreakpointCheckStatement(JSGlobalData*, PassRefPtr<StatementNode>) KJS_FAST_CALL;
    2433 
    2434         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     2432        BreakpointCheckStatement(JSGlobalData*, PassRefPtr<StatementNode>) JSC_FAST_CALL;
     2433
     2434        virtual void streamTo(SourceStream&) const JSC_FAST_CALL;
    24352435
    24362436    private:
  • trunk/WebCore/ChangeLog

    r36263 r36264  
     12008-09-07  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
     2
     3        Reviewed by Oliver Hunt.
     4
     5        Bug 20711: Change KJS prefix on preprocessor macros to JSC
     6        <https://bugs.webkit.org/show_bug.cgi?id=20711>
     7
     8        * bindings/js/JSEventTargetBase.h:
     9        * bindings/js/JSHTMLInputElementBase.cpp:
     10        * bindings/js/JSHTMLInputElementBase.h:
     11        * bindings/scripts/CodeGeneratorJS.pm:
     12
    1132008-09-07  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
    214
  • trunk/WebCore/bindings/js/JSEventTargetBase.h

    r36263 r36264  
    101101    };
    102102
    103     // This class is a modified version of the code the KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE
    104     // and KJS_IMPLEMENT_PROTOTYPE macros produce - the idea is that classes like JSEventTargetNode
     103    // This class is a modified version of the code the JSC_DEFINE_PROTOTYPE_WITH_PROTOTYPE
     104    // and JSC_IMPLEMENT_PROTOTYPE macros produce - the idea is that classes like JSEventTargetNode
    105105    // and JSEventTargetSVGElementInstance can share a single prototype just differing in the
    106106    // naming "EventTargetNodePrototype" vs "EventTargetSVGElementInstancePrototype". Above mentioned
  • trunk/WebCore/bindings/js/JSHTMLInputElementBase.cpp

    r36263 r36264  
    4949*/
    5050
    51 KJS_IMPLEMENT_PROTOTYPE("HTMLInputElementBase", JSHTMLInputElementBasePrototype)
     51JSC_IMPLEMENT_PROTOTYPE("HTMLInputElementBase", JSHTMLInputElementBasePrototype)
    5252
    5353// SetSelectionRange is implemented on the class instead of on the prototype
  • trunk/WebCore/bindings/js/JSHTMLInputElementBase.h

    r36263 r36264  
    2828    class HTMLInputElement;
    2929
    30     KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(JSHTMLInputElementBasePrototype, JSHTMLElementPrototype)
     30    JSC_DEFINE_PROTOTYPE_WITH_PROTOTYPE(JSHTMLInputElementBasePrototype, JSHTMLElementPrototype)
    3131
    3232    class JSHTMLInputElementBase : public JSHTMLElement {
  • trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm

    r36263 r36264  
    637637    push(@headerContent, "\n");
    638638
    639     # Add prototype declaration -- code adopted from the KJS_DEFINE_PROTOTYPE and KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE macros
     639    # Add prototype declaration -- code adopted from the JSC_DEFINE_PROTOTYPE and JSC_DEFINE_PROTOTYPE_WITH_PROTOTYPE macros
    640640    push(@headerContent, "class ${className}Prototype : public JSC::JSObject {\n");
    641641    push(@headerContent, "public:\n");
Note: See TracChangeset for help on using the changeset viewer.