From 5f66864c3a4d1b60abf6c2888d11b41edc8d869d Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 17 Jan 2013 19:57:48 +0000 Subject: add macros for default proprty actions --- javascript/jsapi.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'javascript/jsapi.h') diff --git a/javascript/jsapi.h b/javascript/jsapi.h index e3295fee9..b26eb5572 100644 --- a/javascript/jsapi.h +++ b/javascript/jsapi.h @@ -75,6 +75,8 @@ /* native proprty definition */ +#define JSAPI_PROP_DEFAULT(name, cx, obj, vp) \ + jsapi_property_##name(cx, obj, jsval jsapi_id, vp) #define JSAPI_PROP_GETTER(name, cx, obj, vp) \ jsapi_property_##name##_get(cx, obj, jsval jsapi_id, vp) #define JSAPI_PROP_SETTER(name, cx, obj, vp) \ @@ -195,6 +197,8 @@ JS_NewCompartmentAndGlobalObject(JSContext *cx, /* proprty native calls */ +#define JSAPI_PROP_DEFAULT(name, cx, obj, vp) \ + jsapi_property_##name(cx, obj, jsval jsapi_id, vp) #define JSAPI_PROP_GETTER(name, cx, obj, vp) \ jsapi_property_##name##_get(cx, obj, jsval jsapi_id, vp) #define JSAPI_PROP_SETTER(name, cx, obj, vp) \ @@ -307,6 +311,8 @@ JS_NewCompartmentAndGlobalObject(JSContext *cx, #define JSAPI_THIS_OBJECT(cx,vp) JS_THIS_OBJECT(cx,vp) /* proprty native calls */ +#define JSAPI_PROP_DEFAULT(name, cx, obj, vp) \ + jsapi_property_##name(cx, obj, jsid jsapi_id, vp) #define JSAPI_PROP_GETTER(name, cx, obj, vp) \ jsapi_property_##name##_get(cx, obj, jsid jsapi_id, vp) #define JSAPI_PROP_SETTER(name, cx, obj, vp) \ -- cgit v1.2.3 From fc6f04161e614521cff67f7bbaf70dbea0332f4d Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 22 Jan 2013 18:58:22 +0000 Subject: simplify jsapi property compatability macros --- javascript/jsapi.h | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) (limited to 'javascript/jsapi.h') diff --git a/javascript/jsapi.h b/javascript/jsapi.h index b26eb5572..b308ca531 100644 --- a/javascript/jsapi.h +++ b/javascript/jsapi.h @@ -75,12 +75,9 @@ /* native proprty definition */ -#define JSAPI_PROP_DEFAULT(name, cx, obj, vp) \ +#define JSAPI_PROP(name, cx, obj, vp) \ jsapi_property_##name(cx, obj, jsval jsapi_id, vp) -#define JSAPI_PROP_GETTER(name, cx, obj, vp) \ - jsapi_property_##name##_get(cx, obj, jsval jsapi_id, vp) -#define JSAPI_PROP_SETTER(name, cx, obj, vp) \ - jsapi_property_##name##_set(cx, obj, jsval jsapi_id, vp) +#define JSAPI_STRICTPROP JSAPI_PROP /* native property return value */ #define JSAPI_PROP_RVAL(cx, vp) (*(vp)) @@ -195,14 +192,10 @@ JS_NewCompartmentAndGlobalObject(JSContext *cx, - /* proprty native calls */ -#define JSAPI_PROP_DEFAULT(name, cx, obj, vp) \ +#define JSAPI_PROP(name, cx, obj, vp) \ jsapi_property_##name(cx, obj, jsval jsapi_id, vp) -#define JSAPI_PROP_GETTER(name, cx, obj, vp) \ - jsapi_property_##name##_get(cx, obj, jsval jsapi_id, vp) -#define JSAPI_PROP_SETTER(name, cx, obj, vp) \ - jsapi_property_##name##_set(cx, obj, jsval jsapi_id, vp) +#define JSAPI_STRICTPROP JSAPI_PROP /* native property return value */ #define JSAPI_PROP_RVAL JS_RVAL @@ -311,12 +304,10 @@ JS_NewCompartmentAndGlobalObject(JSContext *cx, #define JSAPI_THIS_OBJECT(cx,vp) JS_THIS_OBJECT(cx,vp) /* proprty native calls */ -#define JSAPI_PROP_DEFAULT(name, cx, obj, vp) \ +#define JSAPI_PROP(name, cx, obj, vp) \ jsapi_property_##name(cx, obj, jsid jsapi_id, vp) -#define JSAPI_PROP_GETTER(name, cx, obj, vp) \ - jsapi_property_##name##_get(cx, obj, jsid jsapi_id, vp) -#define JSAPI_PROP_SETTER(name, cx, obj, vp) \ - jsapi_property_##name##_set(cx, obj, jsid jsapi_id, JSBool strict, vp) +#define JSAPI_STRICTPROP(name, cx, obj, vp) \ + jsapi_property_##name(cx, obj, jsid jsapi_id, JSBool strict, vp) /* native property return value */ #define JSAPI_PROP_RVAL JS_RVAL -- cgit v1.2.3 From db7d3acdc3b7256728bf5dcfce8ef04a8d32b65b Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Wed, 23 Jan 2013 15:49:46 +0000 Subject: add and use debug logging macro --- javascript/jsapi.h | 5 +++++ javascript/jsapi/htmldocument.bnd | 18 +++++++++--------- javascript/jsapi/htmlelement.bnd | 1 + javascript/jsapi/nodelist.bnd | 4 ++-- 4 files changed, 17 insertions(+), 11 deletions(-) (limited to 'javascript/jsapi.h') diff --git a/javascript/jsapi.h b/javascript/jsapi.h index b308ca531..e38188ab4 100644 --- a/javascript/jsapi.h +++ b/javascript/jsapi.h @@ -376,5 +376,10 @@ JS_NewCompartmentAndGlobalObject(JSContext *cx, #endif #define JSLOG(args...) LOG((args)) +#ifdef ENABLE_VERBOSE_JS_DEBUG +#define JSDBG(args...) LOG((args)) +#else +#define JSDBG(args...) +#endif #endif diff --git a/javascript/jsapi/htmldocument.bnd b/javascript/jsapi/htmldocument.bnd index ec7a18039..4aacccf4e 100644 --- a/javascript/jsapi/htmldocument.bnd +++ b/javascript/jsapi/htmldocument.bnd @@ -173,7 +173,7 @@ getter body %{ dom_node *body; dom_exception exc; - JSLOG("Getting your body"); + JSDBG("Getting your body"); /* document (html) element */ exc = dom_document_get_document_element(private->node, &element); @@ -189,7 +189,7 @@ getter body %{ dom_node_unref(element); } - JSLOG("returning jsobject %p",jsret); + JSDBG("returning jsobject %p",jsret); %} @@ -266,7 +266,7 @@ operation createTextNode %{ if (data != NULL) { - JSLOG("Creating text node for string \"%s\"", data); + JSDBG("Creating text node for string \"%s\"", data); exc = dom_string_create((unsigned char*)data, data_len, &data_dom); if (exc != DOM_NO_ERR) { return JS_FALSE; @@ -281,7 +281,7 @@ operation createTextNode %{ jsret = jsapi_new_Text(cx, NULL, NULL, text, private->htmlc); } - JSLOG("returning jsobject %p",jsret); + JSDBG("returning jsobject %p",jsret); %} @@ -293,7 +293,7 @@ operation createComment %{ if (data != NULL) { - JSLOG("Creating string \"%s\"", data); + JSDBG("Creating string \"%s\"", data); exc = dom_string_create((unsigned char*)data, data_len, &data_dom); @@ -301,7 +301,7 @@ operation createComment %{ return JS_FALSE; } - JSLOG("Creating comment object for dom string \"%s\"", + JSDBG("Creating comment object for dom string \"%s\"", dom_string_data(data_dom)); exc = dom_document_create_comment(private->node, data_dom, @@ -314,7 +314,7 @@ operation createComment %{ jsret = jsapi_new_Comment(cx, NULL, NULL, comment, private->htmlc); } - JSLOG("returning jsobject %p", jsret); + JSDBG("returning jsobject %p", jsret); %} @@ -325,7 +325,7 @@ operation createElement %{ dom_element *element; if (localName != NULL) { - JSLOG("Creating text node for string \"%s\"", localName); + JSDBG("Creating text node for string \"%s\"", localName); exc = dom_string_create((unsigned char*)localName, localName_len, &localName_dom); if (exc != DOM_NO_ERR) { return JS_FALSE; @@ -340,7 +340,7 @@ operation createElement %{ jsret = jsapi_new_HTMLElement(cx, NULL, NULL, element, private->htmlc); } - JSLOG("returning jsobject %p",jsret); + JSDBG("returning jsobject %p",jsret); %} diff --git a/javascript/jsapi/htmlelement.bnd b/javascript/jsapi/htmlelement.bnd index fd3a9caf8..56c98258b 100644 --- a/javascript/jsapi/htmlelement.bnd +++ b/javascript/jsapi/htmlelement.bnd @@ -29,6 +29,7 @@ preamble %{ #include "htmlelement.h" #include "text.h" #include "location.h" +#include "nodelist.h" %} diff --git a/javascript/jsapi/nodelist.bnd b/javascript/jsapi/nodelist.bnd index d7adafd93..379809659 100644 --- a/javascript/jsapi/nodelist.bnd +++ b/javascript/jsapi/nodelist.bnd @@ -56,7 +56,7 @@ api getproperty %{ JSAPI_PROP_IDVAL(cx, &queryprop); if (JSVAL_IS_INT(queryprop)) { idx = JSVAL_TO_INT(queryprop); - LOG(("Index was %d", idx)); + JSDBG("Index was %d", idx); err = dom_nodelist_item(private->nodelist, idx, &domnode); @@ -67,7 +67,7 @@ api getproperty %{ if (domnode != NULL) { jsret = jsapi_new_HTMLElement(cx, NULL, NULL, (dom_element *)domnode, private->htmlc); - JSLOG("return object:%p", jsret); + JSDBG("return object:%p", jsret); JSAPI_PROP_SET_RVAL(cx, vp, OBJECT_TO_JSVAL(jsret)); } -- cgit v1.2.3