Changeset 19396

Timestamp:

09/17/08 00:01:21 (5 years ago)

Author:

tokuhirom

Message:

restructured

Location:

lang/cplusplus/llv8call/trunk

Files:

• Sconstruct (modified) (1 diff)
• src/core.cc (modified) (1 diff)
• src/dir.cc (modified) (1 diff)
• src/dll.cc (modified) (1 diff)
• src/file.cc (modified) (1 diff)
• src/lib.cc (added)
• src/llv8-util.h (added)
• src/llv8call.h (modified) (2 diffs)
• src/main.cc (modified) (4 diffs)

lang/cplusplus/llv8call/trunk/Sconstruct

@@ -9 +9 @@
   "dir.cc",
   "dll.cc",
+  "lib.cc",
 ]
 include = ['../v8/include/', '/opt/local/include/']

lang/cplusplus/llv8call/trunk/src/core.cc

@@ -45 +45 @@
         v8::HandleScope handle_scope;
         v8::String::AsciiValue file(args[i]);
-        v8::Handle<v8::String> source = ReadFile(*file);
+        v8::Handle<v8::String> source = LLV8::ReadFile(*file);
         if (source.IsEmpty()) {
             return v8::ThrowException(v8::String::New("Error loading file"));
         }
-        ExecuteString(source, v8::String::New(*file), false);
+        LLV8::Exec(source, v8::String::New(*file), false);
     }
     return v8::Undefined();

lang/cplusplus/llv8call/trunk/src/dir.cc

@@ -7 +7 @@
 #include <nspr/prio.h>
 #include <nspr/prerror.h>
+#include "llv8-util.h"
 
 using namespace v8;

lang/cplusplus/llv8call/trunk/src/dll.cc

@@ -2 +2 @@
 #include "llv8call.h"
 #include <nspr/nspr.h>
+#include "llv8-util.h"
 
 using namespace v8;

lang/cplusplus/llv8call/trunk/src/file.cc

@@ -6 +6 @@
 #include <nspr/prio.h>
 #include "llv8call.h"
+#include "llv8-util.h"
 
 using namespace v8;

lang/cplusplus/llv8call/trunk/src/llv8call.h

@@ -1 +1 @@
 #include <v8.h>
-#include <string>
-#include <cassert>
-#include <nspr/nspr.h>
-#include <iostream>
-#include <sstream>
 
 #ifdef _WIN32
@@ -12 +7 @@
 #endif
 
-void setup_syscall(v8::Handle<v8::ObjectTemplate> global);
-void setup_core(v8::Handle<v8::ObjectTemplate> global);
-void setup_io(v8::Handle<v8::ObjectTemplate> global);
-void setup_curl(v8::Handle<v8::ObjectTemplate> global);
-void setup_sqlite3(v8::Handle<v8::ObjectTemplate> global);
-void setup_dll(v8::Handle<v8::ObjectTemplate> global);
-void setup_dir(v8::Handle<v8::ObjectTemplate> global);
-
-template <class T>
-inline T * handle(const v8::Arguments & args, int index) {
-    v8::Local<v8::Value> field = args.This()->GetInternalField(index);
-    assert(field->IsExternal());
-    T* ret = reinterpret_cast<T *>(v8::Handle<v8::External>::Cast(field)->Value());
-    assert(ret);
-    return ret;
+// libllv8call apis
+namespace LLV8 {
+    const char * Version();
+    void Init(v8::Handle<v8::ObjectTemplate> global);
+    bool Exec(v8::Handle<v8::String> source,
+                v8::Handle<v8::Value> name,
+                bool print_result);
+    v8::Handle<v8::String> ReadFile(const char* name);
 }
 
-inline v8::Handle<v8::Value> throw_nspr() {
-    v8::HandleScope handle_scope;
-    int len = PR_GetErrorTextLength();
-    if (len > 0) {
-        char * buf = new char[len];
-        assert(PR_GetErrorText(buf) > 0);
-        v8::Handle<v8::String> strbuf = v8::String::New(buf);
-        return v8::ThrowException(strbuf);
-    } else {
-        std::ostringstream e;
-        e << "Unknown ERROR: " << PR_GetError();
-        return v8::ThrowException(v8::String::New(e.str().c_str()));
-    }
-}
-
-
-#define assert_args(args, length) do { if ((args).Length() != (length)) { return v8::ThrowException(v8::String::New("Exception: missing args")); } } while (0)
-
-// utils
-bool ExecuteString(v8::Handle<v8::String> source,
-                   v8::Handle<v8::Value> name,
-                   bool print_result);
-v8::Handle<v8::String> ReadFile(const char* name);
-

lang/cplusplus/llv8call/trunk/src/main.cc

@@ -8 +8 @@
 #endif
 
-const char * LLV8CALL_VERSION = "0.01";
-
 extern int     __argc;
 extern char ** __argv;
 
-// Executes a string within the current v8 context.
-bool ExecuteString(v8::Handle<v8::String> source,
-                   v8::Handle<v8::Value> name,
-                   bool print_result) {
-    v8::HandleScope handle_scope;
-    v8::TryCatch try_catch;
-    v8::Handle<v8::Script> script = v8::Script::Compile(source, name);
-    if (script.IsEmpty()) {
-        // Print errors that happened during compilation.
-        v8::String::AsciiValue error(try_catch.Exception());
-        printf("%s\n", *error);
-        return false;
-    } else {
-        v8::Handle<v8::Value> result = script->Run();
-        if (result.IsEmpty()) {
-        // Print errors that happened during execution.
-        v8::String::AsciiValue error(try_catch.Exception());
-        printf("%s\n", *error);
-        return false;
-        } else {
-        if (print_result && !result->IsUndefined()) {
-            // If all went well and the result wasn't undefined then print
-            // the returned value.
-            v8::String::AsciiValue str(result);
-            printf("%s\n", *str);
-        }
-        return true;
-        }
-    }
-}
-
-v8::Handle<v8::String> ReadFile(const char* name) {
-    FILE* file = fopen(name, "rb");
-    if (file == NULL) return v8::Handle<v8::String>();
-
-    fseek(file, 0, SEEK_END);
-    int size = ftell(file);
-    rewind(file);
-
-    char* chars = new char[size + 1];
-    char *buffer;
-    chars[size] = '\0';
-    for (int i = 0; i < size;) {
-        int read = fread(&chars[i], 1, size - i, file);
-        i += read;
-    }
-    fclose(file);
-    if (size>2 && chars[0] == '#' && chars[1] == '!') {
-            // shebang hack
-            char *end = strchr(chars, '\n');
-            if (end && end-chars > 0) {
-                size -= (end-chars) + 1;
-                buffer = end+1;
-            }
-    } else {
-        buffer = chars;
-    }
-    v8::Handle<v8::String> result = v8::String::New(buffer, size);
-    delete[] chars;
-    return result;
-}
-
 void run_shell_mode() {
-    printf("V8 version %s, llv8call version %s\n", v8::V8::GetVersion(), LLV8CALL_VERSION);
+    printf("V8 version %s, llv8call version %s\n", v8::V8::GetVersion(), LLV8::Version());
 #ifdef HAVE_READLINE
     {
@@ -84 +20 @@
         while (line = readline("llv8call> ")) {
             v8::HandleScope handle_scope;
-            ExecuteString(v8::String::New(line), v8::Undefined(), true);
+            LLV8::Exec(v8::String::New(line), v8::Undefined(), true);
             add_history(line);
             if (++history_count > MAX_HISTORY) {
@@ -117 +53 @@
     // bind functions
     v8::Handle<v8::ObjectTemplate> global = v8::ObjectTemplate::New();
-    setup_syscall(global);
-    setup_core(global);
-    setup_io(global);
-    setup_dll(global);
-    setup_dir(global);
+    LLV8::Init(global);
 
     v8::Handle<v8::Context> context = v8::Context::New(NULL, global);
@@ -129 +61 @@
         const char *srcfile = argv[1];
         v8::Handle<v8::String> file_name = v8::String::New(srcfile);
-        v8::Handle<v8::String> source = ReadFile(srcfile);
+        v8::Handle<v8::String> source = LLV8::ReadFile(srcfile);
         if (source.IsEmpty()) {
             printf("Error reading '%s'\n", srcfile);
             return 1;
         }
-        if (!ExecuteString(source, file_name, false)) {
+        if (!LLV8::Exec(source, file_name, false)) {
             return 1;
         }