Changeset 27031 in webkit

Timestamp:

Oct 25, 2007 2:08:51 AM (16 years ago)

Author:

eseidel

Message:

2007-10-25 Eric Seidel <​eric@webkit.org>

Reviewed by Maciej.

More preparation work before adding long-running mode to testkjs.

• kjs/testkjs.cpp: (TestFunctionImp::callAsFunction): (prettyPrintScript): (runWithScripts): (parseArguments): (kjsmain): (fillBufferWithContentsOfFile):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (1 diff)
• kjs/testkjs.cpp (modified) (9 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-10-25  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Maciej.
+        
+        More preparation work before adding long-running mode to testkjs.
+
+        * kjs/testkjs.cpp:
+        (TestFunctionImp::callAsFunction):
+        (prettyPrintScript):
+        (runWithScripts):
+        (parseArguments):
+        (kjsmain):
+        (fillBufferWithContentsOfFile):
+
 2007-10-25  Eric Seidel  <eric@webkit.org>
 

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -1380 +1380 @@
                         isa = PBXProject;
                         buildConfigurationList = 149C277108902AFE008A9EFC /* Build configuration list for PBXProject "JavaScriptCore" */;
-                        compatibilityVersion = "Xcode 2.4";
                         hasScannedForEncodings = 1;
                         mainGroup = 0867D691FE84028FC02AAC07 /* JavaScriptCore */;

trunk/JavaScriptCore/kjs/testkjs.cpp

@@ -53 +53 @@
 
 static void testIsInteger();
-static bool fillBufferWithContentsOfFile(const char* fileName, Vector<char>& buffer);
+static bool fillBufferWithContentsOfFile(const UString& fileName, Vector<char>& buffer);
 
 class StopWatch
@@ -160 +160 @@
       UString fileName = args[0]->toString(exec);
       Vector<char> script;
-      if (!fillBufferWithContentsOfFile(fileName.UTF8String().c_str(), script))
+      if (!fillBufferWithContentsOfFile(fileName, script))
         return throwError(exec, GeneralError, "Could not open file.");
 
@@ -173 +173 @@
       UString fileName = args[0]->toString(exec);
       Vector<char> script;
-      if (!fillBufferWithContentsOfFile(fileName.UTF8String().c_str(), script))
+      if (!fillBufferWithContentsOfFile(fileName, script))
         return throwError(exec, GeneralError, "Could not open file.");
 
@@ -188 +188 @@
 }
 
-#if PLATFORM(WIN_OS)
-
 // Use SEH for Release builds only to get rid of the crash report dialog
-// (luckyly the same tests fail in Release and Debug builds so far). Need to
+// (luckily the same tests fail in Release and Debug builds so far). Need to
 // be in a separate main function because the kjsmain function requires object
 // unwinding.
 
-#if defined(_DEBUG)
+#if PLATFORM(WIN_OS) && !defined(_DEBUG)
+#define TRY       __try {
+#define EXCEPT(x) } __except (EXCEPTION_EXECUTE_HANDLER) { x; }
+#else
 #define TRY
 #define EXCEPT(x)
-#else
-#define TRY       __try {
-#define EXCEPT(x) } __except (EXCEPTION_EXECUTE_HANDLER) { x; }
-#endif
-
-#else
-
-#define TRY
-#define EXCEPT(x)
-
 #endif
 
@@ -251 +242 @@
 }
 
-static bool prettyPrintScript(const char* fileName, const Vector<char>& script)
+static bool prettyPrintScript(const UString& fileName, const Vector<char>& script)
 {
   int errLine = 0;
@@ -257 +248 @@
   UString s = Parser::prettyPrint(script.data(), &errLine, &errMsg);
   if (s.isNull()) {
-    fprintf(stderr, "%s:%d: %s.\n", fileName, errLine, errMsg.UTF8String().c_str());
+    fprintf(stderr, "%s:%d: %s.\n", fileName.UTF8String().c_str(), errLine, errMsg.UTF8String().c_str());
     return false;
   }
@@ -265 +256 @@
 }
 
-static bool doIt(int argc, char** argv)
-{
-  bool success = true;
-  bool prettyPrint = false;
-
+static bool runWithScripts(const Vector<UString>& fileNames, bool prettyPrint)
+{
   RefPtr<Interpreter> interp = setupInterpreter();
   Vector<char> script;
+  
+  bool success = true;
+  
+  for (size_t i = 0; i < fileNames.size(); i++) {
+    UString fileName = fileNames[i];
+    
+    if (!fillBufferWithContentsOfFile(fileName, script))
+      return false; // fail early so we can catch missing files
+    
+    if (prettyPrint)
+      prettyPrintScript(fileName, script);
+    else {
+      Completion completion = interp->evaluate(fileName, 0, script.data());
+      success = success && completion.complType() != Throw;
+    }
+  }
+  return success;
+}
+
+static void parseArguments(int argc, char** argv, Vector<UString>& fileNames, bool& prettyPrint)
+{
+  if (argc < 2) {
+    fprintf(stderr, "Usage: testkjs file1 [file2...]\n");
+    exit(-1);
+  }
   
   for (int i = 1; i < argc; i++) {
@@ -281 +294 @@
       continue;
     }
-    
-    script.clear();
-    if (!fillBufferWithContentsOfFile(fileName, script)) {
-      success = false;
-      break; // fail early so we can catch missing files
-    }
-    
-    if (prettyPrint)
-      prettyPrintScript(fileName, script);
-    else {
-      Completion completion = interp->evaluate(fileName, 0, script.data());
-      success = success && completion.complType() != Throw;
-    }
-  }
-
-  return success;
-}
-
+    fileNames.append(fileName);
+  }
+}
 
 int kjsmain(int argc, char** argv)
 {
-  if (argc < 2) {
-    fprintf(stderr, "Usage: testkjs file1 [file2...]\n");
-    return -1;
-  }
-
   testIsInteger();
 
   JSLock lock;
-
-  bool success = doIt(argc, argv);
+  
+  bool prettyPrint = false;
+  Vector<UString> fileNames;
+  parseArguments(argc, argv, fileNames, prettyPrint);
+  
+  bool success = runWithScripts(fileNames, prettyPrint);
 
 #ifndef NDEBUG
@@ -349 +346 @@
 }
 
-static bool fillBufferWithContentsOfFile(const char* fileName, Vector<char>& buffer)
-{
-  FILE* f = fopen(fileName, "r");
+static bool fillBufferWithContentsOfFile(const UString& fileName, Vector<char>& buffer)
+{
+  FILE* f = fopen(fileName.UTF8String().c_str(), "r");
   if (!f) {
-    fprintf(stderr, "Could not open file: %s\n", fileName);
+    fprintf(stderr, "Could not open file: %s\n", fileName.UTF8String().c_str());
     return false;
   }