From bfde816da068e8afe361cef980dd0f7d4bf4686e Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Sat, 19 Apr 2014 23:25:43 +0200 Subject: Throw a TypeError when too few arguments are passed. --- src/components/script/dom/bindings/codegen/CodegenRust.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/components/script/dom/bindings/codegen/CodegenRust.py') diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 0912c6fdf96..5f0a7e01c79 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -145,7 +145,7 @@ class CGMethodCall(CGThing): def __init__(self, argsPre, nativeMethodName, static, descriptor, method): CGThing.__init__(self) - methodName = '"%s.%s"' % (descriptor.interface.identifier.name, method.identifier.name) + methodName = '\\"%s.%s\\"' % (descriptor.interface.identifier.name, method.identifier.name) def requiredArgCount(signature): arguments = signature[1] @@ -176,8 +176,8 @@ class CGMethodCall(CGThing): if requiredArgs > 0: code = ( "if argc < %d {\n" - " return 0; //XXXjdm throw exception\n" - " //return ThrowErrorMessage(cx, MSG_MISSING_ARGUMENTS, %s);\n" + " ThrowTypeError(cx, \"Not enough arguments to %s.\");\n" + " return 0;\n" "}" % (requiredArgs, methodName)) self.cgRoot.prepend( CGWrapper(CGIndenter(CGGeneric(code)), pre="\n", post="\n")) @@ -4329,6 +4329,7 @@ class CGBindingRoot(CGThing): 'dom::bindings::utils::{VoidVal, with_gc_disabled}', 'dom::bindings::utils::{with_gc_enabled}', 'dom::bindings::utils::get_dictionary_property', + 'dom::bindings::utils::ThrowTypeError', 'dom::bindings::trace::JSTraceable', 'dom::bindings::callback::{CallbackContainer,CallbackInterface}', 'dom::bindings::callback::{CallSetup,ExceptionHandling}', -- cgit v1.2.3 From 7ff9fff421f9ccc6cb00e7be6d327b82ef05d754 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Mon, 28 Apr 2014 16:50:53 +0200 Subject: Move ThrowTypeError to error.rs. --- src/components/script/dom/bindings/codegen/CodegenRust.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/components/script/dom/bindings/codegen/CodegenRust.py') diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 5f0a7e01c79..8eee27cd063 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -4329,7 +4329,6 @@ class CGBindingRoot(CGThing): 'dom::bindings::utils::{VoidVal, with_gc_disabled}', 'dom::bindings::utils::{with_gc_enabled}', 'dom::bindings::utils::get_dictionary_property', - 'dom::bindings::utils::ThrowTypeError', 'dom::bindings::trace::JSTraceable', 'dom::bindings::callback::{CallbackContainer,CallbackInterface}', 'dom::bindings::callback::{CallSetup,ExceptionHandling}', @@ -4341,6 +4340,7 @@ class CGBindingRoot(CGThing): 'dom::bindings::codegen::UnionTypes::*', 'dom::bindings::error::{FailureUnknown, Fallible, Error, ErrorResult}', 'dom::bindings::error::{throw_method_failed_with_details}', + 'dom::bindings::error::ThrowTypeError', 'script_task::JSPageInfo', 'dom::bindings::proxyhandler', 'dom::bindings::proxyhandler::{_obj_toString, defineProperty}', -- cgit v1.2.3 From 505e7d472a6607ab7d1e154bf8647c4862e2a208 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Mon, 28 Apr 2014 17:18:28 +0200 Subject: Use more rustic names for ThrowTypeError and infrastructure. --- src/components/script/dom/bindings/codegen/CodegenRust.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/components/script/dom/bindings/codegen/CodegenRust.py') diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 8eee27cd063..1efc517b9e0 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -176,7 +176,7 @@ class CGMethodCall(CGThing): if requiredArgs > 0: code = ( "if argc < %d {\n" - " ThrowTypeError(cx, \"Not enough arguments to %s.\");\n" + " throw_type_error(cx, \"Not enough arguments to %s.\");\n" " return 0;\n" "}" % (requiredArgs, methodName)) self.cgRoot.prepend( @@ -4340,7 +4340,7 @@ class CGBindingRoot(CGThing): 'dom::bindings::codegen::UnionTypes::*', 'dom::bindings::error::{FailureUnknown, Fallible, Error, ErrorResult}', 'dom::bindings::error::{throw_method_failed_with_details}', - 'dom::bindings::error::ThrowTypeError', + 'dom::bindings::error::throw_type_error', 'script_task::JSPageInfo', 'dom::bindings::proxyhandler', 'dom::bindings::proxyhandler::{_obj_toString, defineProperty}', -- cgit v1.2.3