Changeset 34470 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Jun 9, 2008, 10:10:27 AM (17 years ago)

Author:

[email protected]

Message:

2008-06-09 Cameron Zwarich <​[email protected]>

Reviewed by Darin.

Bug 17531: Add interactive mode to testkjs
<​https://bugs.webkit.org/show_bug.cgi?id=17531>

This is a cleaned up version of Sam's earlier patch to add an
interactive mode to testkjs.

Readline support is only enabled on Darwin platforms for now, but
other ports can enable it by defining HAVE_READLINE in kjs/config.h.

• JavaScriptCore.xcodeproj/project.pbxproj:
• kjs/config.h:
• kjs/testkjs.cpp: (Options::Options): (runWithScripts): (runInteractive): (printUsageStatement): (parseArguments): (kjsmain):

Location:

trunk/JavaScriptCore/kjs

Files:

• config.h (modified) (1 diff)
• testkjs.cpp (modified) (8 diffs)

trunk/JavaScriptCore/kjs/config.h

@@ -27 +27 @@
 #define HAVE_MMAP 1
 #define HAVE_MERGESORT 1
+#define HAVE_READLINE 1
 #define HAVE_SBRK 1
 #define HAVE_STRINGS_H 1

trunk/JavaScriptCore/kjs/testkjs.cpp

@@ -45 +45 @@
 #endif
 
+#if HAVE(READLINE)
+#include <readline/readline.h>
+#endif
+
 #if HAVE(SYS_TIME_H)
 #include <sys/time.h>
@@ -76 +80 @@
 static JSValue* functionQuit(ExecState*, JSObject*, const List&);
 
+struct Options {
+    Options()
+        : interactive(false)
+        , prettyPrint(false)
+        , dump(false)
+    {
+    }
+
+    bool interactive;
+    bool prettyPrint;
+    bool dump;
+    Vector<UString> fileNames;
+    Vector<UString> arguments;
+};
+
+static const char interactivePrompt[] = "> ";
+static const UString interpreterName("Interpreter");
+
 class StopWatch {
 public:
@@ -293 +315 @@
 }
 
-static bool runWithScripts(const Vector<UString>& fileNames, Vector<UString>& arguments, bool prettyPrint, bool dump)
-{
-    GlobalObject* globalObject = new GlobalObject(arguments);
+static bool runWithScripts(GlobalObject* globalObject, const Vector<UString>& fileNames, bool prettyPrint, bool dump)
+{
     Vector<char> script;
 
@@ -302 +323 @@
 
     bool success = true;
-
     for (size_t i = 0; i < fileNames.size(); i++) {
         UString fileName = fileNames[i];
@@ -325 +345 @@
 }
 
+static void runInteractive(GlobalObject* globalObject)
+{   
+    bool done = false;
+    while (!done) {
+#if HAVE_READLINE
+        char* line = readline(interactivePrompt);
+        if (!line)
+            break;
+        if (line[0])
+            add_history(line);
+        Completion completion = Interpreter::evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), interpreterName, 1, line);
+        free(line);
+#else
+        printf(interactivePrompt);
+        Vector<char, 256> line;
+        int c;
+        while ((c = getchar()) != EOF) {
+            // FIXME: Should we also break on \r? 
+            if (c == '\n')
+                break;
+            line.append(c);
+        }
+        line.append('\0');
+        Completion completion = Interpreter::evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), interpreterName, 1, line.data());
+#endif
+        if (completion.isValueCompletion())
+            printf("%s\n", completion.value()->toString(globalObject->globalExec()).UTF8String().c_str());
+    }
+}
+
 static void printUsageStatement()
 {
     fprintf(stderr, "Usage: testkjs [options] [files] [-- arguments]\n");
-    fprintf(stderr, "  -f  Specifies a source file (deprecated)\n");
-    fprintf(stderr, "  -p  Prints formatted source code\n");
-    fprintf(stderr, "  -d  Dumps bytecode (debug builds only)\n");
-    fprintf(stderr, "  -s  Installs signal handlers that exit on a crash (Unix platforms only)\n");
+    fprintf(stderr, "  -d         Dumps bytecode (debug builds only)\n");
+    fprintf(stderr, "  -f         Specifies a source file (deprecated)\n");
+    fprintf(stderr, "  -h|--help  Prints this help message\n");
+    fprintf(stderr, "  -i         Enables interactive mode (default if no files are specified)\n");
+    fprintf(stderr, "  -p         Prints formatted source code\n");
+    fprintf(stderr, "  -s         Installs signal handlers that exit on a crash (Unix platforms only)\n");
     exit(-1);
 }
 
-static void parseArguments(int argc, char** argv, Vector<UString>& fileNames, Vector<UString>& arguments, bool& prettyPrint, bool& dump)
-{
-    if (argc < 2)
-        printUsageStatement();
-
+static void parseArguments(int argc, char** argv, Options& options)
+{
     int i = 1;
     for (; i < argc; ++i) {
@@ -346 +395 @@
             if (++i == argc)
                 printUsageStatement();
-            fileNames.append(argv[i]);
+            options.fileNames.append(argv[i]);
             continue;
         }
+        if (strcmp(arg, "-h") == 0 || strcmp(arg, "--help") == 0) {
+            printUsageStatement();
+        }
+        if (strcmp(arg, "-i") == 0) {
+            options.interactive = true;
+            continue;
+        }
         if (strcmp(arg, "-p") == 0) {
-            prettyPrint = true;
+            options.prettyPrint = true;
             continue;
         }
         if (strcmp(arg, "-d") == 0) {
-            dump = true;
+            options.dump = true;
             continue;
         }
@@ -370 +426 @@
             break;
         }
-        fileNames.append(argv[i]);
+        options.fileNames.append(argv[i]);
     }
     
-    if (fileNames.isEmpty())
-        printUsageStatement();
+    if (options.fileNames.isEmpty())
+        options.interactive = true;
     
     for (; i < argc; ++i)
-        arguments.append(argv[i]);
+        options.arguments.append(argv[i]);
 }
 
@@ -386 +442 @@
     JSLock lock;
 
-    bool prettyPrint = false;
-    bool dump = false;
-    Vector<UString> fileNames;
-    Vector<UString> arguments;
-    parseArguments(argc, argv, fileNames, arguments, prettyPrint, dump);
-
-    bool success = runWithScripts(fileNames, arguments, prettyPrint, dump);
+    Options options;
+    parseArguments(argc, argv, options);
+
+    GlobalObject* globalObject = new GlobalObject(options.arguments);
+    bool success = runWithScripts(globalObject, options.fileNames, options.prettyPrint, options.dump);
+    if (options.interactive && success)
+        runInteractive(globalObject);
 
 #ifndef NDEBUG