Changeset 18837 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Jan 13, 2007, 11:53:38 PM (18 years ago)

Author:

bdash

Message:

2007-01-14 Mark Rowe <​[email protected]>

Reviewed by Mitz.

Minor fixes to JavaScript pretty-printing.

• JavaScriptCore.exp:
• kjs/Parser.cpp: (KJS::Parser::prettyPrint): Return line number and error message if parsing fails.
• kjs/Parser.h:
• kjs/nodes2string.cpp: (ElementNode::streamTo): Include comma delimiters in array literals. (PropertyNameNode::streamTo): Quote property names in object literals to handle the case when the property name is not a valid identifier.
• kjs/testkjs.cpp: (doIt): Print any errors encountered while pretty-printing.

2007-01-14 Mark Rowe <​[email protected]>

Reviewed by Mitz.

Layout tests for fixes to JavaScript pretty-printing.

• fast/js/pretty-print-expected.txt:
• fast/js/resources/pretty-print.js: Test handling of object literal with non-identifier property name, and of array literals.

Location:

trunk/JavaScriptCore/kjs

Files:

• Parser.cpp (modified) (1 diff)
• Parser.h (modified) (1 diff)
• nodes2string.cpp (modified) (2 diffs)
• testkjs.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/Parser.cpp

@@ -110 +110 @@
 }
 
-UString Parser::prettyPrint(const UString& code)
+UString Parser::prettyPrint(const UString& code, int* errLine, UString* errMsg)
 {
-    RefPtr<ProgramNode> progNode = parse(UString(), 0, code.data(), code.size());
+    RefPtr<ProgramNode> progNode = parse(UString(), 0, code.data(), code.size(), 0, errLine, errMsg);
     if (!progNode)
         return 0;

trunk/JavaScriptCore/kjs/Parser.h

@@ -49 +49 @@
             int* sourceId = 0, int* errLine = 0, UString* errMsg = 0);
 
-        static UString prettyPrint(const UString&);
+        static UString prettyPrint(const UString&, int* errLine = 0, UString* errMsg = 0);
         
         static void accept(PassRefPtr<ProgramNode>);

trunk/JavaScriptCore/kjs/nodes2string.cpp

@@ -142 +142 @@
       s << ",";
     s << n->node;
+    if (n->next)
+        s << ",";
   }
 }
@@ -194 +196 @@
     s << UString::from(numeric);
   else
-    s << str;
+    s << '"' << escapeStringForPrettyPrinting(str.ustring()) << '"';
 }
 

trunk/JavaScriptCore/kjs/testkjs.cpp

@@ -247 +247 @@
     
     if (prettyPrint) {
-      UString s = Parser::prettyPrint(script);
+      int errLine = 0;
+      UString errMsg;
+      UString s = Parser::prettyPrint(script, &errLine, &errMsg);
       if (s.isNull()) {
+        fprintf(stderr, "%s:%d: %s.\n", fileName, errLine, errMsg.UTF8String().c_str());
         success = false;
         break;