Mercurial > MadButterfly
changeset 651:aa52883534fc
Code generated by generator can be built
| author | Thinker K.F. Li <thinker@branda.to> |
|---|---|
| date | Sat, 31 Jul 2010 13:28:48 +0800 |
| parents | 123e7eeff10c |
| children | 1748dce31cdb |
| files | nodejs/Makefile.am nodejs/observer.cc nodejs/observer.m4 nodejs/wscript tools/gen_v8_binding.m4 |
| diffstat | 5 files changed, 142 insertions(+), 39 deletions(-) [+] |
line wrap: on
line diff
--- a/nodejs/Makefile.am Thu Jul 29 13:07:25 2010 +0800 +++ b/nodejs/Makefile.am Sat Jul 31 13:28:48 2010 +0800 @@ -17,7 +17,8 @@ LDFLAGS="$(mbfly_node_LDFLAGS)" \ TOP_BUILDDIR="$(abs_top_builddir)" \ WAFLOCK=$(abs_builddir)/objs/.lock-wscript \ - $(NODE_WAF) configure build --blddir=$(abs_builddir)/objs + $(NODE_WAF) configure build --srcdir=$(abs_srcdir) \ + --blddir=$(abs_builddir)/objs clean-mbfly-node: cd $(srcdir); \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/nodejs/observer.cc Sat Jul 31 13:28:48 2010 +0800 @@ -0,0 +1,61 @@ +#include <v8.h> +#include "mbfly_njs.h" + +extern "C" { +#include <mb.h> +#include <string.h> +} + +#ifndef ASSERT +#define ASSERT(x) +#endif + +using namespace v8; + +struct xnjsmb_observer_data { + Persistent<Function> func; +}; + +static void +event_handler(event_t *evt, void *arg); + +static observer_t * +_subject_add_event_observer(subject_t *subject, int type, + Handle<Function> func) { + observer_t *observer; + xnjsmb_observer_data *data; + + data = new xnjsmb_observer_data; + if(data == NULL) + return NULL; + data->func = Persistent<Function>::New(func); + observer = subject_add_event_observer(subject, type, + event_handler, + data); + + return observer; +} + +static void +_subject_remove_observer(subject_t *subject, observer_t *observer) { + xnjsmb_observer_data *data; + + subject_remove_observer(subject, observer); + data = (xnjsmb_observer_data *)observer->arg; + delete data; +} + +#include "observer-inc.h" + +static void +event_handler(event_t *evt, void *arg) { + xnjsmb_observer_data *data = (xnjsmb_observer_data *)arg; + Handle<Value> evt_obj; + Handle<Value> func_args[1]; + + evt_obj = xnjsmb_event_new(evt); + ASSERT(!evt_obj.IsEmpty()); + func_args[0] = evt_obj; + data->func->Call(Context::GetCurrent()->Global(), 1, func_args); +} +
--- a/nodejs/observer.m4 Thu Jul 29 13:07:25 2010 +0800 +++ b/nodejs/observer.m4 Sat Jul 31 13:28:48 2010 +0800 @@ -1,15 +1,17 @@ -STRUCT([event], [event_t], - [INT([event]), OBJ([tgt], [subject]), - OBJ([cur_tgt], [subject]), INT([flags])], []) +STRUCT([mb_obj], [mb_obj_t], [INT([obj_type])], []) STRUCT([observer], [observer_t], [INT([type])], []) STRUCT([subject], [subject_t], [], - [METHOD([add_event_observer], [subject_add_event_observer], + [METHOD([add_event_observer], [_subject_add_event_observer], (INT([type]), FUNC([handler])), 2, [OBJ([observer], [observer_t])]), - METHOD([remove_observer], [subject_remove_observer], - (OBJ([observer], [observer_t])), 1, [])]) + METHOD([remove_observer], [_subject_remove_observer], + (OBJ([observer], [observer_t])), 1, []), + METHOD([get_object], [subject_get_object], (), 0, + [OBJ([mb_obj], [mb_obj_t])])]) -FUNCTION([load], [my_load], [INT(sz), STR(name)], 2, [OBJ([test],[test_t])]) +STRUCT([event], [event_t], + [INT([type]), OBJ([tgt], [subject], [subject_t]), + OBJ([cur_tgt], [subject], [subject_t]), INT([flags])], [])
--- a/nodejs/wscript Thu Jul 29 13:07:25 2010 +0800 +++ b/nodejs/wscript Sat Jul 31 13:28:48 2010 +0800 @@ -15,20 +15,29 @@ conf.check_tool('compiler_cc') conf.check_tool('node_addon') conf.env.SRCDIR = Options.options.srcdir - conf.env.TOP_BUILDDIR = os.environ['TOP_BUILDDIR'] + conf.env.TOP_BUILDDIR = os.environ['TOP_BUILDDIR'] pass def build(conf): import Utils + conf(rule='m4 -I ${SRCDIR}/../tools gen_v8_binding.m4 ${SRC} > ${TGT}', + source='observer.m4', target='observer-inc.h', + name='observer-inc', shell=True, always=True, before=['cxx']) + obj = conf.new_task_gen('cxx', 'shlib', 'node_addon') obj.target = 'mbfly' obj.source = 'mbfly_njs.cc coord.cc shapes.cc paints.cc font.cc ' + \ 'image_ldr.cc' - obj.add_objects = 'X_supp_njs.o' + obj.add_objects = 'X_supp_njs.o observer.o' obj.staticlib = 'mbfly' - + obj = conf.new_task_gen('cc', 'shlib', 'node_addon') obj.target = 'X_supp_njs.o' obj.source = 'X_supp_njs.c' + + obj = conf.new_task_gen('cxx', 'shlib', 'node_addon') + obj.target = 'observer.o' + obj.source = 'observer.cc' + obj.includes = '.' pass
--- a/tools/gen_v8_binding.m4 Thu Jul 29 13:07:25 2010 +0800 +++ b/tools/gen_v8_binding.m4 Sat Jul 31 13:28:48 2010 +0800 @@ -1,3 +1,6 @@ +dnl +dnl Developers should provide SET, WRAP, UNWRAP, and THROW C macros. +dnl changequote(`[', `]')dnl include([foreach.m4])dnl divert([-1])dnl @@ -17,6 +20,10 @@ define([INT], [ static Handle<Value> ]PROJ_PREFIX[]STRUCT_NAME[_get_$][1(Local<String> property, const AccessorInfo &info) { + Handle<Object> self = info.This(); + STRUCT_TYPE *data; + + data = (STRUCT_TYPE *)UNWRAP(self); return Integer::New(data->$][1); } @@ -34,6 +41,10 @@ define([OBJ], [ static Handle<Value> ]PROJ_PREFIX[]STRUCT_NAME[_get_$][1(Local<String> property, const AccessorInfo &info) { + Handle<Object> self = info.This(); + STRUCT_TYPE *data; + + data = (STRUCT_TYPE *)UNWRAP(self); return ]PROJ_PREFIX[$][2_new(data->$][1); } @@ -43,18 +54,22 @@ const AccessorInfo &info) { Handle<Object> self = info.This(); Handle<Object> obj; - $][2 *v; + $][3 *v; STRUCT_TYPE *data; - data = UNWRAP(self); + data = (STRUCT_TYPE *)UNWRAP(self); obj = value->ToObject(); - v = ($][2 *)UNWRAP(obj); + v = ($][3 *)UNWRAP(obj); data->$][1 = v; } ]) define([STR], [ static Handle<Value> ]PROJ_PREFIX[]STRUCT_NAME[_get_$][1(Local<String> property, const AccessorInfo &info) { + Handle<Object> self = info.This(); + STRUCT_TYPE *data; + + data = (STRUCT_TYPE *)UNWRAP(self); return String::New(data->$][1); } @@ -96,13 +111,17 @@ define([START_METHOD_ARG_VAR], [dnl define([INT], [dnl - int arg_$][1];)dnl + int arg_$][1; +])dnl define([OBJ], [dnl - $][2 *arg_$][1];)dnl + $][2 *arg_$][1; +])dnl define([STR], [dnl - char *arg_$][1];)dnl -define([FUNC], [ - Handle<Function> arg_$][1];)dnl + char *arg_$][1; +])dnl +define([FUNC], [dnl + Handle<Function> arg_$][1; +])dnl ]) define([START_METHOD_ARG_TYPE_CHK], [dnl @@ -117,14 +136,18 @@ ]) define([START_METHOD_ARG_ASSIGN], [dnl -define([INT], [ - arg_$][1 = args[[i++]]->Int32Value();])dnl -define([OBJ], [ - arg_$][1 = ($][2 *)UNWRAP(args[[i++]]->ToObject());])dnl -define([STR], [ - arg_$][1 = strdup(*String::Utf8Value(args[[i++]]->ToString()));])dnl -define([FUNC], [ - arg_$][1 = Function::Cast(args[[i++]]);])dnl +define([INT], [dnl + arg_$][1 = args[[i++]]->Int32Value(); +])dnl +define([OBJ], [dnl + arg_$][1 = ($][2 *)UNWRAP(args[[i++]]->ToObject()); +])dnl +define([STR], [dnl + arg_$][1 = strdup(*String::Utf8Value(args[[i++]]->ToString())); +])dnl +define([FUNC], [dnl + arg_$][1 = args[[i++]].As<Function>(); +])dnl ]) define([START_METHOD_ARG_PASS], [dnl @@ -135,24 +158,24 @@ ]) define([START_METHOD_RET_VAL], [dnl -define([INT], [ +define([INT], [dnl int _ret; ])dnl -define([OBJ], [ +define([OBJ], [dnl $][2 *_ret; ])dnl -define([STR], [ +define([STR], [dnl char *_ret; ])dnl -define([FUNC], [ +define([FUNC], [dnl Handle<Function> _ret; ])dnl ]) define([START_METHOD_RET_ASSIGN], [dnl -define([INT], [_ret = ])dnl -define([OBJ], [_ret = ])dnl -define([STR], [_ret = ])dnl +define([INT], [_ret = (int)])dnl +define([OBJ], [_ret = ($][2 *)])dnl +define([STR], [_ret = (char *)])dnl define([FUNC], [_ret = ])dnl ]) @@ -193,11 +216,11 @@ THROW("Invalid number of arguments (!=$][4)"); i = 0; if(0]dnl -[foreach([ITER], $][3, [START_METHOD_ARG_TYPE_CHK[]ITER[]STOP_METHOD_ARG])) +foreach([ITER], $][3, [START_METHOD_ARG_TYPE_CHK[]ITER[]STOP_METHOD_ARG])[) THROW("Invalid argument type"); i = 0; -foreach([ITER], $][3, [START_METHOD_ARG_ASSIGN[]ITER[]STOP_METHOD_ARG])) +foreach([ITER], $][3, [START_METHOD_ARG_ASSIGN[]ITER[]STOP_METHOD_ARG])dnl START_METHOD_RET_ASSIGN[]$][5[]STOP_METHOD_ARG[]$][2(_self[]foreach([ITER], $][3, [START_METHOD_ARG_PASS[], ITER[]STOP_METHOD_ARG])); START_METHOD_RET[]$][5[]STOP_METHOD_ARG[]dnl @@ -219,12 +242,15 @@ undefine([METHOD])dnl ]) +dnl +dnl STRUCT(struct_name, struct_type, member_vars, methods) +dnl define([STRUCT], [dnl define([STRUCT_NAME], [$1])dnl define([STRUCT_TYPE], [$2])dnl [ /* ************************************************** - * [STRUCT]: $1 + * STRUCT: $1 * Generated by gen_v8_binding.m4 */ static Handle<Value> @@ -255,7 +281,7 @@ Handle<ObjectTemplate> proto_temp; func_temp = FunctionTemplate::New(]PROJ_PREFIX[$1); - func_temp->SetClassName("]STRUCT_NAME["); + func_temp->SetClassName(String::New("]STRUCT_NAME[")); inst_temp = func_temp->InstanceTemplate(); inst_temp->SetInternalFieldCount(1); ] @@ -268,6 +294,9 @@ }]dnl ]) +dnl +dnl FUNCTION(func_name, real_func, arguments, arguement_count, return_type) +dnl define([FUNCTION], [dnl /* ************************************************** * [FUNCTION]: $1 @@ -276,6 +305,7 @@ static Handle<Value> PROJ_PREFIX[]$1(const Arguments &args) { int argc = args.Length(); + int i; foreach([ITER], ($3), [START_METHOD_ARG_VAR[]ITER[]STOP_METHOD_ARG])dnl START_METHOD_RET_VAL[]$5[]STOP_METHOD_ARG[]dnl @@ -287,7 +317,7 @@ THROW("Invalid argument type"); i = 0; -foreach([ITER], ($3), [START_METHOD_ARG_ASSIGN[]ITER[]STOP_METHOD_ARG])) +foreach([ITER], ($3), [START_METHOD_ARG_ASSIGN[]ITER[]STOP_METHOD_ARG])dnl define([SEP], [])dnl START_METHOD_RET_ASSIGN[]$5[]STOP_METHOD_ARG[]$2(foreach([ITER], ($3), [START_METHOD_ARG_PASS[]SEP[]ITER[]STOP_METHOD_ARG[]define([SEP], [, ])]));[]undefine([SEP])