Changeset 27029 in webkit for trunk/JavaScriptCore/kjs/testkjs.cpp

Timestamp:

Oct 25, 2007, 1:37:23 AM (18 years ago)

Author:

eseidel

Message:

2007-10-25 Eric Seidel <​[email protected]>

Reviewed by Maciej.

Bring testkjs code out of the dark ages in preparation for more
radical improvements (like long-running testing support!)

• kjs/testkjs.cpp: (TestFunctionImp::callAsFunction): (setupInterpreter): (doIt): (fillBufferWithContentsOfFile):

File:

• trunk/JavaScriptCore/kjs/testkjs.cpp (modified) (9 diffs)

trunk/JavaScriptCore/kjs/testkjs.cpp

@@ -53 +53 @@
 
 static void testIsInteger();
-static char* createStringWithContentsOfFile(const char* fileName);
+static bool fillBufferWithContentsOfFile(const char* fileName, Vector<char>& buffer);
 
 class StopWatch
@@ -119 +119 @@
 class TestFunctionImp : public JSObject {
 public:
-  TestFunctionImp(int i, int length);
+  enum TestFunctionType { Print, Debug, Quit, GC, Version, Run, Load };
+
+  TestFunctionImp(TestFunctionType i, int length);
   virtual bool implementsCall() const { return true; }
   virtual JSValue* callAsFunction(ExecState* exec, JSObject* thisObj, const List &args);
 
-  enum { Print, Debug, Quit, GC, Version, Run, Load };
-
 private:
-  int id;
+  TestFunctionType m_type;
 };
 
-TestFunctionImp::TestFunctionImp(int i, int length) : JSObject(), id(i)
+TestFunctionImp::TestFunctionImp(TestFunctionType i, int length)
+  : JSObject()
+  , m_type(i)
 {
   putDirect(Identifier("length"), length, DontDelete | ReadOnly | DontEnum);
@@ -136 +138 @@
 JSValue* TestFunctionImp::callAsFunction(ExecState* exec, JSObject*, const List &args)
 {
-  switch (id) {
+  switch (m_type) {
     case Print:
       printf("%s\n", args[0]->toString(exec).UTF8String().c_str());
@@ -156 +158 @@
     {
       StopWatch stopWatch;
-      char* fileName = strdup(args[0]->toString(exec).UTF8String().c_str());
-      char* script = createStringWithContentsOfFile(fileName);
-      if (!script) {
-        free(fileName);
+      UString fileName = args[0]->toString(exec);
+      Vector<char> script;
+      if (!fillBufferWithContentsOfFile(fileName.UTF8String().c_str(), script))
         return throwError(exec, GeneralError, "Could not open file.");
-      }
 
       stopWatch.start();
-      exec->dynamicInterpreter()->evaluate(fileName, 0, script);
+      exec->dynamicInterpreter()->evaluate(fileName, 0, script.data());
       stopWatch.stop();
-
-      free(script);
-      free(fileName);
       
       return jsNumber(stopWatch.getElapsedMS());
@@ -174 +171 @@
     case Load:
     {
-      char* fileName = strdup(args[0]->toString(exec).UTF8String().c_str());
-      char* script = createStringWithContentsOfFile(fileName);
-      if (!script) {
-        free(fileName);
+      UString fileName = args[0]->toString(exec);
+      Vector<char> script;
+      if (!fillBufferWithContentsOfFile(fileName.UTF8String().c_str(), script))
         return throwError(exec, GeneralError, "Could not open file.");
-      }
-
-      exec->dynamicInterpreter()->evaluate(fileName, 0, script);
-
-      free(script);
-      free(fileName);
-      
+
+      exec->dynamicInterpreter()->evaluate(fileName, 0, script.data());
+
       return jsUndefined();
     }
@@ -238 +230 @@
 }
 
-
-bool doIt(int argc, char** argv)
-{
-  bool success = true;
-  bool prettyPrint = false;
+static PassRefPtr<Interpreter> setupInterpreter()
+{
   GlobalImp* global = new GlobalImp();
-
-  // create interpreter
   RefPtr<Interpreter> interp = new Interpreter(global);
   // add debug() function
@@ -259 +246 @@
   global->put(interp->globalExec(), "run", new TestFunctionImp(TestFunctionImp::Run, 1));
   global->put(interp->globalExec(), "load", new TestFunctionImp(TestFunctionImp::Load, 1));
-  
+
   Interpreter::setShouldPrintExceptions(true);
+  return interp.release();
+}
+
+static bool prettyPrintScript(const char* fileName, const Vector<char>& script)
+{
+  int errLine = 0;
+  UString errMsg;
+  UString s = Parser::prettyPrint(script.data(), &errLine, &errMsg);
+  if (s.isNull()) {
+    fprintf(stderr, "%s:%d: %s.\n", fileName, errLine, errMsg.UTF8String().c_str());
+    return false;
+  }
+  
+  printf("%s\n", s.UTF8String().c_str());
+  return true;
+}
+
+static bool doIt(int argc, char** argv)
+{
+  bool success = true;
+  bool prettyPrint = false;
+
+  RefPtr<Interpreter> interp = setupInterpreter();
+  Vector<char> script;
   
   for (int i = 1; i < argc; i++) {
@@ -271 +282 @@
     }
     
-    char* script = createStringWithContentsOfFile(fileName);
-    if (!script) {
+    script.clear();
+    if (!fillBufferWithContentsOfFile(fileName, script)) {
       success = false;
       break; // fail early so we can catch missing files
     }
     
-    if (prettyPrint) {
-      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;
-        free(script);
-        break;
-      }
-      
-      printf("%s\n", s.UTF8String().c_str());
-      
-    } else {
-      Completion completion = interp->evaluate(fileName, 0, script);
+    if (prettyPrint)
+      prettyPrintScript(fileName, script);
+    else {
+      Completion completion = interp->evaluate(fileName, 0, script.data());
       success = success && completion.complType() != Throw;
     }
-    
-    free(script);
   }
 
@@ -351 +349 @@
 }
 
-static char* createStringWithContentsOfFile(const char* fileName)
-{
-  char* buffer;
-  
-  size_t buffer_size = 0;
-  size_t buffer_capacity = 1024;
-  buffer = (char*)malloc(buffer_capacity);
-  
+static bool fillBufferWithContentsOfFile(const char* fileName, Vector<char>& buffer)
+{
   FILE* f = fopen(fileName, "r");
   if (!f) {
     fprintf(stderr, "Could not open file: %s\n", fileName);
-    free(buffer);
-    return 0;
-  }
+    return false;
+  }
+  
+  size_t buffer_size = 0;
+  size_t buffer_capacity = 1024;
+  
+  buffer.resize(buffer_capacity);
   
   while (!feof(f) && !ferror(f)) {
-    buffer_size += fread(buffer + buffer_size, 1, buffer_capacity - buffer_size, f);
+    buffer_size += fread(buffer.data() + buffer_size, 1, buffer_capacity - buffer_size, f);
     if (buffer_size == buffer_capacity) { // guarantees space for trailing '\0'
       buffer_capacity *= 2;
-      buffer = (char*)realloc(buffer, buffer_capacity);
-      ASSERT(buffer);
-    }
-    
-    ASSERT(buffer_size < buffer_capacity);
+      buffer.resize(buffer_capacity);
+    }
   }
   fclose(f);
   buffer[buffer_size] = '\0';
   
-  return buffer;
-}
+  return true;
+}