Changeset 35986 in webkit for trunk/JavaScriptCore/kjs/nodes.h


Ignore:
Timestamp:
Aug 28, 2008, 10:20:58 PM (17 years ago)
Author:
[email protected]
Message:

2008-08-28 Cameron Zwarich <​[email protected]>

Rubber-stamped by Sam Weinig.

Change 'term' to 'expr' in variable names to standardize terminology.

  • kjs/nodes.cpp: (KJS::BinaryOpNode::emitCode): (KJS::ReverseBinaryOpNode::emitCode): (KJS::ThrowableBinaryOpNode::emitCode):
  • kjs/nodes.h: (KJS::BinaryOpNode::BinaryOpNode): (KJS::ReverseBinaryOpNode::ReverseBinaryOpNode): (KJS::MultNode::): (KJS::DivNode::): (KJS::ModNode::): (KJS::AddNode::): (KJS::SubNode::): (KJS::LeftShiftNode::): (KJS::RightShiftNode::): (KJS::UnsignedRightShiftNode::): (KJS::LessNode::): (KJS::GreaterNode::): (KJS::LessEqNode::): (KJS::GreaterEqNode::): (KJS::ThrowableBinaryOpNode::): (KJS::InstanceOfNode::): (KJS::InNode::): (KJS::EqualNode::): (KJS::NotEqualNode::): (KJS::StrictEqualNode::): (KJS::NotStrictEqualNode::): (KJS::BitAndNode::): (KJS::BitOrNode::): (KJS::BitXOrNode::):
  • kjs/nodes2string.cpp: (KJS::MultNode::streamTo): (KJS::DivNode::streamTo): (KJS::ModNode::streamTo): (KJS::AddNode::streamTo): (KJS::SubNode::streamTo): (KJS::LeftShiftNode::streamTo): (KJS::RightShiftNode::streamTo): (KJS::UnsignedRightShiftNode::streamTo): (KJS::LessNode::streamTo): (KJS::GreaterNode::streamTo): (KJS::LessEqNode::streamTo): (KJS::GreaterEqNode::streamTo): (KJS::InstanceOfNode::streamTo): (KJS::InNode::streamTo): (KJS::EqualNode::streamTo): (KJS::NotEqualNode::streamTo): (KJS::StrictEqualNode::streamTo): (KJS::NotStrictEqualNode::streamTo): (KJS::BitAndNode::streamTo): (KJS::BitXOrNode::streamTo): (KJS::BitOrNode::streamTo):
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/kjs/nodes.h

    r35830 r35986  
    12021202    class BinaryOpNode : public ExpressionNode {
    12031203    public:
    1204         BinaryOpNode(JSGlobalData* globalData, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments)
    1205             : ExpressionNode(globalData)
    1206             , m_term1(term1)
    1207             , m_term2(term2)
     1204        BinaryOpNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments)
     1205            : ExpressionNode(globalData)
     1206            , m_expr1(expr1)
     1207            , m_expr2(expr2)
    12081208            , m_rightHasAssignments(rightHasAssignments)
    12091209        {
    12101210        }
    12111211
    1212         BinaryOpNode(JSGlobalData* globalData, JSType type, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments)
     1212        BinaryOpNode(JSGlobalData* globalData, JSType type, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments)
    12131213            : ExpressionNode(globalData, type)
    1214             , m_term1(term1)
    1215             , m_term2(term2)
     1214            , m_expr1(expr1)
     1215            , m_expr2(expr2)
    12161216            , m_rightHasAssignments(rightHasAssignments)
    12171217        {
    … …  
    12221222
    12231223    protected:
    1224         RefPtr<ExpressionNode> m_term1;
    1225         RefPtr<ExpressionNode> m_term2;
     1224        RefPtr<ExpressionNode> m_expr1;
     1225        RefPtr<ExpressionNode> m_expr2;
    12261226        bool m_rightHasAssignments;
    12271227    };
    … …  
    12291229    class ReverseBinaryOpNode : public ExpressionNode {
    12301230    public:
    1231         ReverseBinaryOpNode(JSGlobalData* globalData, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments)
    1232             : ExpressionNode(globalData)
    1233             , m_term1(term1)
    1234             , m_term2(term2)
     1231        ReverseBinaryOpNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments)
     1232            : ExpressionNode(globalData)
     1233            , m_expr1(expr1)
     1234            , m_expr2(expr2)
    12351235            , m_rightHasAssignments(rightHasAssignments)
    12361236        {
    12371237        }
    12381238
    1239         ReverseBinaryOpNode(JSGlobalData* globalData, JSType type, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments)
     1239        ReverseBinaryOpNode(JSGlobalData* globalData, JSType type, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments)
    12401240            : ExpressionNode(globalData, type)
    1241             , m_term1(term1)
    1242             , m_term2(term2)
     1241            , m_expr1(expr1)
     1242            , m_expr2(expr2)
    12431243            , m_rightHasAssignments(rightHasAssignments)
    12441244        {
    … …  
    12491249
    12501250    protected:
    1251         RefPtr<ExpressionNode> m_term1;
    1252         RefPtr<ExpressionNode> m_term2;
     1251        RefPtr<ExpressionNode> m_expr1;
     1252        RefPtr<ExpressionNode> m_expr2;
    12531253        bool m_rightHasAssignments;
    12541254    };
    … …  
    12561256    class MultNode : public BinaryOpNode {
    12571257    public:
    1258         MultNode(JSGlobalData* globalData, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments) KJS_FAST_CALL
    1259             : BinaryOpNode(globalData, NumberType, term1, term2, rightHasAssignments)
     1258        MultNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1259            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
    12601260        {
    12611261        }
    … …  
    12681268    class DivNode : public BinaryOpNode {
    12691269    public:
    1270         DivNode(JSGlobalData* globalData, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments) KJS_FAST_CALL
    1271             : BinaryOpNode(globalData, NumberType, term1, term2, rightHasAssignments)
     1270        DivNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1271            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
    12721272        {
    12731273        }
    … …  
    12801280    class ModNode : public BinaryOpNode {
    12811281    public:
    1282         ModNode(JSGlobalData* globalData, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments) KJS_FAST_CALL
    1283             : BinaryOpNode(globalData, NumberType, term1, term2, rightHasAssignments)
     1282        ModNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1283            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
    12841284        {
    12851285        }
    … …  
    12921292    class AddNode : public BinaryOpNode {
    12931293    public:
    1294         AddNode(JSGlobalData* globalData, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments) KJS_FAST_CALL
    1295             : BinaryOpNode(globalData, term1, term2, rightHasAssignments)
     1294        AddNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1295            : BinaryOpNode(globalData, expr1, expr2, rightHasAssignments)
    12961296        {
    12971297        }
    … …  
    13041304    class SubNode : public BinaryOpNode {
    13051305    public:
    1306         SubNode(JSGlobalData* globalData, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments) KJS_FAST_CALL
    1307             : BinaryOpNode(globalData, term1, term2, rightHasAssignments)
     1306        SubNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1307            : BinaryOpNode(globalData, expr1, expr2, rightHasAssignments)
    13081308        {
    13091309        }
    … …  
    13161316    class LeftShiftNode : public BinaryOpNode {
    13171317    public:
    1318         LeftShiftNode(JSGlobalData* globalData, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments) KJS_FAST_CALL
    1319             : BinaryOpNode(globalData, NumberType, term1, term2, rightHasAssignments)
     1318        LeftShiftNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1319            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
    13201320        {
    13211321        }
    … …  
    13281328    class RightShiftNode : public BinaryOpNode {
    13291329    public:
    1330         RightShiftNode(JSGlobalData* globalData, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments) KJS_FAST_CALL
    1331             : BinaryOpNode(globalData, NumberType, term1, term2, rightHasAssignments)
     1330        RightShiftNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1331            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
    13321332        {
    13331333        }
    … …  
    13401340    class UnsignedRightShiftNode : public BinaryOpNode {
    13411341    public:
    1342         UnsignedRightShiftNode(JSGlobalData* globalData, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments) KJS_FAST_CALL
    1343             : BinaryOpNode(globalData, NumberType, term1, term2, rightHasAssignments)
     1342        UnsignedRightShiftNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1343            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
    13441344        {
    13451345        }
    … …  
    13521352    class LessNode : public BinaryOpNode {
    13531353    public:
    1354         LessNode(JSGlobalData* globalData, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments) KJS_FAST_CALL
    1355             : BinaryOpNode(globalData, BooleanType, term1, term2, rightHasAssignments)
     1354        LessNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1355            : BinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
    13561356        {
    13571357        }
    … …  
    13641364    class GreaterNode : public ReverseBinaryOpNode {
    13651365    public:
    1366         GreaterNode(JSGlobalData* globalData, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments) KJS_FAST_CALL
    1367             : ReverseBinaryOpNode(globalData, BooleanType, term1, term2, rightHasAssignments)
     1366        GreaterNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1367            : ReverseBinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
    13681368        {
    13691369        }
    … …  
    13761376    class LessEqNode : public BinaryOpNode {
    13771377    public:
    1378         LessEqNode(JSGlobalData* globalData, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments) KJS_FAST_CALL
    1379             : BinaryOpNode(globalData, BooleanType, term1, term2, rightHasAssignments)
     1378        LessEqNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1379            : BinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
    13801380        {
    13811381        }
    … …  
    13881388    class GreaterEqNode : public ReverseBinaryOpNode {
    13891389    public:
    1390         GreaterEqNode(JSGlobalData* globalData, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments) KJS_FAST_CALL
    1391             : ReverseBinaryOpNode(globalData, BooleanType, term1, term2, rightHasAssignments)
     1390        GreaterEqNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1391            : ReverseBinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
    13921392        {
    13931393        }
    … …  
    14001400    class ThrowableBinaryOpNode : public BinaryOpNode, public ThrowableExpressionData {
    14011401    public:
    1402         ThrowableBinaryOpNode(JSGlobalData* globalData, JSType type, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments) KJS_FAST_CALL
    1403             : BinaryOpNode(globalData, type, term1, term2, rightHasAssignments)
    1404         {
    1405         }
    1406         ThrowableBinaryOpNode(JSGlobalData* globalData, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments) KJS_FAST_CALL
    1407             : BinaryOpNode(globalData, term1, term2, rightHasAssignments)
     1402        ThrowableBinaryOpNode(JSGlobalData* globalData, JSType type, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1403            : BinaryOpNode(globalData, type, expr1, expr2, rightHasAssignments)
     1404        {
     1405        }
     1406        ThrowableBinaryOpNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1407            : BinaryOpNode(globalData, expr1, expr2, rightHasAssignments)
    14081408        {
    14091409        }
    … …  
    14131413    class InstanceOfNode : public ThrowableBinaryOpNode {
    14141414    public:
    1415         InstanceOfNode(JSGlobalData* globalData, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments) KJS_FAST_CALL
    1416             : ThrowableBinaryOpNode(globalData, BooleanType, term1, term2, rightHasAssignments)
     1415        InstanceOfNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1416            : ThrowableBinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
    14171417        {
    14181418        }
    … …  
    14251425    class InNode : public ThrowableBinaryOpNode {
    14261426    public:
    1427         InNode(JSGlobalData* globalData, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments) KJS_FAST_CALL
    1428             : ThrowableBinaryOpNode(globalData, term1, term2, rightHasAssignments)
     1427        InNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1428            : ThrowableBinaryOpNode(globalData, expr1, expr2, rightHasAssignments)
    14291429        {
    14301430        }
    … …  
    14371437    class EqualNode : public BinaryOpNode {
    14381438    public:
    1439         EqualNode(JSGlobalData* globalData, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments) KJS_FAST_CALL
    1440             : BinaryOpNode(globalData, BooleanType, term1, term2, rightHasAssignments)
     1439        EqualNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1440            : BinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
    14411441        {
    14421442        }
    … …  
    14491449    class NotEqualNode : public BinaryOpNode {
    14501450    public:
    1451         NotEqualNode(JSGlobalData* globalData, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments) KJS_FAST_CALL
    1452             : BinaryOpNode(globalData, BooleanType, term1, term2, rightHasAssignments)
     1451        NotEqualNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1452            : BinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
    14531453        {
    14541454        }
    … …  
    14611461    class StrictEqualNode : public BinaryOpNode {
    14621462    public:
    1463         StrictEqualNode(JSGlobalData* globalData, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments) KJS_FAST_CALL
    1464             : BinaryOpNode(globalData, BooleanType, term1, term2, rightHasAssignments)
     1463        StrictEqualNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1464            : BinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
    14651465        {
    14661466        }
    … …  
    14731473    class NotStrictEqualNode : public BinaryOpNode {
    14741474    public:
    1475         NotStrictEqualNode(JSGlobalData* globalData, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments) KJS_FAST_CALL
    1476             : BinaryOpNode(globalData, BooleanType, term1, term2, rightHasAssignments)
     1475        NotStrictEqualNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1476            : BinaryOpNode(globalData, BooleanType, expr1, expr2, rightHasAssignments)
    14771477        {
    14781478        }
    … …  
    14851485    class BitAndNode : public BinaryOpNode {
    14861486    public:
    1487         BitAndNode(JSGlobalData* globalData, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments) KJS_FAST_CALL
    1488             : BinaryOpNode(globalData, NumberType, term1, term2, rightHasAssignments)
     1487        BitAndNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1488            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
    14891489        {
    14901490        }
    … …  
    14971497    class BitOrNode : public BinaryOpNode {
    14981498    public:
    1499         BitOrNode(JSGlobalData* globalData, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments) KJS_FAST_CALL
    1500             : BinaryOpNode(globalData, NumberType, term1, term2, rightHasAssignments)
     1499        BitOrNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1500            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
    15011501        {
    15021502        }
    … …  
    15091509    class BitXOrNode : public BinaryOpNode {
    15101510    public:
    1511         BitXOrNode(JSGlobalData* globalData, ExpressionNode* term1, ExpressionNode* term2, bool rightHasAssignments) KJS_FAST_CALL
    1512             : BinaryOpNode(globalData, NumberType, term1, term2, rightHasAssignments)
     1511        BitXOrNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) KJS_FAST_CALL
     1512            : BinaryOpNode(globalData, NumberType, expr1, expr2, rightHasAssignments)
    15131513        {
    15141514        }
Note: See TracChangeset for help on using the changeset viewer.