blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

javascript: explicitely use v8 namespace

Browse Source
This commit is contained in:
Sébastien Helleu 2015-03-15 10:06:42 +01:00
parent 9f158510b1
commit bdba152d81
4 changed files with 454 additions and 453 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

874
src/plugins/javascript/weechat-js-api.cpp
View File

File diff suppressed because it is too large Load Diff

2
src/plugins/javascript/weechat-js-v8.h
View File

@ -46,7 +46,7 @@ public:
private:
v8::HandleScope handle_scope;
v8::Handle<v8::ObjectTemplate> global;
v8::Persistent<Context> context;
v8::Persistent<v8::Context> context;
v8::Handle<v8::String> source;
};

25
src/plugins/javascript/weechat-js.cpp
View File

@ -89,19 +89,19 @@ weechat_js_hashtable_map_cb (void *data,
/* make C++ compiler happy */
(void) hashtable;
Handle<Object> *obj = (Handle<Object> *)data;
v8::Handle<v8::Object> *obj = (v8::Handle<v8::Object> *)data;
(*obj)->Set(String::New(key), String::New(value));
(*obj)->Set(v8::String::New(key), v8::String::New(value));
}
/*
* Converts a WeeChat hashtable to a javascript hashtable.
*/
Handle<Object>
v8::Handle<v8::Object>
weechat_js_hashtable_to_object (struct t_hashtable *hashtable)
{
Handle<Object> obj = Object::New();
v8::Handle<v8::Object> obj = v8::Object::New();
weechat_hashtable_map_string (hashtable,
&weechat_js_hashtable_map_cb,
@ -116,15 +116,15 @@ weechat_js_hashtable_to_object (struct t_hashtable *hashtable)
*/
struct t_hashtable *
weechat_js_object_to_hashtable (Handle<Object> obj,
weechat_js_object_to_hashtable (v8::Handle<v8::Object> obj,
int size,
const char *type_keys,
const char *type_values)
{
struct t_hashtable *hashtable;
unsigned int i;
Handle<Array> keys;
Handle<Value> key, value;
v8::Handle<v8::Array> keys;
v8::Handle<v8::Value> key, value;
hashtable = weechat_hashtable_new (size, type_keys, type_values,
NULL, NULL);
@ -137,8 +137,8 @@ weechat_js_object_to_hashtable (Handle<Object> obj,
{
key = keys->Get(i);
value = obj->Get(key);
String::Utf8Value str_key(key);
String::Utf8Value str_value(value);
v8::String::Utf8Value str_key(key);
v8::String::Utf8Value str_value(value);
if (strcmp (type_values, WEECHAT_HASHTABLE_STRING) == 0)
{
weechat_hashtable_set (hashtable, *str_key, *str_value);
@ -167,7 +167,7 @@ weechat_js_exec (struct t_plugin_script *script,
struct t_plugin_script *old_js_current_script;
WeechatJsV8 *js_v8;
void *ret_value;
Handle<Value> argv2[16], ret_js;
v8::Handle<v8::Value> argv2[16], ret_js;
int i, argc, *ret_int;
ret_value = NULL;
@ -214,7 +214,7 @@ weechat_js_exec (struct t_plugin_script *script,
{
if ((ret_type == WEECHAT_SCRIPT_EXEC_STRING) && (ret_js->IsString()))
{
String::Utf8Value temp_str(ret_js);
v8::String::Utf8Value temp_str(ret_js);
ret_value = *temp_str;
}
else if ((ret_type == WEECHAT_SCRIPT_EXEC_INT) && (ret_js->IsInt32()))
@ -704,7 +704,8 @@ weechat_js_signal_debug_libs_cb (void *data, const char *signal,
(void) type_data;
(void) signal_data;
weechat_printf (NULL, " %s (v8): %s", JS_PLUGIN_NAME, V8::GetVersion());
weechat_printf (NULL, " %s (v8): %s",
JS_PLUGIN_NAME, v8::V8::GetVersion());
return WEECHAT_RC_OK;
}

6
src/plugins/javascript/weechat-js.h
View File

@ -38,8 +38,6 @@
#define JS_CURRENT_SCRIPT_NAME ((js_current_script) ? js_current_script->name : "-")
using namespace v8;
class WeechatJsV8;
extern struct t_weechat_plugin *weechat_js_plugin;
@ -52,8 +50,8 @@ extern struct t_plugin_script *js_registered_script;
extern const char *js_current_script_filename;
extern WeechatJsV8 *js_current_interpreter;
extern Handle<Object> weechat_js_hashtable_to_object (struct t_hashtable *hashtable);
extern struct t_hashtable *weechat_js_object_to_hashtable (Handle<Object> obj,
extern v8::Handle<v8::Object> weechat_js_hashtable_to_object (struct t_hashtable *hashtable);
extern struct t_hashtable *weechat_js_object_to_hashtable (v8::Handle<v8::Object> obj,
int size,
const char *type_keys,
const char *type_values);