Changeset 10135 in webkit for trunk/JavaScriptCore/kjs/nodes2string.cpp

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/nodes2string.cpp (modified) (5 diffs)

trunk/JavaScriptCore/kjs/nodes2string.cpp

@@ -125 +125 @@
 void ResolveNode::streamTo(SourceStream &s) const { s << ident; }
 
+void GroupNode::streamTo(SourceStream &s) const
+{
+  s << "(" << group << ")"; 
+}
+
 void ElementNode::streamTo(SourceStream &s) const
 {
@@ -164 +169 @@
 }
 
-void AccessorNode1::streamTo(SourceStream &s) const
+void BracketAccessorNode::streamTo(SourceStream &s) const
 {
   s << expr1 << "[" << expr2 << "]";
 }
 
-void AccessorNode2::streamTo(SourceStream &s) const
+void DotAccessorNode::streamTo(SourceStream &s) const
 {
   s << expr << "." << ident;
@@ -339 +344 @@
 }
 
-void AssignNode::streamTo(SourceStream &s) const
-{
-  s << left;
+void streamAssignmentOperatorTo(SourceStream &s, Operator oper)
+{
   const char *opStr;
   switch (oper) {
@@ -366 +370 @@
     break;
   case OpURShift:
-    opStr = " >>= ";
+    opStr = " >>>= ";
     break;
   case OpAndEq:
@@ -383 +387 @@
     opStr = " ?= ";
   }
-  s << opStr << expr;
+  s << opStr;
+}
+
+void AssignResolveNode::streamTo(SourceStream &s) const
+{
+  s << m_ident;
+  streamAssignmentOperatorTo(s, m_oper);
+  s << m_right;
+}
+
+void AssignBracketNode::streamTo(SourceStream &s) const
+{
+  s << m_base << "[" << m_subscript << "]";
+  streamAssignmentOperatorTo(s, m_oper);
+  s << m_right;
+}
+
+void AssignDotNode::streamTo(SourceStream &s) const
+{
+  s << m_base << "." << m_ident;
+  streamAssignmentOperatorTo(s, m_oper);
+  s << m_right;
 }