Changeset 18337 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Dec 19, 2006, 10:52:38 PM (18 years ago)

Author:

andersca

Message:

Reviewed by Geoff.

Add -p option to testkjs which pretty prints the files instead of executing them.

• JavaScriptCore.exp:
• JavaScriptCore.xcodeproj/project.pbxproj:
• kjs/Parser.cpp: (KJS::Parser::prettyPrint):
• kjs/Parser.h:
• kjs/testkjs.cpp: (doIt):

Location:

trunk/JavaScriptCore/kjs

Files:

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

trunk/JavaScriptCore/kjs/Parser.cpp

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

trunk/JavaScriptCore/kjs/Parser.h

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

trunk/JavaScriptCore/kjs/testkjs.cpp

@@ -29 +29 @@
 #include "JSLock.h"
 #include "object.h"
+#include "Parser.h"
 
 #include <math.h>
@@ -211 +212 @@
 {
   bool success = true;
+  bool prettyPrint = false;
   GlobalImp* global = new GlobalImp();
 
@@ -233 +235 @@
     if (strcmp(fileName, "-f") == 0) // mozilla test driver script uses "-f" prefix for files
       continue;
+    if (strcmp(fileName, "-p") == 0) {
+      prettyPrint = true;
+      continue;
+    }
     
     char* script = createStringWithContentsOfFile(fileName);
@@ -240 +246 @@
     }
     
-    Completion completion = interp->evaluate(fileName, 0, script);
-    success = success && completion.complType() != Throw;
+    if (prettyPrint) {
+      UString s = Parser::prettyPrint(script);
+      if (s.isNull()) {
+        success = false;
+        break;
+      }
+      
+      printf("%s\n", s.UTF8String().c_str());
+      
+    } else {
+      Completion completion = interp->evaluate(fileName, 0, script);
+      success = success && completion.complType() != Throw;
+    }
+    
     free(script);
   }