From 5b0ac4502fd4407d51c165e0ea4ef814b3253fa9 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Mon, 7 Sep 2015 11:28:08 +0100 Subject: Cause string arguments to operations to be coerced. It appears that string parameters to operations must be coerced from other types instead of throwing a type error to conform to expected behaviour. --- src/duk-libdom-interface.c | 5 +++-- src/duk-libdom.c | 6 ++---- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/duk-libdom-interface.c b/src/duk-libdom-interface.c index aa44d38..ad40741 100644 --- a/src/duk-libdom-interface.c +++ b/src/duk-libdom-interface.c @@ -993,10 +993,11 @@ output_operation_argument_type_check( switch (*argument_type) { case WEBIDL_TYPE_STRING: + /* coerce values to string */ fprintf(outf, "\t\tif (!duk_is_string(ctx, %d)) {\n" - "\t\t\tduk_error(ctx, DUK_ERR_ERROR, %s_error_fmt_string_type, %d, \"%s\");\n" - "\t\t}\n", argidx, DLPFX, argidx, argumente->name); + "\t\t\tduk_to_string(ctx, %d);\n" + "\t\t}\n", argidx, argidx); break; case WEBIDL_TYPE_BOOL: diff --git a/src/duk-libdom.c b/src/duk-libdom.c index f72bc96..084a68f 100644 --- a/src/duk-libdom.c +++ b/src/duk-libdom.c @@ -372,13 +372,12 @@ output_binding_header(struct ir *ir) fprintf(bindf, "/* Constant strings */\n" "extern const char *%s_error_fmt_argument;\n" - "extern const char *%s_error_fmt_string_type;\n" "extern const char *%s_error_fmt_bool_type;\n" "extern const char *%s_error_fmt_number_type;\n" "extern const char *%s_magic_string_private;\n" "extern const char *%s_magic_string_prototypes;\n" "\n", - DLPFX, DLPFX, DLPFX, DLPFX, DLPFX, DLPFX); + DLPFX, DLPFX, DLPFX, DLPFX, DLPFX); fprintf(bindf, "duk_bool_t %s_instanceof(duk_context *ctx, const char *klass);\n", @@ -434,10 +433,9 @@ output_binding_src(struct ir *ir) fprintf(bindf, "/* Error format strings */\n" "const char *%s_error_fmt_argument =\"%%d argument required, but ony %%d present.\";\n" - "const char *%s_error_fmt_string_type =\"argument %%d (%%s) requires a string\";\n" "const char *%s_error_fmt_bool_type =\"argument %%d (%%s) requires a bool\";\n" "const char *%s_error_fmt_number_type =\"argument %%d (%%s) requires a number\";\n", - DLPFX, DLPFX, DLPFX, DLPFX); + DLPFX, DLPFX, DLPFX); fprintf(bindf, "\n"); -- cgit v1.2.3