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

Timestamp:

Sep 28, 2005, 11:51:15 AM (20 years ago)

Author:

darin

Message:

Reviewed by Maciej.

• update grammar to fix conflicts; fixes one of our test cases because it resolves the relationship between function expressions and declarations in the way required by the ECMA specification

• kjs/grammar.y: Added lots of new grammar rules so we have no conflicts. A new set of rules for "no bracket or function at start of expression" and another set of rules for "no in anywhere in expression". Also simplified the handling of try to use only a single node and used operator precedence to get rid of the conflict in handling of if and else. Also used a macro to streamline the handling of automatic semicolons and changed parenthesis handling to use a virtual function.

• kjs/nodes.h: Added nodeInsideAllParens, removed unused abortStatement. (KJS::TryNode::TryNode): Updated to hold catch and finally blocks directly instead of using a special node for each.
• kjs/nodes.cpp: (Node::createErrorCompletion): Added. Used instead of throwError when creating errors that should not be in a completion rather than an ExecState. (Node::throwUndefinedVariableError): Added. Sets source location unlike the call it replaces. (Node::nodeInsideAllParens): Added. (GroupNode::nodeInsideAllParens): Added. (StatListNode::execute): Removed code to move exceptions into completion objects; that's now done solely by the KJS_CHECKEXCEPTION macro. (TryNode::execute): Include execution of catch and finally here rather than using separate nodes. (FuncDeclNode::execute): Moved here, no longer inline.
• kjs/nodes2string.cpp: (TryNode::streamTo): Updated for change. (FuncDeclNode::streamTo): Ditto. (FuncExprNode::streamTo): Ditto.

• kjs/kjs-test: Removed. Was part of "make check".
• kjs/kjs-test.chk: Ditto.
• kjs/test.js: Ditto.

• tests/mozilla/expected.html: Updated because one more test succeeds.

File:

• trunk/JavaScriptCore/kjs/nodes2string.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/nodes2string.cpp

@@ -1 @@
-// -*- c-basic-offset: 2 -*-
 /*
  *  This file is part of the KDE libraries
@@ -665 +664 @@
 }
 
-void CatchNode::streamTo(SourceStream &s) const
-{
-  s << SourceStream::Endl << "catch (" << ident << ")" << block;
-}
-
-void FinallyNode::streamTo(SourceStream &s) const
-{
-  s << SourceStream::Endl << "finally " << block;
-}
-
 void TryNode::streamTo(SourceStream &s) const
 {
-  s << "try " << block
-    << _catch
-    << _final;
+  s << "try " << tryBlock;
+  if (catchBlock)
+    s << SourceStream::Endl << "catch (" << exceptionIdent << ")" << catchBlock;
+  if (finallyBlock)
+    s << SourceStream::Endl << "finally " << finallyBlock;
 }
 
@@ -689 +680 @@
 }
 
-void FuncDeclNode::streamTo(SourceStream &s) const {
-  s << "function " << ident << "(";
-  if (param)
-    s << param;
-  s << ")" << body;
+void FuncDeclNode::streamTo(SourceStream &s) const
+{
+  s << "function " << ident << "(" << param << ")" << body;
 }
 
 void FuncExprNode::streamTo(SourceStream &s) const
 {
-  s << "function " << "("
-    << param
-    << ")" << body;
+  s << "function " << ident << "(" << param << ")" << body;
 }
 
@@ -708 +695 @@
     s << n->element;
 }
-