Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use more rustic names for ThrowTypeError and infrastructure.

Browse source
This commit is contained in:
Ms2ger 2014-04-28 17:18:28 +02:00
parent 7ff9fff421
commit 505e7d472a
2 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -176,7 +176,7 @@ class CGMethodCall(CGThing):
if requiredArgs > 0: if requiredArgs > 0:
code = ( code = (
"if argc < %d {\n" "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" " return 0;\n"
"}" % (requiredArgs, methodName)) "}" % (requiredArgs, methodName))
self.cgRoot.prepend( self.cgRoot.prepend(
@ -4340,7 +4340,7 @@ class CGBindingRoot(CGThing):
'dom::bindings::codegen::UnionTypes::*', 'dom::bindings::codegen::UnionTypes::*',
'dom::bindings::error::{FailureUnknown, Fallible, Error, ErrorResult}', 'dom::bindings::error::{FailureUnknown, Fallible, Error, ErrorResult}',
'dom::bindings::error::{throw_method_failed_with_details}', 'dom::bindings::error::{throw_method_failed_with_details}',
'dom::bindings::error::ThrowTypeError', 'dom::bindings::error::throw_type_error',
'script_task::JSPageInfo', 'script_task::JSPageInfo',
'dom::bindings::proxyhandler', 'dom::bindings::proxyhandler',
'dom::bindings::proxyhandler::{_obj_toString, defineProperty}', 'dom::bindings::proxyhandler::{_obj_toString, defineProperty}',

19
src/components/script/dom/bindings/error.rs
View file

@ -48,29 +48,30 @@ pub fn throw_not_in_union(cx: *JSContext, names: &'static str) -> JSBool {
return 0; return 0;
} }
static ErrorFormatStringString: [libc::c_char, ..4] = [ static ERROR_FORMAT_STRING_STRING: [libc::c_char, ..4] = [
'{' as libc::c_char, '{' as libc::c_char,
'0' as libc::c_char, '0' as libc::c_char,
'}' as libc::c_char, '}' as libc::c_char,
0 as libc::c_char, 0 as libc::c_char,
]; ];
static ErrorFormatString: JSErrorFormatString = struct_JSErrorFormatString { static ERROR_FORMAT_STRING: JSErrorFormatString = struct_JSErrorFormatString {
format: &ErrorFormatStringString as *libc::c_char, format: &ERROR_FORMAT_STRING_STRING as *libc::c_char,
argCount: 1, argCount: 1,
exnType: JSEXN_TYPEERR as i16, exnType: JSEXN_TYPEERR as i16,
}; };
extern fn GetErrorMessage(_user_ref: *mut libc::c_void, _locale: *libc::c_char, extern fn get_error_message(_user_ref: *mut libc::c_void,
aErrorNumber: libc::c_uint) -> *JSErrorFormatString _locale: *libc::c_char,
error_number: libc::c_uint) -> *JSErrorFormatString
{ {
assert_eq!(aErrorNumber, 0); assert_eq!(error_number, 0);
&ErrorFormatString as *JSErrorFormatString &ERROR_FORMAT_STRING as *JSErrorFormatString
} }
pub fn ThrowTypeError(cx: *JSContext, error: &str) { pub fn throw_type_error(cx: *JSContext, error: &str) {
let error = error.to_c_str(); let error = error.to_c_str();
error.with_ref(|error| unsafe { error.with_ref(|error| unsafe {
JS_ReportErrorNumber(cx, GetErrorMessage, ptr::null(), 0, error); JS_ReportErrorNumber(cx, get_error_message, ptr::null(), 0, error);
}); });
} }