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

Timestamp:

Aug 11, 2005, 3:26:54 AM (20 years ago)

Author:

mjs

Message:

JavaScriptCore:

Reviewed by Geoff.

Refactor assignment grammar to avoid Reference type, and to later
be able to take advantage of writeable PropertySlots, when those
are added. I also fixed a minor bug, turning a function to a
string lost parentheses, I made sure they are printed at least
where semantically significant.

Test cases: see WebCore

• kjs/grammar.y: Change grammar so that assignment expressions are parsed directly to nodes that know how to set the kind of location being assigned, instead of having a generic assign node that counts on evaluateReference.
• kjs/lexer.cpp: Include grammar_types.h.
• kjs/nodes.cpp: (BracketAccessorNode): Renamed from AccessorNode1 for clarity. (DotAccessorNode): Renamed from AccessorNode2 for clarity. (combineForAssignment): Inline function for doing the proper kind of operation for various update assignments like += or *=. (AssignResolveNode): Node that handles assignment to a bare identifier. (AssignDotNode): Node that handles assignments of the form EXPR . IDENT = EXPR (AssignBracketNode): EXPR [ IDENT ] = EXPR
• kjs/nodes.h: Updated for declarations/renames of new classes.
• kjs/nodes2string.cpp: (GroupNode::streamTo): Fixed to print parens around the expression. (BracketAccessorNode::streamTo): Renamed. (DotAccessorNode::streamTo): Renamed. (AssignResolveNode::streamTo): Added. (AssignBracketNode::streamTo): Added. (AssignDotNode::streamTo): Added. (streamAssignmentOperatorTo): helper function for the above
• kjs/property_slot.h: (KJS::PropertySlot::isSet): Made this const.

WebCore:

Reviewed by Geoff.

Test cases added:

• layout-tests/fast/js/assign.html: Added. Test case for assignment to make sure I didn't break anything.
• layout-tests/fast/js/code-serialize-paren.html: Added, test case for a minor bug I fixed where parens were not getting serialized at all when turning a function into a string.

File:

• trunk/JavaScriptCore/kjs/nodes.h (modified) (4 diffs)

trunk/JavaScriptCore/kjs/nodes.h

@@ -211 +211 @@
     virtual ValueImp *evaluate(ExecState *exec);
     virtual Reference evaluateReference(ExecState *exec);
-    virtual void streamTo(SourceStream &s) const { group->streamTo(s); }
+    virtual void streamTo(SourceStream &s) const;
   private:
     Node *group;
@@ -291 +291 @@
   };
 
-  class AccessorNode1 : public Node {
-  public:
-    AccessorNode1(Node *e1, Node *e2) : expr1(e1), expr2(e2) {}
+  class BracketAccessorNode : public Node {
+  public:
+    BracketAccessorNode(Node *e1, Node *e2) : expr1(e1), expr2(e2) {}
     virtual void ref();
     virtual bool deref();
@@ -304 +304 @@
   };
 
-  class AccessorNode2 : public Node {
-  public:
-    AccessorNode2(Node *e, const Identifier &s) : expr(e), ident(s) { }
+  class DotAccessorNode : public Node {
+  public:
+    DotAccessorNode(Node *e, const Identifier &s) : expr(e), ident(s) { }
     virtual void ref();
     virtual bool deref();
@@ -581 +581 @@
   };
 
-  class AssignNode : public Node {
-  public:
-    AssignNode(Node *l, Operator o, Node *e) : left(l), oper(o), expr(e) {}
-    virtual void ref();
-    virtual bool deref();
-    ValueImp *evaluate(ExecState *exec);
-    virtual void streamTo(SourceStream &s) const;
-  private:
-    Node *left;
-    Operator oper;
-    Node *expr;
+  class AssignResolveNode : public Node {
+  public:
+    AssignResolveNode(const Identifier &ident, Operator oper, Node *right) 
+      : m_ident(ident), m_oper(oper), m_right(right) {}
+    virtual void ref();
+    virtual bool deref();
+    ValueImp *evaluate(ExecState *exec);
+    virtual void streamTo(SourceStream &s) const;
+  protected:
+    Identifier m_ident;
+    Operator m_oper;
+    Node *m_right;
+  };
+
+  class AssignBracketNode : public Node {
+  public:
+    AssignBracketNode(Node *base, Node *subscript, Operator oper, Node *right) 
+      : m_base(base), m_subscript(subscript), m_oper(oper), m_right(right) {}
+    virtual void ref();
+    virtual bool deref();
+    ValueImp *evaluate(ExecState *exec);
+    virtual void streamTo(SourceStream &s) const;
+  protected:
+    Node *m_base;
+    Node *m_subscript;
+    Operator m_oper;
+    Node *m_right;
+  };
+
+  class AssignDotNode : public Node {
+  public:
+    AssignDotNode(Node *base, const Identifier& ident, Operator oper, Node *right)
+      : m_base(base), m_ident(ident), m_oper(oper), m_right(right) {}
+    virtual void ref();
+    virtual bool deref();
+    ValueImp *evaluate(ExecState *exec);
+    virtual void streamTo(SourceStream &s) const;
+  protected:
+    Node *m_base;
+    Identifier m_ident;
+    Operator m_oper;
+    Node *m_right;
   };