jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactored custom javascript engines to support primitive 'require' statements.

Browse source
This commit is contained in:
Oliver Buchtala 2013-09-06 00:38:07 +03:00
commit 4794fa1884
5 changed files with 203 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

134
Tools/javascript/jsc_shell.cxx
View file

@ -14,7 +14,7 @@
class JSCShell: public JSShell {
typedef int (*JSCIntializer)(JSGlobalContextRef context);
typedef int (*JSCIntializer)(JSGlobalContextRef context, JSObjectRef *module);
public:
@ -24,26 +24,26 @@ public:
protected:
virtual bool RegisterModule(HANDLE library, const std::string& module_name);
virtual bool InitializeEngine();
virtual bool ExecuteScript(const std::string& source, const std::string& name);
virtual bool ExecuteScript(const std::string& source, const std::string& scriptPath);
virtual bool DisposeEngine();
private:
static JSValueRef Print(JSContextRef context,JSObjectRef object, JSObjectRef globalobj, size_t argc, const JSValueRef args[], JSValueRef* ex);
JSObjectRef Import(const std::string &moduleName);
static JSValueRef Print(JSContextRef context, JSObjectRef object, JSObjectRef globalobj, size_t argc, const JSValueRef args[], JSValueRef* ex);
static JSValueRef Require(JSContextRef context, JSObjectRef object, JSObjectRef globalobj, size_t argc, const JSValueRef args[], JSValueRef* ex);
static bool RegisterFunction(JSGlobalContextRef context, JSObjectRef object, const char* functionName, JSObjectCallAsFunctionCallback cbFunction);
static void PrintError(JSContextRef, JSValueRef, const std::string&);
static void PrintError(JSContextRef, JSValueRef);
private:
std::vector<JSCIntializer> module_initializers;
JSGlobalContextRef context;
};
@ -54,16 +54,6 @@ JSCShell::~JSCShell() {
}
}
bool JSCShell::RegisterModule(HANDLE library, const std::string& module_name) {
std::string symname = std::string(module_name).append("_initialize");
JSCIntializer init_function = reinterpret_cast<JSCIntializer>((long) LOAD_SYMBOL(library, symname.c_str()));
if(init_function == 0) return false;
module_initializers.push_back(init_function);
return true;
}
bool JSCShell::InitializeEngine() {
if(context != 0) {
JSGlobalContextRelease(context);
@ -73,26 +63,33 @@ bool JSCShell::InitializeEngine() {
context = JSGlobalContextCreate(NULL);
if(context == 0) return false;
JSObjectRef globalObject = JSContextGetGlobalObject(context);
// store this for later use
JSClassDefinition __shell_classdef__;
JSClassRef __shell_class__ = JSClassCreate(&__shell_classdef__);
JSObjectRef __shell__ = JSObjectMake(context, __shell_class__, 0);
bool success = JSObjectSetPrivate(__shell__, (void*) (long) this);
JSStringRef shellKey = JSStringCreateWithUTF8CString("__shell__");
JSObjectSetProperty(context, globalObject, shellKey, __shell__, kJSPropertyAttributeReadOnly, NULL);
JSStringRelease(shellKey);
JSCShell::RegisterFunction(context, globalObject, "print", JSCShell::Print);
// Call module initializers
for(std::vector<JSCIntializer>::iterator it = module_initializers.begin();
it != module_initializers.end(); ++it) {
JSCIntializer init_function = *it;
if(!init_function(context)) {
return false;
}
}
JSCShell::RegisterFunction(context, globalObject, "require", JSCShell::Require);
return true;
}
bool JSCShell::ExecuteScript(const std::string& source, const std::string& name) {
bool JSCShell::ExecuteScript(const std::string& source, const std::string& scriptPath) {
JSStringRef jsScript;
JSStringRef sourceURL;
JSValueRef ex;
jsScript = JSStringCreateWithUTF8CString(source.c_str());
JSValueRef jsResult = JSEvaluateScript(context, jsScript, 0, 0, 0, &ex);
sourceURL = JSStringCreateWithUTF8CString(scriptPath.c_str());
JSValueRef jsResult = JSEvaluateScript(context, jsScript, 0, sourceURL, 0, &ex);
JSStringRelease(jsScript);
if (jsResult == NULL && ex != NULL) {
JSCShell::PrintError(context, ex, name);
JSCShell::PrintError(context, ex);
return false;
}
return true;
@ -121,6 +118,65 @@ JSValueRef JSCShell::Print(JSContextRef context, JSObjectRef object,
return JSValueMakeUndefined(context);
}
// Attention: this feature should not create too high expectations.
// It is only capable of loading things relative to the execution directory
// and not relative to the parent script.
JSValueRef JSCShell::Require(JSContextRef context, JSObjectRef object,
JSObjectRef globalObj, size_t argc,
const JSValueRef args[], JSValueRef* ex) {
JSObjectRef module;
JSStringRef shellKey = JSStringCreateWithUTF8CString("__shell__");
JSValueRef shellAsVal = JSObjectGetProperty(context, globalObj, shellKey, NULL);
JSStringRelease(shellKey);
JSObjectRef shell = JSValueToObject(context, shellAsVal, 0);
JSCShell *_this = (JSCShell*) (long) JSObjectGetPrivate(shell);
if (argc > 0)
{
JSStringRef string = JSValueToStringCopy(context, args[0], NULL);
size_t numChars = JSStringGetMaximumUTF8CStringSize(string);
char *stringUTF8 = new char[numChars];
JSStringGetUTF8CString(string, stringUTF8, numChars);
std::string modulePath(stringUTF8);
module = _this->Import(modulePath);
delete[] stringUTF8;
}
if (module) {
return module;
} else {
printf("Ooops.\n");
return JSValueMakeUndefined(context);
}
}
JSObjectRef JSCShell::Import(const std::string& module_path) {
HANDLE library;
std::string module_name = LoadModule(module_path, &library);
if (library == 0) {
printf("Could not load module.");
return 0;
}
std::string symname = std::string(module_name).append("_initialize");
JSCIntializer init_function = reinterpret_cast<JSCIntializer>((long) LOAD_SYMBOL(library, symname.c_str()));
if(init_function == 0) {
printf("Could not find module's initializer function.");
return 0;
}
JSObjectRef module;
init_function(context, &module);
return module;
}
bool JSCShell::RegisterFunction(JSGlobalContextRef context, JSObjectRef object,
const char* functionName, JSObjectCallAsFunctionCallback callback) {
JSStringRef js_functionName = JSStringCreateWithUTF8CString(functionName);
@ -131,12 +187,12 @@ bool JSCShell::RegisterFunction(JSGlobalContextRef context, JSObjectRef object,
return true;
}
void JSCShell::PrintError(JSContextRef ctx, JSValueRef err, const std::string& name) {
void JSCShell::PrintError(JSContextRef ctx, JSValueRef err) {
char *buffer;
size_t length;
JSStringRef string = JSValueToStringCopy(ctx, err, 0);
size_t length = JSStringGetLength(string);
length = JSStringGetLength(string);
buffer = new char[length+1];
JSStringGetUTF8CString(string, buffer, length+1);
std::string errMsg(buffer);
@ -150,14 +206,22 @@ void JSCShell::PrintError(JSContextRef ctx, JSValueRef err, const std::string& n
return;
}
// Note: usually you would also retrieve the property "sourceURL"
// though, it happened that this was always ""
JSStringRef sourceURLKey = JSStringCreateWithUTF8CString("sourceURL");
JSStringRef sourceURLStr = JSValueToStringCopy(ctx, JSObjectGetProperty(ctx, errObj, sourceURLKey, 0), 0);
length = JSStringGetLength(sourceURLStr);
buffer = new char[length+1];
JSStringGetUTF8CString(sourceURLStr, buffer, length+1);
std::string sourceURL(buffer);
delete[] buffer;
JSStringRelease(sourceURLStr);
JSStringRelease(sourceURLKey);
JSStringRef lineKey = JSStringCreateWithUTF8CString("line");
JSValueRef jsLine = JSObjectGetProperty(ctx, errObj, lineKey, 0);
int line = (int) JSValueToNumber(ctx, jsLine, 0);
JSStringRelease(lineKey);
std::cerr << name << ":" << line << ":" << errMsg << std::endl;
std::cerr << sourceURL << ":" << line << ":" << errMsg << std::endl;
}
JSShell* JSCShell_Create() {