diff options
| -rw-r--r-- | src/jsapi-libdom-operator.c | 30 | ||||
| -rw-r--r-- | src/jsapi-libdom.c | 16 |
2 files changed, 28 insertions, 18 deletions
diff --git a/src/jsapi-libdom-operator.c b/src/jsapi-libdom-operator.c index 3183676..fccf4d1 100644 --- a/src/jsapi-libdom-operator.c +++ b/src/jsapi-libdom-operator.c @@ -487,9 +487,11 @@ output_variable_definitions(struct binding *binding, case WEBIDL_TYPE_STRING: /* JSString * */ fprintf(binding->outfile, - "\tJSString *%1$s_jsstr = NULL;\n" - "\tint %1$s_len = 0;\n" - "\tchar *%1$s = NULL;\n", + "\tJSString *%s_jsstr = NULL;\n" + "\tint %s_len = 0;\n" + "\tchar *%s = NULL;\n", + webidl_node_gettext(arg_ident), + webidl_node_gettext(arg_ident), webidl_node_gettext(arg_ident)); break; @@ -574,13 +576,15 @@ output_operation_input(struct binding *binding, switch (webidl_arg_type) { case WEBIDL_TYPE_USER: fprintf(binding->outfile, - "\tif ((!JSVAL_IS_NULL(argv[%1$d])) ||\n" - "\t\t(JSVAL_IS_PRIMITIVE(argv[%1$d]))) {\n" + "\tif ((!JSVAL_IS_NULL(argv[%d])) ||\n" + "\t\t(JSVAL_IS_PRIMITIVE(argv[%d]))) {\n" "\t\treturn JS_FALSE;\n" "\t}\n" - "\t%2$s = JSVAL_TO_OBJECT(argv[%1$d]);\n", + "\t%s = JSVAL_TO_OBJECT(argv[%d]);\n", arg_cur, - webidl_node_gettext(arg_ident)); + arg_cur, + webidl_node_gettext(arg_ident), + arg_cur); break; case WEBIDL_TYPE_BOOL: @@ -632,13 +636,17 @@ output_operation_input(struct binding *binding, case WEBIDL_TYPE_STRING: /* JSString * */ fprintf(binding->outfile, - "\t%1$s_jsstr = JS_ValueToString(cx, argv[%2$d]);\n" - "\tif (%1$s_jsstr == NULL) {\n" + "\t%s_jsstr = JS_ValueToString(cx, argv[%d]);\n" + "\tif (%s_jsstr == NULL) {\n" "\t\treturn JS_FALSE;\n" "\t}\n\n" - "\tJSString_to_char(%1$s_jsstr, %1$s, %1$s_len);\n", + "\tJSString_to_char(%s_jsstr, %s, %s_len);\n", webidl_node_gettext(arg_ident), - arg_cur); + arg_cur, + webidl_node_gettext(arg_ident), + webidl_node_gettext(arg_ident), + webidl_node_gettext(arg_ident), + webidl_node_gettext(arg_ident)); break; diff --git a/src/jsapi-libdom.c b/src/jsapi-libdom.c index 8e70577..2f5e098 100644 --- a/src/jsapi-libdom.c +++ b/src/jsapi-libdom.c @@ -137,6 +137,7 @@ static int webidl_private_assign_cb(struct genbind_node *node, void *ctx) { struct binding *binding = ctx; struct genbind_node *ident_node; + const char *ident; ident_node = genbind_node_find_type(genbind_node_getnode(node), NULL, @@ -144,9 +145,9 @@ static int webidl_private_assign_cb(struct genbind_node *node, void *ctx) if (ident_node == NULL) return -1; /* bad AST */ - fprintf(binding->outfile, - "\tprivate->%1$s = %1$s;\n", - genbind_node_gettext(ident_node)); + ident = genbind_node_gettext(ident_node); + + fprintf(binding->outfile, "\tprivate->%s = %s;\n", ident, ident); return 0; } @@ -250,7 +251,7 @@ output_class_init(struct binding *binding) /* class Initialisor */ fprintf(binding->outfile, - "JSObject *jsapi_InitClass_%1$s(JSContext *cx, JSObject *parent)\n" + "JSObject *jsapi_InitClass_%s(JSContext *cx, JSObject *parent)\n" "{\n" "\tJSObject *prototype;\n", binding->interface); @@ -268,7 +269,7 @@ output_class_init(struct binding *binding) "\tprototype = JS_InitClass(cx,\n" "\t\tparent,\n" "\t\tNULL,\n" - "\t\t&JSClass_%1$s,\n" + "\t\t&JSClass_%s,\n" "\t\tNULL,\n" "\t\t0,\n" "\t\tjsclass_properties,\n" @@ -394,8 +395,9 @@ output_jsclass(struct binding *binding) /* output the class */ fprintf(binding->outfile, - "JSClass JSClass_%1$s = {\n" - "\t\"%1$s\",\n", + "JSClass JSClass_%s = {\n" + "\t\"%s\",\n", + binding->interface, binding->interface); /* generate class flags */ |