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


Ignore:
Timestamp:
Dec 10, 2005, 6:06:17 PM (20 years ago)
Author:
darin
Message:

JavaScriptCore:

Rubber stamped by Maciej.

  • did long-promised KJS renaming:

ValueImp -> JSValue
ObjectImp -> JSObject
AllocatedValueImp -> JSCell

A renaming to get a class out of the way

KJS::Bindings::JSObject -> JavaJSObject

and some other "imp-reduction" renaming

*InstanceImp -> *Instance
*ProtoFuncImp -> *ProtoFunc
*PrototypeImp -> *Prototype
ArgumentsImp -> Arguments
RuntimeArrayImp -> RuntimeArray
RuntimeMethodImp -> RuntimeMethod

  • most files and functions

WebCore:

Rubber stamped by Maciej.

  • updated for KJS class renaming
  • many files and functions
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/kjs/nodes.h

    r11525 r11527  
    7676    virtual ~Node();
    7777
    78     virtual ValueImp *evaluate(ExecState *exec) = 0;
     78    virtual JSValue *evaluate(ExecState *exec) = 0;
    7979    UString toString() const;
    8080    virtual void streamTo(SourceStream &s) const = 0;
    … …  
    9999    Completion createErrorCompletion(ExecState *, ErrorType, const char *msg, const Identifier &);
    100100
    101     ValueImp *throwError(ExecState *, ErrorType, const char *msg);
    102     ValueImp *throwError(ExecState *, ErrorType, const char *msg, ValueImp *, Node *);
    103     ValueImp *throwError(ExecState *, ErrorType, const char *msg, const Identifier &);
    104     ValueImp *throwError(ExecState *, ErrorType, const char *msg, ValueImp *, const Identifier &);
    105     ValueImp *throwError(ExecState *, ErrorType, const char *msg, ValueImp *, Node *, Node *);
    106     ValueImp *throwError(ExecState *, ErrorType, const char *msg, ValueImp *, Node *, const Identifier &);
    107 
    108     ValueImp *throwUndefinedVariableError(ExecState *, const Identifier &);
     101    JSValue *throwError(ExecState *, ErrorType, const char *msg);
     102    JSValue *throwError(ExecState *, ErrorType, const char *msg, JSValue *, Node *);
     103    JSValue *throwError(ExecState *, ErrorType, const char *msg, const Identifier &);
     104    JSValue *throwError(ExecState *, ErrorType, const char *msg, JSValue *, const Identifier &);
     105    JSValue *throwError(ExecState *, ErrorType, const char *msg, JSValue *, Node *, Node *);
     106    JSValue *throwError(ExecState *, ErrorType, const char *msg, JSValue *, Node *, const Identifier &);
     107
     108    JSValue *throwUndefinedVariableError(ExecState *, const Identifier &);
    109109
    110110    void setExceptionDetailsIfNeeded(ExecState *);
    … …  
    135135    LabelStack ls;
    136136  private:
    137     ValueImp *evaluate(ExecState */*exec*/) { return jsUndefined(); }
     137    JSValue *evaluate(ExecState */*exec*/) { return jsUndefined(); }
    138138    int l0, l1;
    139139    int sid;
    … …  
    144144  public:
    145145    NullNode() {}
    146     ValueImp *evaluate(ExecState *exec);
     146    JSValue *evaluate(ExecState *exec);
    147147    virtual void streamTo(SourceStream &s) const;
    148148  };
    … …  
    151151  public:
    152152    BooleanNode(bool v) : value(v) {}
    153     ValueImp *evaluate(ExecState *exec);
     153    JSValue *evaluate(ExecState *exec);
    154154    virtual void streamTo(SourceStream &s) const;
    155155  private:
    … …  
    160160  public:
    161161    NumberNode(double v) : value(v) {}
    162     ValueImp *evaluate(ExecState *exec);
     162    JSValue *evaluate(ExecState *exec);
    163163    virtual void streamTo(SourceStream &s) const;
    164164  private:
    … …  
    169169  public:
    170170    StringNode(const UString *v) { value = *v; }
    171     ValueImp *evaluate(ExecState *exec);
     171    JSValue *evaluate(ExecState *exec);
    172172    virtual void streamTo(SourceStream &s) const;
    173173  private:
    … …  
    179179    RegExpNode(const UString &p, const UString &f)
    180180      : pattern(p), flags(f) { }
    181     ValueImp *evaluate(ExecState *exec);
     181    JSValue *evaluate(ExecState *exec);
    182182    virtual void streamTo(SourceStream &s) const;
    183183  private:
    … …  
    188188  public:
    189189    ThisNode() {}
    190     ValueImp *evaluate(ExecState *exec);
     190    JSValue *evaluate(ExecState *exec);
    191191    virtual void streamTo(SourceStream &s) const;
    192192  };
    … …  
    195195  public:
    196196    ResolveNode(const Identifier &s) : ident(s) { }
    197     ValueImp *evaluate(ExecState *exec);
     197    JSValue *evaluate(ExecState *exec);
    198198    virtual void streamTo(SourceStream &s) const;
    199199
    … …  
    209209  public:
    210210    GroupNode(Node *g) : group(g) { }
    211     virtual ValueImp *evaluate(ExecState *exec);
     211    virtual JSValue *evaluate(ExecState *exec);
    212212    virtual Node *nodeInsideAllParens();
    213213    virtual void streamTo(SourceStream &s) const;
    … …  
    223223    ElementNode(ElementNode *l, int e, Node *n)
    224224      : list(l->list), elision(e), node(n) { l->list = this; }
    225     ValueImp *evaluate(ExecState *exec);
     225    JSValue *evaluate(ExecState *exec);
    226226    virtual void streamTo(SourceStream &s) const;
    227227  private:
    … …  
    239239    ArrayNode(int eli, ElementNode *ele)
    240240      : element(ele->list), elision(eli), opt(true) { ele->list = 0; }
    241     ValueImp *evaluate(ExecState *exec);
     241    JSValue *evaluate(ExecState *exec);
    242242    virtual void streamTo(SourceStream &s) const;
    243243  private:
    … …  
    254254    PropertyValueNode(PropertyNode *n, Node *a, PropertyValueNode *l)
    255255      : name(n), assign(a), list(l->list) { l->list = this; }
    256     ValueImp *evaluate(ExecState *exec);
     256    JSValue *evaluate(ExecState *exec);
    257257    virtual void streamTo(SourceStream &s) const;
    258258  private:
    … …  
    267267    ObjectLiteralNode() : list(0) { }
    268268    ObjectLiteralNode(PropertyValueNode *l) : list(l->list) { l->list = 0; }
    269     ValueImp *evaluate(ExecState *exec);
     269    JSValue *evaluate(ExecState *exec);
    270270    virtual void streamTo(SourceStream &s) const;
    271271  private:
    … …  
    277277    PropertyNode(double d) : numeric(d) { }
    278278    PropertyNode(const Identifier &s) : str(s) { }
    279     ValueImp *evaluate(ExecState *exec);
     279    JSValue *evaluate(ExecState *exec);
    280280    virtual void streamTo(SourceStream &s) const;
    281281  private:
    … …  
    287287  public:
    288288    BracketAccessorNode(Node *e1, Node *e2) : expr1(e1), expr2(e2) {}
    289     ValueImp *evaluate(ExecState *exec);
     289    JSValue *evaluate(ExecState *exec);
    290290    virtual void streamTo(SourceStream &s) const;
    291291
    … …  
    303303  public:
    304304    DotAccessorNode(Node *e, const Identifier &s) : expr(e), ident(s) { }
    305     ValueImp *evaluate(ExecState *exec);
     305    JSValue *evaluate(ExecState *exec);
    306306    virtual void streamTo(SourceStream &s) const;
    307307
    … …  
    322322    ArgumentListNode(ArgumentListNode *l, Node *e)
    323323      : list(l->list), expr(e) { l->list = this; }
    324     ValueImp *evaluate(ExecState *exec);
     324    JSValue *evaluate(ExecState *exec);
    325325    List evaluateList(ExecState *exec);
    326326    virtual void streamTo(SourceStream &s) const;
    … …  
    336336    ArgumentsNode(ArgumentListNode *l)
    337337      : list(l->list) { l->list = 0; }
    338     ValueImp *evaluate(ExecState *exec);
     338    JSValue *evaluate(ExecState *exec);
    339339    List evaluateList(ExecState *exec);
    340340    virtual void streamTo(SourceStream &s) const;
    … …  
    347347    NewExprNode(Node *e) : expr(e), args(0) {}
    348348    NewExprNode(Node *e, ArgumentsNode *a) : expr(e), args(a) {}
    349     ValueImp *evaluate(ExecState *exec);
     349    JSValue *evaluate(ExecState *exec);
    350350    virtual void streamTo(SourceStream &s) const;
    351351  private:
    … …  
    357357  public:
    358358    FunctionCallValueNode(Node *e, ArgumentsNode *a) : expr(e), args(a) {}
    359     ValueImp *evaluate(ExecState *exec);
     359    JSValue *evaluate(ExecState *exec);
    360360    virtual void streamTo(SourceStream &s) const;
    361361  private:
    … …  
    367367  public:
    368368    FunctionCallResolveNode(const Identifier& i, ArgumentsNode *a) : ident(i), args(a) {}
    369     ValueImp *evaluate(ExecState *exec);
     369    JSValue *evaluate(ExecState *exec);
    370370    virtual void streamTo(SourceStream &s) const;
    371371  private:
    … …  
    377377  public:
    378378    FunctionCallBracketNode(Node *b, Node *s, ArgumentsNode *a) : base(b), subscript(s), args(a) {}
    379     ValueImp *evaluate(ExecState *exec);
     379    JSValue *evaluate(ExecState *exec);
    380380    virtual void streamTo(SourceStream &s) const;
    381381  protected:
    … …  
    394394  public:
    395395    FunctionCallDotNode(Node *b, const Identifier &i, ArgumentsNode *a) : base(b), ident(i), args(a) {}
    396     ValueImp *evaluate(ExecState *exec);
     396    JSValue *evaluate(ExecState *exec);
    397397    virtual void streamTo(SourceStream &s) const;
    398398  protected:
    … …  
    411411  public:
    412412    PostfixResolveNode(const Identifier& i, Operator o) : m_ident(i), m_oper(o) {}
    413     ValueImp *evaluate(ExecState *exec);
     413    JSValue *evaluate(ExecState *exec);
    414414    virtual void streamTo(SourceStream &s) const;
    415415  private:
    … …  
    421421  public:
    422422    PostfixBracketNode(Node *b, Node *s, Operator o) : m_base(b), m_subscript(s), m_oper(o) {}
    423     ValueImp *evaluate(ExecState *exec);
     423    JSValue *evaluate(ExecState *exec);
    424424    virtual void streamTo(SourceStream &s) const;
    425425  private:
    … …  
    432432  public:
    433433    PostfixDotNode(Node *b, const Identifier& i, Operator o) : m_base(b), m_ident(i), m_oper(o) {}
    434     ValueImp *evaluate(ExecState *exec);
     434    JSValue *evaluate(ExecState *exec);
    435435    virtual void streamTo(SourceStream &s) const;
    436436  private:
    … …  
    443443  public:
    444444    DeleteResolveNode(const Identifier& i) : m_ident(i) {}
    445     ValueImp *evaluate(ExecState *exec);
     445    JSValue *evaluate(ExecState *exec);
    446446    virtual void streamTo(SourceStream &s) const;
    447447  private:
    … …  
    452452  public:
    453453    DeleteBracketNode(Node *base, Node *subscript) : m_base(base), m_subscript(subscript) {}
    454     ValueImp *evaluate(ExecState *exec);
     454    JSValue *evaluate(ExecState *exec);
    455455    virtual void streamTo(SourceStream &s) const;
    456456  private:
    … …  
    462462  public:
    463463    DeleteDotNode(Node *base, const Identifier& i) : m_base(base), m_ident(i) {}
    464     ValueImp *evaluate(ExecState *exec);
     464    JSValue *evaluate(ExecState *exec);
    465465    virtual void streamTo(SourceStream &s) const;
    466466  private:
    … …  
    472472  public:
    473473    DeleteValueNode(Node *e) : m_expr(e) {}
    474     ValueImp *evaluate(ExecState *exec);
     474    JSValue *evaluate(ExecState *exec);
    475475    virtual void streamTo(SourceStream &s) const;
    476476  private:
    … …  
    481481  public:
    482482    VoidNode(Node *e) : expr(e) {}
    483     ValueImp *evaluate(ExecState *exec);
     483    JSValue *evaluate(ExecState *exec);
    484484    virtual void streamTo(SourceStream &s) const;
    485485  private:
    … …  
    490490  public:
    491491    TypeOfResolveNode(const Identifier& i) : m_ident(i) {}
    492     ValueImp *evaluate(ExecState *exec);
     492    JSValue *evaluate(ExecState *exec);
    493493    virtual void streamTo(SourceStream &s) const;
    494494  private:
    … …  
    499499  public:
    500500    TypeOfValueNode(Node *e) : m_expr(e) {}
    501     ValueImp *evaluate(ExecState *exec);
     501    JSValue *evaluate(ExecState *exec);
    502502    virtual void streamTo(SourceStream &s) const;
    503503  private:
    … …  
    508508  public:
    509509    PrefixResolveNode(const Identifier& i, Operator o) : m_ident(i), m_oper(o) {}
    510     ValueImp *evaluate(ExecState *exec);
     510    JSValue *evaluate(ExecState *exec);
    511511    virtual void streamTo(SourceStream &s) const;
    512512  private:
    … …  
    518518  public:
    519519    PrefixBracketNode(Node *b, Node *s, Operator o) : m_base(b), m_subscript(s), m_oper(o) {}
    520     ValueImp *evaluate(ExecState *exec);
     520    JSValue *evaluate(ExecState *exec);
    521521    virtual void streamTo(SourceStream &s) const;
    522522  private:
    … …  
    529529  public:
    530530    PrefixDotNode(Node *b, const Identifier& i, Operator o) : m_base(b), m_ident(i), m_oper(o) {}
    531     ValueImp *evaluate(ExecState *exec);
     531    JSValue *evaluate(ExecState *exec);
    532532    virtual void streamTo(SourceStream &s) const;
    533533  private:
    … …  
    540540  public:
    541541    UnaryPlusNode(Node *e) : expr(e) {}
    542     ValueImp *evaluate(ExecState *exec);
     542    JSValue *evaluate(ExecState *exec);
    543543    virtual void streamTo(SourceStream &s) const;
    544544  private:
    … …  
    549549  public:
    550550    NegateNode(Node *e) : expr(e) {}
    551     ValueImp *evaluate(ExecState *exec);
     551    JSValue *evaluate(ExecState *exec);
    552552    virtual void streamTo(SourceStream &s) const;
    553553  private:
    … …  
    558558  public:
    559559    BitwiseNotNode(Node *e) : expr(e) {}
    560     ValueImp *evaluate(ExecState *exec);
     560    JSValue *evaluate(ExecState *exec);
    561561    virtual void streamTo(SourceStream &s) const;
    562562  private:
    … …  
    567567  public:
    568568    LogicalNotNode(Node *e) : expr(e) {}
    569     ValueImp *evaluate(ExecState *exec);
     569    JSValue *evaluate(ExecState *exec);
    570570    virtual void streamTo(SourceStream &s) const;
    571571  private:
    … …  
    576576  public:
    577577    MultNode(Node *t1, Node *t2, char op) : term1(t1), term2(t2), oper(op) {}
    578     ValueImp *evaluate(ExecState *exec);
     578    JSValue *evaluate(ExecState *exec);
    579579    virtual void streamTo(SourceStream &s) const;
    580580  private:
    … …  
    587587  public:
    588588    AddNode(Node *t1, Node *t2, char op) : term1(t1), term2(t2), oper(op) {}
    589     ValueImp *evaluate(ExecState *exec);
     589    JSValue *evaluate(ExecState *exec);
    590590    virtual void streamTo(SourceStream &s) const;
    591591  private:
    … …  
    599599    ShiftNode(Node *t1, Operator o, Node *t2)
    600600      : term1(t1), term2(t2), oper(o) {}
    601     ValueImp *evaluate(ExecState *exec);
     601    JSValue *evaluate(ExecState *exec);
    602602    virtual void streamTo(SourceStream &s) const;
    603603  private:
    … …  
    611611    RelationalNode(Node *e1, Operator o, Node *e2) :
    612612      expr1(e1), expr2(e2), oper(o) {}
    613     ValueImp *evaluate(ExecState *exec);
     613    JSValue *evaluate(ExecState *exec);
    614614    virtual void streamTo(SourceStream &s) const;
    615615  private:
    … …  
    623623    EqualNode(Node *e1, Operator o, Node *e2)
    624624      : expr1(e1), expr2(e2), oper(o) {}
    625     ValueImp *evaluate(ExecState *exec);
     625    JSValue *evaluate(ExecState *exec);
    626626    virtual void streamTo(SourceStream &s) const;
    627627  private:
    … …  
    635635    BitOperNode(Node *e1, Operator o, Node *e2) :
    636636      expr1(e1), expr2(e2), oper(o) {}
    637     ValueImp *evaluate(ExecState *exec);
     637    JSValue *evaluate(ExecState *exec);
    638638    virtual void streamTo(SourceStream &s) const;
    639639  private:
    … …  
    650650    BinaryLogicalNode(Node *e1, Operator o, Node *e2) :
    651651      expr1(e1), expr2(e2), oper(o) {}
    652     ValueImp *evaluate(ExecState *exec);
     652    JSValue *evaluate(ExecState *exec);
    653653    virtual void streamTo(SourceStream &s) const;
    654654  private:
    … …  
    665665    ConditionalNode(Node *l, Node *e1, Node *e2) :
    666666      logical(l), expr1(e1), expr2(e2) {}
    667     ValueImp *evaluate(ExecState *exec);
     667    JSValue *evaluate(ExecState *exec);
    668668    virtual void streamTo(SourceStream &s) const;
    669669  private:
    … …  
    677677    AssignResolveNode(const Identifier &ident, Operator oper, Node *right)
    678678      : m_ident(ident), m_oper(oper), m_right(right) {}
    679     ValueImp *evaluate(ExecState *exec);
     679    JSValue *evaluate(ExecState *exec);
    680680    virtual void streamTo(SourceStream &s) const;
    681681  protected:
    … …  
    689689    AssignBracketNode(Node *base, Node *subscript, Operator oper, Node *right)
    690690      : m_base(base), m_subscript(subscript), m_oper(oper), m_right(right) {}
    691     ValueImp *evaluate(ExecState *exec);
     691    JSValue *evaluate(ExecState *exec);
    692692    virtual void streamTo(SourceStream &s) const;
    693693  protected:
    … …  
    702702    AssignDotNode(Node *base, const Identifier& ident, Operator oper, Node *right)
    703703      : m_base(base), m_ident(ident), m_oper(oper), m_right(right) {}
    704     ValueImp *evaluate(ExecState *exec);
     704    JSValue *evaluate(ExecState *exec);
    705705    virtual void streamTo(SourceStream &s) const;
    706706  protected:
    … …  
    714714  public:
    715715    CommaNode(Node *e1, Node *e2) : expr1(e1), expr2(e2) {}
    716     ValueImp *evaluate(ExecState *exec);
     716    JSValue *evaluate(ExecState *exec);
    717717    virtual void streamTo(SourceStream &s) const;
    718718  private:
    … …  
    738738  public:
    739739    AssignExprNode(Node *e) : expr(e) {}
    740     ValueImp *evaluate(ExecState *exec);
     740    JSValue *evaluate(ExecState *exec);
    741741    virtual void streamTo(SourceStream &s) const;
    742742  private:
    … …  
    748748    enum Type { Variable, Constant };
    749749    VarDeclNode(const Identifier &id, AssignExprNode *in, Type t);
    750     ValueImp *evaluate(ExecState *exec);
     750    JSValue *evaluate(ExecState *exec);
    751751    virtual void processVarDecls(ExecState *exec);
    752752    virtual void streamTo(SourceStream &s) const;
    … …  
    763763    VarDeclListNode(VarDeclListNode *l, VarDeclNode *v)
    764764      : list(l->list), var(v) { l->list = this; }
    765     ValueImp *evaluate(ExecState *exec);
     765    JSValue *evaluate(ExecState *exec);
    766766    virtual void processVarDecls(ExecState *exec);
    767767    virtual void streamTo(SourceStream &s) const;
    … …  
    921921    CaseClauseNode(Node *e, StatListNode *l)
    922922      : expr(e), list(l->list) { l->list = 0; }
    923     ValueImp *evaluate(ExecState *exec);
     923    JSValue *evaluate(ExecState *exec);
    924924    Completion evalStatements(ExecState *exec);
    925925    virtual void processVarDecls(ExecState *exec);
    … …  
    936936    ClauseListNode(ClauseListNode *n, CaseClauseNode *c)
    937937      : cl(c), nx(n->nx) { n->nx = this; }
    938     ValueImp *evaluate(ExecState *exec);
     938    JSValue *evaluate(ExecState *exec);
    939939    CaseClauseNode *clause() const { return cl.get(); }
    940940    ClauseListNode *next() const { return nx.get(); }
    … …  
    950950  public:
    951951    CaseBlockNode(ClauseListNode *l1, CaseClauseNode *d, ClauseListNode *l2);
    952     ValueImp *evaluate(ExecState *exec);
    953     Completion evalBlock(ExecState *exec, ValueImp *input);
     952    JSValue *evaluate(ExecState *exec);
     953    Completion evalBlock(ExecState *exec, JSValue *input);
    954954    virtual void processVarDecls(ExecState *exec);
    955955    virtual void streamTo(SourceStream &s) const;
    … …  
    10111011    ParameterNode(ParameterNode *list, const Identifier &i)
    10121012      : id(i), next(list->next) { list->next = this; }
    1013     ValueImp *evaluate(ExecState *exec);
     1013    JSValue *evaluate(ExecState *exec);
    10141014    Identifier ident() { return id; }
    10151015    ParameterNode *nextParam() { return next.get(); }
    … …  
    10351035    FuncExprNode(const Identifier &i, ParameterNode *p, FunctionBodyNode *b)
    10361036      : ident(i), param(p->next), body(b) { p->next = 0; }
    1037     virtual ValueImp *evaluate(ExecState *);
     1037    virtual JSValue *evaluate(ExecState *);
    10381038    virtual void streamTo(SourceStream &) const;
    10391039  private:
Note: See TracChangeset for help on using the changeset viewer.