diff --git a/demo/rust/src/interface.rs b/demo/rust/src/interface.rs index 9ad9313..e411a3d 100644 --- a/demo/rust/src/interface.rs +++ b/demo/rust/src/interface.rs @@ -1,1197 +1,1214 @@ /* generated by rust_qt_binding_generator */ #![allow(unknown_lints)] #![allow(mutex_atomic, needless_pass_by_value)] use libc::{c_char, c_ushort, c_int}; use std::slice; use std::char::decode_utf16; use std::sync::{Arc, Mutex}; use std::ptr::null; use implementation::*; #[repr(C)] pub struct COption { data: T, some: bool, } impl From> for COption where T: Default, { fn from(t: Option) -> COption { if let Some(v) = t { COption { data: v, some: true, } } else { COption { data: T::default(), some: false, } } } } pub enum QString {} fn set_string_from_utf16(s: &mut String, str: *const c_ushort, len: c_int) { - let utf16 = unsafe { slice::from_raw_parts(str, len as usize) }; + let utf16 = unsafe { slice::from_raw_parts(str, to_usize(len)) }; let characters = decode_utf16(utf16.iter().cloned()) .into_iter() .map(|r| r.unwrap()); s.clear(); s.extend(characters); } pub enum QByteArray {} #[repr(C)] pub enum SortOrder { Ascending = 0, Descending = 1, } #[repr(C)] pub struct QModelIndex { row: c_int, internal_id: usize, } + +fn to_usize(n: c_int) -> usize { + if n < 0 { + panic!("Cannot cast {} to usize", n); + } + n as usize +} + + +fn to_c_int(n: usize) -> c_int { + if n > c_int::max_value() as usize { + panic!("Cannot cast {} to c_int", n); + } + n as c_int +} + + pub struct DemoQObject {} #[derive(Clone)] pub struct DemoEmitter { qobject: Arc>, } unsafe impl Send for DemoEmitter {} impl DemoEmitter { fn clear(&self) { *self.qobject.lock().unwrap() = null(); } } pub trait DemoTrait { fn new(emit: DemoEmitter, fibonacci: Fibonacci, fibonacci_list: FibonacciList, file_system_tree: FileSystemTree, processes: Processes, time_series: TimeSeries) -> Self; fn emit(&self) -> &DemoEmitter; fn fibonacci(&self) -> &Fibonacci; fn fibonacci_mut(&mut self) -> &mut Fibonacci; fn fibonacci_list(&self) -> &FibonacciList; fn fibonacci_list_mut(&mut self) -> &mut FibonacciList; fn file_system_tree(&self) -> &FileSystemTree; fn file_system_tree_mut(&mut self) -> &mut FileSystemTree; fn processes(&self) -> &Processes; fn processes_mut(&mut self) -> &mut Processes; fn time_series(&self) -> &TimeSeries; fn time_series_mut(&mut self) -> &mut TimeSeries; } #[no_mangle] pub extern "C" fn demo_new( demo: *mut DemoQObject, fibonacci: *mut FibonacciQObject, input_changed: fn(*const FibonacciQObject), result_changed: fn(*const FibonacciQObject), fibonacci_list: *mut FibonacciListQObject, fibonacci_list_new_data_ready: fn(*const FibonacciListQObject), fibonacci_list_data_changed: fn(*const FibonacciListQObject, usize, usize), fibonacci_list_begin_reset_model: fn(*const FibonacciListQObject), fibonacci_list_end_reset_model: fn(*const FibonacciListQObject), fibonacci_list_begin_insert_rows: fn(*const FibonacciListQObject, usize, usize), fibonacci_list_end_insert_rows: fn(*const FibonacciListQObject), fibonacci_list_begin_remove_rows: fn(*const FibonacciListQObject, usize, usize), fibonacci_list_end_remove_rows: fn(*const FibonacciListQObject), file_system_tree: *mut FileSystemTreeQObject, path_changed: fn(*const FileSystemTreeQObject), file_system_tree_new_data_ready: fn(*const FileSystemTreeQObject, item: usize, valid: bool), file_system_tree_data_changed: fn(*const FileSystemTreeQObject, usize, usize), file_system_tree_begin_reset_model: fn(*const FileSystemTreeQObject), file_system_tree_end_reset_model: fn(*const FileSystemTreeQObject), file_system_tree_begin_insert_rows: fn(*const FileSystemTreeQObject, item: usize, valid: bool, usize, usize), file_system_tree_end_insert_rows: fn(*const FileSystemTreeQObject), file_system_tree_begin_remove_rows: fn(*const FileSystemTreeQObject, item: usize, valid: bool, usize, usize), file_system_tree_end_remove_rows: fn(*const FileSystemTreeQObject), processes: *mut ProcessesQObject, active_changed: fn(*const ProcessesQObject), processes_new_data_ready: fn(*const ProcessesQObject, item: usize, valid: bool), processes_data_changed: fn(*const ProcessesQObject, usize, usize), processes_begin_reset_model: fn(*const ProcessesQObject), processes_end_reset_model: fn(*const ProcessesQObject), processes_begin_insert_rows: fn(*const ProcessesQObject, item: usize, valid: bool, usize, usize), processes_end_insert_rows: fn(*const ProcessesQObject), processes_begin_remove_rows: fn(*const ProcessesQObject, item: usize, valid: bool, usize, usize), processes_end_remove_rows: fn(*const ProcessesQObject), time_series: *mut TimeSeriesQObject, time_series_new_data_ready: fn(*const TimeSeriesQObject), time_series_data_changed: fn(*const TimeSeriesQObject, usize, usize), time_series_begin_reset_model: fn(*const TimeSeriesQObject), time_series_end_reset_model: fn(*const TimeSeriesQObject), time_series_begin_insert_rows: fn(*const TimeSeriesQObject, usize, usize), time_series_end_insert_rows: fn(*const TimeSeriesQObject), time_series_begin_remove_rows: fn(*const TimeSeriesQObject, usize, usize), time_series_end_remove_rows: fn(*const TimeSeriesQObject), ) -> *mut Demo { let fibonacci_emit = FibonacciEmitter { qobject: Arc::new(Mutex::new(fibonacci)), input_changed: input_changed, result_changed: result_changed, }; let d_fibonacci = Fibonacci::new(fibonacci_emit); let fibonacci_list_emit = FibonacciListEmitter { qobject: Arc::new(Mutex::new(fibonacci_list)), new_data_ready: fibonacci_list_new_data_ready, }; let model = FibonacciListList { qobject: fibonacci_list, data_changed: fibonacci_list_data_changed, begin_reset_model: fibonacci_list_begin_reset_model, end_reset_model: fibonacci_list_end_reset_model, begin_insert_rows: fibonacci_list_begin_insert_rows, end_insert_rows: fibonacci_list_end_insert_rows, begin_remove_rows: fibonacci_list_begin_remove_rows, end_remove_rows: fibonacci_list_end_remove_rows, }; let d_fibonacci_list = FibonacciList::new(fibonacci_list_emit, model); let file_system_tree_emit = FileSystemTreeEmitter { qobject: Arc::new(Mutex::new(file_system_tree)), path_changed: path_changed, new_data_ready: file_system_tree_new_data_ready, }; let model = FileSystemTreeTree { qobject: file_system_tree, data_changed: file_system_tree_data_changed, begin_reset_model: file_system_tree_begin_reset_model, end_reset_model: file_system_tree_end_reset_model, begin_insert_rows: file_system_tree_begin_insert_rows, end_insert_rows: file_system_tree_end_insert_rows, begin_remove_rows: file_system_tree_begin_remove_rows, end_remove_rows: file_system_tree_end_remove_rows, }; let d_file_system_tree = FileSystemTree::new(file_system_tree_emit, model); let processes_emit = ProcessesEmitter { qobject: Arc::new(Mutex::new(processes)), active_changed: active_changed, new_data_ready: processes_new_data_ready, }; let model = ProcessesTree { qobject: processes, data_changed: processes_data_changed, begin_reset_model: processes_begin_reset_model, end_reset_model: processes_end_reset_model, begin_insert_rows: processes_begin_insert_rows, end_insert_rows: processes_end_insert_rows, begin_remove_rows: processes_begin_remove_rows, end_remove_rows: processes_end_remove_rows, }; let d_processes = Processes::new(processes_emit, model); let time_series_emit = TimeSeriesEmitter { qobject: Arc::new(Mutex::new(time_series)), new_data_ready: time_series_new_data_ready, }; let model = TimeSeriesList { qobject: time_series, data_changed: time_series_data_changed, begin_reset_model: time_series_begin_reset_model, end_reset_model: time_series_end_reset_model, begin_insert_rows: time_series_begin_insert_rows, end_insert_rows: time_series_end_insert_rows, begin_remove_rows: time_series_begin_remove_rows, end_remove_rows: time_series_end_remove_rows, }; let d_time_series = TimeSeries::new(time_series_emit, model); let demo_emit = DemoEmitter { qobject: Arc::new(Mutex::new(demo)), }; let d_demo = Demo::new(demo_emit, d_fibonacci, d_fibonacci_list, d_file_system_tree, d_processes, d_time_series); Box::into_raw(Box::new(d_demo)) } #[no_mangle] pub unsafe extern "C" fn demo_free(ptr: *mut Demo) { Box::from_raw(ptr).emit().clear(); } #[no_mangle] pub unsafe extern "C" fn demo_fibonacci_get(ptr: *mut Demo) -> *mut Fibonacci { (&mut *ptr).fibonacci_mut() } #[no_mangle] pub unsafe extern "C" fn demo_fibonacci_list_get(ptr: *mut Demo) -> *mut FibonacciList { (&mut *ptr).fibonacci_list_mut() } #[no_mangle] pub unsafe extern "C" fn demo_file_system_tree_get(ptr: *mut Demo) -> *mut FileSystemTree { (&mut *ptr).file_system_tree_mut() } #[no_mangle] pub unsafe extern "C" fn demo_processes_get(ptr: *mut Demo) -> *mut Processes { (&mut *ptr).processes_mut() } #[no_mangle] pub unsafe extern "C" fn demo_time_series_get(ptr: *mut Demo) -> *mut TimeSeries { (&mut *ptr).time_series_mut() } pub struct FibonacciQObject {} #[derive(Clone)] pub struct FibonacciEmitter { qobject: Arc>, input_changed: fn(*const FibonacciQObject), result_changed: fn(*const FibonacciQObject), } unsafe impl Send for FibonacciEmitter {} impl FibonacciEmitter { fn clear(&self) { *self.qobject.lock().unwrap() = null(); } pub fn input_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.input_changed)(ptr); } } pub fn result_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.result_changed)(ptr); } } } pub trait FibonacciTrait { fn new(emit: FibonacciEmitter) -> Self; fn emit(&self) -> &FibonacciEmitter; fn input(&self) -> u32; fn set_input(&mut self, value: u32); fn result(&self) -> u64; } #[no_mangle] pub extern "C" fn fibonacci_new( fibonacci: *mut FibonacciQObject, input_changed: fn(*const FibonacciQObject), result_changed: fn(*const FibonacciQObject), ) -> *mut Fibonacci { let fibonacci_emit = FibonacciEmitter { qobject: Arc::new(Mutex::new(fibonacci)), input_changed: input_changed, result_changed: result_changed, }; let d_fibonacci = Fibonacci::new(fibonacci_emit); Box::into_raw(Box::new(d_fibonacci)) } #[no_mangle] pub unsafe extern "C" fn fibonacci_free(ptr: *mut Fibonacci) { Box::from_raw(ptr).emit().clear(); } #[no_mangle] pub unsafe extern "C" fn fibonacci_input_get(ptr: *const Fibonacci) -> u32 { (&*ptr).input() } #[no_mangle] pub unsafe extern "C" fn fibonacci_input_set(ptr: *mut Fibonacci, v: u32) { (&mut *ptr).set_input(v); } #[no_mangle] pub unsafe extern "C" fn fibonacci_result_get(ptr: *const Fibonacci) -> u64 { (&*ptr).result() } pub struct FibonacciListQObject {} #[derive(Clone)] pub struct FibonacciListEmitter { qobject: Arc>, new_data_ready: fn(*const FibonacciListQObject), } unsafe impl Send for FibonacciListEmitter {} impl FibonacciListEmitter { fn clear(&self) { *self.qobject.lock().unwrap() = null(); } pub fn new_data_ready(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.new_data_ready)(ptr); } } } pub struct FibonacciListList { qobject: *const FibonacciListQObject, data_changed: fn(*const FibonacciListQObject, usize, usize), begin_reset_model: fn(*const FibonacciListQObject), end_reset_model: fn(*const FibonacciListQObject), begin_insert_rows: fn(*const FibonacciListQObject, usize, usize), end_insert_rows: fn(*const FibonacciListQObject), begin_remove_rows: fn(*const FibonacciListQObject, usize, usize), end_remove_rows: fn(*const FibonacciListQObject), } impl FibonacciListList { pub fn data_changed(&self, first: usize, last: usize) { (self.data_changed)(self.qobject, first, last); } pub fn begin_reset_model(&self) { (self.begin_reset_model)(self.qobject); } pub fn end_reset_model(&self) { (self.end_reset_model)(self.qobject); } pub fn begin_insert_rows(&self, first: usize, last: usize) { (self.begin_insert_rows)(self.qobject, first, last); } pub fn end_insert_rows(&self) { (self.end_insert_rows)(self.qobject); } pub fn begin_remove_rows(&self, first: usize, last: usize) { (self.begin_remove_rows)(self.qobject, first, last); } pub fn end_remove_rows(&self) { (self.end_remove_rows)(self.qobject); } } pub trait FibonacciListTrait { fn new(emit: FibonacciListEmitter, model: FibonacciListList) -> Self; fn emit(&self) -> &FibonacciListEmitter; fn row_count(&self) -> usize; fn insert_rows(&mut self, _row: usize, _count: usize) -> bool { false } fn remove_rows(&mut self, _row: usize, _count: usize) -> bool { false } fn can_fetch_more(&self) -> bool { false } fn fetch_more(&mut self) {} fn sort(&mut self, u8, SortOrder) {} fn fibonacci_number(&self, item: usize) -> u64; fn row(&self, item: usize) -> u64; } #[no_mangle] pub extern "C" fn fibonacci_list_new( fibonacci_list: *mut FibonacciListQObject, fibonacci_list_new_data_ready: fn(*const FibonacciListQObject), fibonacci_list_data_changed: fn(*const FibonacciListQObject, usize, usize), fibonacci_list_begin_reset_model: fn(*const FibonacciListQObject), fibonacci_list_end_reset_model: fn(*const FibonacciListQObject), fibonacci_list_begin_insert_rows: fn(*const FibonacciListQObject, usize, usize), fibonacci_list_end_insert_rows: fn(*const FibonacciListQObject), fibonacci_list_begin_remove_rows: fn(*const FibonacciListQObject, usize, usize), fibonacci_list_end_remove_rows: fn(*const FibonacciListQObject), ) -> *mut FibonacciList { let fibonacci_list_emit = FibonacciListEmitter { qobject: Arc::new(Mutex::new(fibonacci_list)), new_data_ready: fibonacci_list_new_data_ready, }; let model = FibonacciListList { qobject: fibonacci_list, data_changed: fibonacci_list_data_changed, begin_reset_model: fibonacci_list_begin_reset_model, end_reset_model: fibonacci_list_end_reset_model, begin_insert_rows: fibonacci_list_begin_insert_rows, end_insert_rows: fibonacci_list_end_insert_rows, begin_remove_rows: fibonacci_list_begin_remove_rows, end_remove_rows: fibonacci_list_end_remove_rows, }; let d_fibonacci_list = FibonacciList::new(fibonacci_list_emit, model); Box::into_raw(Box::new(d_fibonacci_list)) } #[no_mangle] pub unsafe extern "C" fn fibonacci_list_free(ptr: *mut FibonacciList) { Box::from_raw(ptr).emit().clear(); } #[no_mangle] pub unsafe extern "C" fn fibonacci_list_row_count(ptr: *const FibonacciList) -> c_int { - (&*ptr).row_count() as c_int + to_c_int((&*ptr).row_count()) } #[no_mangle] pub unsafe extern "C" fn fibonacci_list_insert_rows(ptr: *mut FibonacciList, row: c_int, count: c_int) -> bool { - (&mut *ptr).insert_rows(row as usize, count as usize) + (&mut *ptr).insert_rows(to_usize(row), to_usize(count)) } #[no_mangle] pub unsafe extern "C" fn fibonacci_list_remove_rows(ptr: *mut FibonacciList, row: c_int, count: c_int) -> bool { - (&mut *ptr).remove_rows(row as usize, count as usize) + (&mut *ptr).remove_rows(to_usize(row), to_usize(count)) } #[no_mangle] pub unsafe extern "C" fn fibonacci_list_can_fetch_more(ptr: *const FibonacciList) -> bool { (&*ptr).can_fetch_more() } #[no_mangle] pub unsafe extern "C" fn fibonacci_list_fetch_more(ptr: *mut FibonacciList) { (&mut *ptr).fetch_more() } #[no_mangle] pub unsafe extern "C" fn fibonacci_list_sort( ptr: *mut FibonacciList, column: u8, order: SortOrder, ) { (&mut *ptr).sort(column, order) } #[no_mangle] pub extern "C" fn fibonacci_list_data_fibonacci_number(ptr: *const FibonacciList, row: c_int) -> u64 { let o = unsafe { &*ptr }; - o.fibonacci_number(row as usize).into() + o.fibonacci_number(to_usize(row)).into() } #[no_mangle] pub extern "C" fn fibonacci_list_data_row(ptr: *const FibonacciList, row: c_int) -> u64 { let o = unsafe { &*ptr }; - o.row(row as usize).into() + o.row(to_usize(row)).into() } pub struct FileSystemTreeQObject {} #[derive(Clone)] pub struct FileSystemTreeEmitter { qobject: Arc>, path_changed: fn(*const FileSystemTreeQObject), new_data_ready: fn(*const FileSystemTreeQObject, item: usize, valid: bool), } unsafe impl Send for FileSystemTreeEmitter {} impl FileSystemTreeEmitter { fn clear(&self) { *self.qobject.lock().unwrap() = null(); } pub fn path_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.path_changed)(ptr); } } pub fn new_data_ready(&self, item: Option) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.new_data_ready)(ptr, item.unwrap_or(13), item.is_some()); } } } pub struct FileSystemTreeTree { qobject: *const FileSystemTreeQObject, data_changed: fn(*const FileSystemTreeQObject, usize, usize), begin_reset_model: fn(*const FileSystemTreeQObject), end_reset_model: fn(*const FileSystemTreeQObject), begin_insert_rows: fn(*const FileSystemTreeQObject, item: usize, valid: bool, usize, usize), end_insert_rows: fn(*const FileSystemTreeQObject), begin_remove_rows: fn(*const FileSystemTreeQObject, item: usize, valid: bool, usize, usize), end_remove_rows: fn(*const FileSystemTreeQObject), } impl FileSystemTreeTree { pub fn data_changed(&self, first: usize, last: usize) { (self.data_changed)(self.qobject, first, last); } pub fn begin_reset_model(&self) { (self.begin_reset_model)(self.qobject); } pub fn end_reset_model(&self) { (self.end_reset_model)(self.qobject); } pub fn begin_insert_rows(&self, item: Option, first: usize, last: usize) { (self.begin_insert_rows)(self.qobject, item.unwrap_or(13), item.is_some(), first, last); } pub fn end_insert_rows(&self) { (self.end_insert_rows)(self.qobject); } pub fn begin_remove_rows(&self, item: Option, first: usize, last: usize) { (self.begin_remove_rows)(self.qobject, item.unwrap_or(13), item.is_some(), first, last); } pub fn end_remove_rows(&self) { (self.end_remove_rows)(self.qobject); } } pub trait FileSystemTreeTrait { fn new(emit: FileSystemTreeEmitter, model: FileSystemTreeTree) -> Self; fn emit(&self) -> &FileSystemTreeEmitter; fn path(&self) -> Option<&str>; fn set_path(&mut self, value: Option); fn row_count(&self, Option) -> usize; fn can_fetch_more(&self, Option) -> bool { false } fn fetch_more(&mut self, Option) {} fn sort(&mut self, u8, SortOrder) {} fn index(&self, item: Option, row: usize) -> usize; fn parent(&self, item: usize) -> Option; fn row(&self, item: usize) -> usize; fn file_icon(&self, item: usize) -> &[u8]; fn file_name(&self, item: usize) -> String; fn file_path(&self, item: usize) -> Option; fn file_permissions(&self, item: usize) -> i32; fn file_size(&self, item: usize) -> Option; fn file_type(&self, item: usize) -> i32; } #[no_mangle] pub extern "C" fn file_system_tree_new( file_system_tree: *mut FileSystemTreeQObject, path_changed: fn(*const FileSystemTreeQObject), file_system_tree_new_data_ready: fn(*const FileSystemTreeQObject, item: usize, valid: bool), file_system_tree_data_changed: fn(*const FileSystemTreeQObject, usize, usize), file_system_tree_begin_reset_model: fn(*const FileSystemTreeQObject), file_system_tree_end_reset_model: fn(*const FileSystemTreeQObject), file_system_tree_begin_insert_rows: fn(*const FileSystemTreeQObject, item: usize, valid: bool, usize, usize), file_system_tree_end_insert_rows: fn(*const FileSystemTreeQObject), file_system_tree_begin_remove_rows: fn(*const FileSystemTreeQObject, item: usize, valid: bool, usize, usize), file_system_tree_end_remove_rows: fn(*const FileSystemTreeQObject), ) -> *mut FileSystemTree { let file_system_tree_emit = FileSystemTreeEmitter { qobject: Arc::new(Mutex::new(file_system_tree)), path_changed: path_changed, new_data_ready: file_system_tree_new_data_ready, }; let model = FileSystemTreeTree { qobject: file_system_tree, data_changed: file_system_tree_data_changed, begin_reset_model: file_system_tree_begin_reset_model, end_reset_model: file_system_tree_end_reset_model, begin_insert_rows: file_system_tree_begin_insert_rows, end_insert_rows: file_system_tree_end_insert_rows, begin_remove_rows: file_system_tree_begin_remove_rows, end_remove_rows: file_system_tree_end_remove_rows, }; let d_file_system_tree = FileSystemTree::new(file_system_tree_emit, model); Box::into_raw(Box::new(d_file_system_tree)) } #[no_mangle] pub unsafe extern "C" fn file_system_tree_free(ptr: *mut FileSystemTree) { Box::from_raw(ptr).emit().clear(); } #[no_mangle] pub extern "C" fn file_system_tree_path_get( ptr: *const FileSystemTree, p: *mut QString, set: fn(*mut QString, *const c_char, c_int), ) { let o = unsafe { &*ptr }; let v = o.path(); if let Some(v) = v { let s: *const c_char = v.as_ptr() as (*const c_char); - set(p, s, v.len() as c_int); + set(p, s, to_c_int(v.len())); } } #[no_mangle] pub extern "C" fn file_system_tree_path_set(ptr: *mut FileSystemTree, v: *const c_ushort, len: c_int) { let o = unsafe { &mut *ptr }; let mut s = String::new(); set_string_from_utf16(&mut s, v, len); o.set_path(Some(s)); } #[no_mangle] pub extern "C" fn file_system_tree_path_set_none(ptr: *mut FileSystemTree) { let o = unsafe { &mut *ptr }; o.set_path(None); } #[no_mangle] pub unsafe extern "C" fn file_system_tree_row_count( ptr: *const FileSystemTree, item: usize, valid: bool, ) -> c_int { - if valid { - (&*ptr).row_count(Some(item)) as c_int + to_c_int(if valid { + (&*ptr).row_count(Some(item)) } else { - (&*ptr).row_count(None) as c_int - } + (&*ptr).row_count(None) + }) } #[no_mangle] pub unsafe extern "C" fn file_system_tree_can_fetch_more( ptr: *const FileSystemTree, item: usize, valid: bool, ) -> bool { if valid { (&*ptr).can_fetch_more(Some(item)) } else { (&*ptr).can_fetch_more(None) } } #[no_mangle] pub unsafe extern "C" fn file_system_tree_fetch_more(ptr: *mut FileSystemTree, item: usize, valid: bool) { if valid { (&mut *ptr).fetch_more(Some(item)) } else { (&mut *ptr).fetch_more(None) } } #[no_mangle] pub unsafe extern "C" fn file_system_tree_sort( ptr: *mut FileSystemTree, column: u8, order: SortOrder ) { (&mut *ptr).sort(column, order) } #[no_mangle] pub unsafe extern "C" fn file_system_tree_index( ptr: *const FileSystemTree, item: usize, valid: bool, row: c_int, ) -> usize { if !valid { - (&*ptr).index(None, row as usize) + (&*ptr).index(None, to_usize(row)) } else { - (&*ptr).index(Some(item), row as usize) + (&*ptr).index(Some(item), to_usize(row)) } } #[no_mangle] pub unsafe extern "C" fn file_system_tree_parent(ptr: *const FileSystemTree, index: usize) -> QModelIndex { if let Some(parent) = (&*ptr).parent(index) { QModelIndex { - row: (&*ptr).row(parent) as c_int, + row: to_c_int((&*ptr).row(parent)), internal_id: parent, } } else { QModelIndex { row: -1, internal_id: 0, } } } #[no_mangle] pub unsafe extern "C" fn file_system_tree_row(ptr: *const FileSystemTree, item: usize) -> c_int { - (&*ptr).row(item) as c_int + to_c_int((&*ptr).row(item)) } #[no_mangle] pub extern "C" fn file_system_tree_data_file_icon( ptr: *const FileSystemTree, item: usize, d: *mut QByteArray, set: fn(*mut QByteArray, *const c_char, len: c_int), ) { let o = unsafe { &*ptr }; let data = o.file_icon(item); let s: *const c_char = data.as_ptr() as (*const c_char); - set(d, s, data.len() as c_int); + set(d, s, to_c_int(data.len())); } #[no_mangle] pub extern "C" fn file_system_tree_data_file_name( ptr: *const FileSystemTree, item: usize, d: *mut QString, set: fn(*mut QString, *const c_char, len: c_int), ) { let o = unsafe { &*ptr }; let data = o.file_name(item); let s: *const c_char = data.as_ptr() as (*const c_char); - set(d, s, data.len() as c_int); + set(d, s, to_c_int(data.len())); } #[no_mangle] pub extern "C" fn file_system_tree_data_file_path( ptr: *const FileSystemTree, item: usize, d: *mut QString, set: fn(*mut QString, *const c_char, len: c_int), ) { let o = unsafe { &*ptr }; let data = o.file_path(item); if let Some(data) = data { let s: *const c_char = data.as_ptr() as (*const c_char); - set(d, s, data.len() as c_int); + set(d, s, to_c_int(data.len())); } } #[no_mangle] pub extern "C" fn file_system_tree_data_file_permissions(ptr: *const FileSystemTree, item: usize) -> i32 { let o = unsafe { &*ptr }; o.file_permissions(item).into() } #[no_mangle] pub extern "C" fn file_system_tree_data_file_size(ptr: *const FileSystemTree, item: usize) -> COption { let o = unsafe { &*ptr }; o.file_size(item).into() } #[no_mangle] pub extern "C" fn file_system_tree_data_file_type(ptr: *const FileSystemTree, item: usize) -> i32 { let o = unsafe { &*ptr }; o.file_type(item).into() } pub struct ProcessesQObject {} #[derive(Clone)] pub struct ProcessesEmitter { qobject: Arc>, active_changed: fn(*const ProcessesQObject), new_data_ready: fn(*const ProcessesQObject, item: usize, valid: bool), } unsafe impl Send for ProcessesEmitter {} impl ProcessesEmitter { fn clear(&self) { *self.qobject.lock().unwrap() = null(); } pub fn active_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.active_changed)(ptr); } } pub fn new_data_ready(&self, item: Option) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.new_data_ready)(ptr, item.unwrap_or(13), item.is_some()); } } } pub struct ProcessesTree { qobject: *const ProcessesQObject, data_changed: fn(*const ProcessesQObject, usize, usize), begin_reset_model: fn(*const ProcessesQObject), end_reset_model: fn(*const ProcessesQObject), begin_insert_rows: fn(*const ProcessesQObject, item: usize, valid: bool, usize, usize), end_insert_rows: fn(*const ProcessesQObject), begin_remove_rows: fn(*const ProcessesQObject, item: usize, valid: bool, usize, usize), end_remove_rows: fn(*const ProcessesQObject), } impl ProcessesTree { pub fn data_changed(&self, first: usize, last: usize) { (self.data_changed)(self.qobject, first, last); } pub fn begin_reset_model(&self) { (self.begin_reset_model)(self.qobject); } pub fn end_reset_model(&self) { (self.end_reset_model)(self.qobject); } pub fn begin_insert_rows(&self, item: Option, first: usize, last: usize) { (self.begin_insert_rows)(self.qobject, item.unwrap_or(13), item.is_some(), first, last); } pub fn end_insert_rows(&self) { (self.end_insert_rows)(self.qobject); } pub fn begin_remove_rows(&self, item: Option, first: usize, last: usize) { (self.begin_remove_rows)(self.qobject, item.unwrap_or(13), item.is_some(), first, last); } pub fn end_remove_rows(&self) { (self.end_remove_rows)(self.qobject); } } pub trait ProcessesTrait { fn new(emit: ProcessesEmitter, model: ProcessesTree) -> Self; fn emit(&self) -> &ProcessesEmitter; fn active(&self) -> bool; fn set_active(&mut self, value: bool); fn row_count(&self, Option) -> usize; fn can_fetch_more(&self, Option) -> bool { false } fn fetch_more(&mut self, Option) {} fn sort(&mut self, u8, SortOrder) {} fn index(&self, item: Option, row: usize) -> usize; fn parent(&self, item: usize) -> Option; fn row(&self, item: usize) -> usize; fn cmd(&self, item: usize) -> String; fn cpu_percentage(&self, item: usize) -> u8; fn cpu_usage(&self, item: usize) -> f32; fn memory(&self, item: usize) -> u64; fn name(&self, item: usize) -> &str; fn pid(&self, item: usize) -> u32; fn uid(&self, item: usize) -> u32; } #[no_mangle] pub extern "C" fn processes_new( processes: *mut ProcessesQObject, active_changed: fn(*const ProcessesQObject), processes_new_data_ready: fn(*const ProcessesQObject, item: usize, valid: bool), processes_data_changed: fn(*const ProcessesQObject, usize, usize), processes_begin_reset_model: fn(*const ProcessesQObject), processes_end_reset_model: fn(*const ProcessesQObject), processes_begin_insert_rows: fn(*const ProcessesQObject, item: usize, valid: bool, usize, usize), processes_end_insert_rows: fn(*const ProcessesQObject), processes_begin_remove_rows: fn(*const ProcessesQObject, item: usize, valid: bool, usize, usize), processes_end_remove_rows: fn(*const ProcessesQObject), ) -> *mut Processes { let processes_emit = ProcessesEmitter { qobject: Arc::new(Mutex::new(processes)), active_changed: active_changed, new_data_ready: processes_new_data_ready, }; let model = ProcessesTree { qobject: processes, data_changed: processes_data_changed, begin_reset_model: processes_begin_reset_model, end_reset_model: processes_end_reset_model, begin_insert_rows: processes_begin_insert_rows, end_insert_rows: processes_end_insert_rows, begin_remove_rows: processes_begin_remove_rows, end_remove_rows: processes_end_remove_rows, }; let d_processes = Processes::new(processes_emit, model); Box::into_raw(Box::new(d_processes)) } #[no_mangle] pub unsafe extern "C" fn processes_free(ptr: *mut Processes) { Box::from_raw(ptr).emit().clear(); } #[no_mangle] pub unsafe extern "C" fn processes_active_get(ptr: *const Processes) -> bool { (&*ptr).active() } #[no_mangle] pub unsafe extern "C" fn processes_active_set(ptr: *mut Processes, v: bool) { (&mut *ptr).set_active(v); } #[no_mangle] pub unsafe extern "C" fn processes_row_count( ptr: *const Processes, item: usize, valid: bool, ) -> c_int { - if valid { - (&*ptr).row_count(Some(item)) as c_int + to_c_int(if valid { + (&*ptr).row_count(Some(item)) } else { - (&*ptr).row_count(None) as c_int - } + (&*ptr).row_count(None) + }) } #[no_mangle] pub unsafe extern "C" fn processes_can_fetch_more( ptr: *const Processes, item: usize, valid: bool, ) -> bool { if valid { (&*ptr).can_fetch_more(Some(item)) } else { (&*ptr).can_fetch_more(None) } } #[no_mangle] pub unsafe extern "C" fn processes_fetch_more(ptr: *mut Processes, item: usize, valid: bool) { if valid { (&mut *ptr).fetch_more(Some(item)) } else { (&mut *ptr).fetch_more(None) } } #[no_mangle] pub unsafe extern "C" fn processes_sort( ptr: *mut Processes, column: u8, order: SortOrder ) { (&mut *ptr).sort(column, order) } #[no_mangle] pub unsafe extern "C" fn processes_index( ptr: *const Processes, item: usize, valid: bool, row: c_int, ) -> usize { if !valid { - (&*ptr).index(None, row as usize) + (&*ptr).index(None, to_usize(row)) } else { - (&*ptr).index(Some(item), row as usize) + (&*ptr).index(Some(item), to_usize(row)) } } #[no_mangle] pub unsafe extern "C" fn processes_parent(ptr: *const Processes, index: usize) -> QModelIndex { if let Some(parent) = (&*ptr).parent(index) { QModelIndex { - row: (&*ptr).row(parent) as c_int, + row: to_c_int((&*ptr).row(parent)), internal_id: parent, } } else { QModelIndex { row: -1, internal_id: 0, } } } #[no_mangle] pub unsafe extern "C" fn processes_row(ptr: *const Processes, item: usize) -> c_int { - (&*ptr).row(item) as c_int + to_c_int((&*ptr).row(item)) } #[no_mangle] pub extern "C" fn processes_data_cmd( ptr: *const Processes, item: usize, d: *mut QString, set: fn(*mut QString, *const c_char, len: c_int), ) { let o = unsafe { &*ptr }; let data = o.cmd(item); let s: *const c_char = data.as_ptr() as (*const c_char); - set(d, s, data.len() as c_int); + set(d, s, to_c_int(data.len())); } #[no_mangle] pub extern "C" fn processes_data_cpu_percentage(ptr: *const Processes, item: usize) -> u8 { let o = unsafe { &*ptr }; o.cpu_percentage(item).into() } #[no_mangle] pub extern "C" fn processes_data_cpu_usage(ptr: *const Processes, item: usize) -> f32 { let o = unsafe { &*ptr }; o.cpu_usage(item).into() } #[no_mangle] pub extern "C" fn processes_data_memory(ptr: *const Processes, item: usize) -> u64 { let o = unsafe { &*ptr }; o.memory(item).into() } #[no_mangle] pub extern "C" fn processes_data_name( ptr: *const Processes, item: usize, d: *mut QString, set: fn(*mut QString, *const c_char, len: c_int), ) { let o = unsafe { &*ptr }; let data = o.name(item); let s: *const c_char = data.as_ptr() as (*const c_char); - set(d, s, data.len() as c_int); + set(d, s, to_c_int(data.len())); } #[no_mangle] pub extern "C" fn processes_data_pid(ptr: *const Processes, item: usize) -> u32 { let o = unsafe { &*ptr }; o.pid(item).into() } #[no_mangle] pub extern "C" fn processes_data_uid(ptr: *const Processes, item: usize) -> u32 { let o = unsafe { &*ptr }; o.uid(item).into() } pub struct TimeSeriesQObject {} #[derive(Clone)] pub struct TimeSeriesEmitter { qobject: Arc>, new_data_ready: fn(*const TimeSeriesQObject), } unsafe impl Send for TimeSeriesEmitter {} impl TimeSeriesEmitter { fn clear(&self) { *self.qobject.lock().unwrap() = null(); } pub fn new_data_ready(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.new_data_ready)(ptr); } } } pub struct TimeSeriesList { qobject: *const TimeSeriesQObject, data_changed: fn(*const TimeSeriesQObject, usize, usize), begin_reset_model: fn(*const TimeSeriesQObject), end_reset_model: fn(*const TimeSeriesQObject), begin_insert_rows: fn(*const TimeSeriesQObject, usize, usize), end_insert_rows: fn(*const TimeSeriesQObject), begin_remove_rows: fn(*const TimeSeriesQObject, usize, usize), end_remove_rows: fn(*const TimeSeriesQObject), } impl TimeSeriesList { pub fn data_changed(&self, first: usize, last: usize) { (self.data_changed)(self.qobject, first, last); } pub fn begin_reset_model(&self) { (self.begin_reset_model)(self.qobject); } pub fn end_reset_model(&self) { (self.end_reset_model)(self.qobject); } pub fn begin_insert_rows(&self, first: usize, last: usize) { (self.begin_insert_rows)(self.qobject, first, last); } pub fn end_insert_rows(&self) { (self.end_insert_rows)(self.qobject); } pub fn begin_remove_rows(&self, first: usize, last: usize) { (self.begin_remove_rows)(self.qobject, first, last); } pub fn end_remove_rows(&self) { (self.end_remove_rows)(self.qobject); } } pub trait TimeSeriesTrait { fn new(emit: TimeSeriesEmitter, model: TimeSeriesList) -> Self; fn emit(&self) -> &TimeSeriesEmitter; fn row_count(&self) -> usize; fn insert_rows(&mut self, _row: usize, _count: usize) -> bool { false } fn remove_rows(&mut self, _row: usize, _count: usize) -> bool { false } fn can_fetch_more(&self) -> bool { false } fn fetch_more(&mut self) {} fn sort(&mut self, u8, SortOrder) {} fn cos(&self, item: usize) -> f32; fn set_cos(&mut self, item: usize, f32) -> bool; fn sin(&self, item: usize) -> f32; fn set_sin(&mut self, item: usize, f32) -> bool; fn time(&self, item: usize) -> f32; fn set_time(&mut self, item: usize, f32) -> bool; } #[no_mangle] pub extern "C" fn time_series_new( time_series: *mut TimeSeriesQObject, time_series_new_data_ready: fn(*const TimeSeriesQObject), time_series_data_changed: fn(*const TimeSeriesQObject, usize, usize), time_series_begin_reset_model: fn(*const TimeSeriesQObject), time_series_end_reset_model: fn(*const TimeSeriesQObject), time_series_begin_insert_rows: fn(*const TimeSeriesQObject, usize, usize), time_series_end_insert_rows: fn(*const TimeSeriesQObject), time_series_begin_remove_rows: fn(*const TimeSeriesQObject, usize, usize), time_series_end_remove_rows: fn(*const TimeSeriesQObject), ) -> *mut TimeSeries { let time_series_emit = TimeSeriesEmitter { qobject: Arc::new(Mutex::new(time_series)), new_data_ready: time_series_new_data_ready, }; let model = TimeSeriesList { qobject: time_series, data_changed: time_series_data_changed, begin_reset_model: time_series_begin_reset_model, end_reset_model: time_series_end_reset_model, begin_insert_rows: time_series_begin_insert_rows, end_insert_rows: time_series_end_insert_rows, begin_remove_rows: time_series_begin_remove_rows, end_remove_rows: time_series_end_remove_rows, }; let d_time_series = TimeSeries::new(time_series_emit, model); Box::into_raw(Box::new(d_time_series)) } #[no_mangle] pub unsafe extern "C" fn time_series_free(ptr: *mut TimeSeries) { Box::from_raw(ptr).emit().clear(); } #[no_mangle] pub unsafe extern "C" fn time_series_row_count(ptr: *const TimeSeries) -> c_int { - (&*ptr).row_count() as c_int + to_c_int((&*ptr).row_count()) } #[no_mangle] pub unsafe extern "C" fn time_series_insert_rows(ptr: *mut TimeSeries, row: c_int, count: c_int) -> bool { - (&mut *ptr).insert_rows(row as usize, count as usize) + (&mut *ptr).insert_rows(to_usize(row), to_usize(count)) } #[no_mangle] pub unsafe extern "C" fn time_series_remove_rows(ptr: *mut TimeSeries, row: c_int, count: c_int) -> bool { - (&mut *ptr).remove_rows(row as usize, count as usize) + (&mut *ptr).remove_rows(to_usize(row), to_usize(count)) } #[no_mangle] pub unsafe extern "C" fn time_series_can_fetch_more(ptr: *const TimeSeries) -> bool { (&*ptr).can_fetch_more() } #[no_mangle] pub unsafe extern "C" fn time_series_fetch_more(ptr: *mut TimeSeries) { (&mut *ptr).fetch_more() } #[no_mangle] pub unsafe extern "C" fn time_series_sort( ptr: *mut TimeSeries, column: u8, order: SortOrder, ) { (&mut *ptr).sort(column, order) } #[no_mangle] pub extern "C" fn time_series_data_cos(ptr: *const TimeSeries, row: c_int) -> f32 { let o = unsafe { &*ptr }; - o.cos(row as usize).into() + o.cos(to_usize(row)).into() } #[no_mangle] pub unsafe extern "C" fn time_series_set_data_cos( ptr: *mut TimeSeries, row: c_int, v: f32, ) -> bool { - (&mut *ptr).set_cos(row as usize, v) + (&mut *ptr).set_cos(to_usize(row), v) } #[no_mangle] pub extern "C" fn time_series_data_sin(ptr: *const TimeSeries, row: c_int) -> f32 { let o = unsafe { &*ptr }; - o.sin(row as usize).into() + o.sin(to_usize(row)).into() } #[no_mangle] pub unsafe extern "C" fn time_series_set_data_sin( ptr: *mut TimeSeries, row: c_int, v: f32, ) -> bool { - (&mut *ptr).set_sin(row as usize, v) + (&mut *ptr).set_sin(to_usize(row), v) } #[no_mangle] pub extern "C" fn time_series_data_time(ptr: *const TimeSeries, row: c_int) -> f32 { let o = unsafe { &*ptr }; - o.time(row as usize).into() + o.time(to_usize(row)).into() } #[no_mangle] pub unsafe extern "C" fn time_series_set_data_time( ptr: *mut TimeSeries, row: c_int, v: f32, ) -> bool { - (&mut *ptr).set_time(row as usize, v) + (&mut *ptr).set_time(to_usize(row), v) } diff --git a/src/rust.cpp b/src/rust.cpp index 75b233e..1d47e6e 100644 --- a/src/rust.cpp +++ b/src/rust.cpp @@ -1,1029 +1,1054 @@ /* * Copyright 2017 Jos van den Oever * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of * the License or (at your option) version 3 or any later version * accepted by the membership of KDE e.V. (or its successor approved * by the membership of KDE e.V.), which shall act as a proxy * defined in Section 14 of version 3 of the license. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ #include "structs.h" #include "helper.h" template QString rustType(const T& p) { if (p.optional) { return "Option<" + p.type.rustType + ">"; } return p.type.rustType; } template QString rustReturnType(const T& p) { QString type = p.type.rustType; if (type == "String" && !p.rustByValue) { type = "str"; } if (type == "Vec" && !p.rustByValue) { type = "[u8]"; } if (p.type.isComplex() && !p.rustByValue) { type = "&" + type; } if (p.optional) { return "Option<" + type + ">"; } return type; } template QString rustCType(const T& p) { if (p.optional) { return "COption<" + p.type.rustType + ">"; } return p.type.rustType; } template QString rustTypeInit(const T& p) { if (p.optional) { return "None"; } return p.type.rustTypeInit; } void rConstructorArgsDecl(QTextStream& r, const QString& name, const Object& o, const Configuration& conf) { r << QString(" %2: *mut %1QObject").arg(o.name, snakeCase(name)); for (const Property& p: o.properties) { if (p.type.type == BindingType::Object) { r << QString(",\n"); rConstructorArgsDecl(r, p.name, conf.findObject(p.type.name), conf); } else { r << QString(",\n %2_changed: fn(*const %1QObject)") .arg(o.name, snakeCase(p.name)); } } if (o.type == ObjectType::List) { r << QString(",\n %2_new_data_ready: fn(*const %1QObject)") .arg(o.name, snakeCase(o.name)); } else if (o.type == ObjectType::Tree) { r << QString(",\n %2_new_data_ready: fn(*const %1QObject, item: usize, valid: bool)") .arg(o.name, snakeCase(o.name)); } if (o.type != ObjectType::Object) { QString indexDecl; if (o.type == ObjectType::Tree) { indexDecl = " item: usize, valid: bool,"; } r << QString(R"(, %3_data_changed: fn(*const %1QObject, usize, usize), %3_begin_reset_model: fn(*const %1QObject), %3_end_reset_model: fn(*const %1QObject), %3_begin_insert_rows: fn(*const %1QObject,%2 usize, usize), %3_end_insert_rows: fn(*const %1QObject), %3_begin_remove_rows: fn(*const %1QObject,%2 usize, usize), %3_end_remove_rows: fn(*const %1QObject))").arg(o.name, indexDecl, snakeCase(o.name)); } } void rConstructorArgs(QTextStream& r, const QString& name, const Object& o, const Configuration& conf) { const QString lcname(snakeCase(o.name)); for (const Property& p: o.properties) { if (p.type.type == BindingType::Object) { rConstructorArgs(r, p.name, conf.findObject(p.type.name), conf); } } r << QString(R"( let %2_emit = %1Emitter { qobject: Arc::new(Mutex::new(%2)), )").arg(o.name, snakeCase(name)); for (const Property& p: o.properties) { if (p.type.type == BindingType::Object) continue; r << QString(" %1_changed: %1_changed,\n").arg(snakeCase(p.name)); } if (o.type != ObjectType::Object) { r << QString(" new_data_ready: %1_new_data_ready,\n") .arg(snakeCase(o.name)); } QString model = ""; if (o.type != ObjectType::Object) { const QString type = o.type == ObjectType::List ? "List" : "Tree"; model = ", model"; r << QString(R"( }; let model = %1%2 { qobject: %3, data_changed: %4_data_changed, begin_reset_model: %4_begin_reset_model, end_reset_model: %4_end_reset_model, begin_insert_rows: %4_begin_insert_rows, end_insert_rows: %4_end_insert_rows, begin_remove_rows: %4_begin_remove_rows, end_remove_rows: %4_end_remove_rows, )").arg(o.name, type, snakeCase(name), snakeCase(o.name)); } r << QString(" };\n let d_%3 = %1::new(%3_emit%2") .arg(o.name, model, snakeCase(name)); for (const Property& p: o.properties) { if (p.type.type == BindingType::Object) { r << ",\n d_" << snakeCase(p.name); } } r << ");\n"; } void writeFunction(QTextStream& r, const Function& f, const QString& lcname, const Object& o) { const QString lc(snakeCase(f.name)); r << QString(R"( #[no_mangle] pub extern "C" fn %1_%2(ptr: *%3 %4)").arg(lcname, lc, f.mut ? "mut" : "const", o.name); // write all the input arguments, for QString and QByteArray, write // pointers to their content and the length which is int in Qt for (auto a = f.args.begin(); a < f.args.end(); a++) { r << ", "; if (a->type.name == "QString") { r << QString("%1_str: *const c_ushort, %1_len: c_int").arg(a->name); } else if (a->type.name == "QByteArray") { r << QString("%1_str: *const c_char, %1_len: c_int").arg(a->name); } else { r << a->name << ": " << a->type.rustType; } } // If the return type is QString or QByteArray, append a pointer to the // variable that will be set to the argument list. Also add a setter // function. if (f.type.isComplex()) { r << QString(", d: *mut %1, set: fn(*mut %1, str: *const c_char, len: c_int)) {\n").arg(f.type.name); } else { r << ") -> " << f.type.rustType << " {\n"; } for (auto a = f.args.begin(); a < f.args.end(); a++) { if (a->type.name == "QString") { r << " let mut " << a->name << " = String::new();\n"; r << QString(" set_string_from_utf16(&mut %1, %1_str, %1_len);\n").arg(a->name); } else if (a->type.name == "QByteArray") { - r << QString(" let %1 = unsafe { slice::from_raw_parts(%1_str as *const u8, %1_len as usize) };\n").arg(a->name); + r << QString(" let %1 = unsafe { slice::from_raw_parts(%1_str as *const u8, to_usize(%1_len)) };\n").arg(a->name); } } if (f.mut) { r << " let o = unsafe { &mut *ptr };\n"; } else { r << " let o = unsafe { &*ptr };\n"; } r << " let r = o." << lc << "("; for (auto a = f.args.begin(); a < f.args.end(); a++) { if (a != f.args.begin()) { r << ", "; } r << a->name; } r << ");\n"; if (f.type.isComplex()) { r << " let s: *const c_char = r.as_ptr() as (*const c_char);\n"; r << " set(d, s, r.len() as i32);\n"; } else { r << " r\n"; } r << "}\n"; } void writeRustInterfaceObject(QTextStream& r, const Object& o, const Configuration& conf) { const QString lcname(snakeCase(o.name)); r << QString(R"( pub struct %1QObject {} #[derive(Clone)] pub struct %1Emitter { qobject: Arc>, )").arg(o.name); for (const Property& p: o.properties) { if (p.type.type == BindingType::Object) { continue; } r << QString(" %2_changed: fn(*const %1QObject),\n") .arg(o.name, snakeCase(p.name)); } if (o.type == ObjectType::List) { r << QString(" new_data_ready: fn(*const %1QObject),\n") .arg(o.name); } else if (o.type == ObjectType::Tree) { r << QString(" new_data_ready: fn(*const %1QObject, item: usize, valid: bool),\n") .arg(o.name); } r << QString(R"(} unsafe impl Send for %1Emitter {} impl %1Emitter { fn clear(&self) { *self.qobject.lock().unwrap() = null(); } )").arg(o.name); for (const Property& p: o.properties) { if (p.type.type == BindingType::Object) { continue; } r << QString(R"( pub fn %1_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.%1_changed)(ptr); } } )").arg(snakeCase(p.name)); } if (o.type == ObjectType::List) { r << R"( pub fn new_data_ready(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.new_data_ready)(ptr); } } )"; } else if (o.type == ObjectType::Tree) { r << R"( pub fn new_data_ready(&self, item: Option) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.new_data_ready)(ptr, item.unwrap_or(13), item.is_some()); } } )"; } QString modelStruct = ""; if (o.type != ObjectType::Object) { QString type = o.type == ObjectType::List ? "List" : "Tree"; modelStruct = ", model: " + o.name + type; QString index; QString indexDecl; QString indexCDecl; if (o.type == ObjectType::Tree) { indexDecl = " item: Option,"; indexCDecl = " item: usize, valid: bool,"; index = " item.unwrap_or(13), item.is_some(),"; } r << QString(R"(} pub struct %1%2 { qobject: *const %1QObject, data_changed: fn(*const %1QObject, usize, usize), begin_reset_model: fn(*const %1QObject), end_reset_model: fn(*const %1QObject), begin_insert_rows: fn(*const %1QObject,%5 usize, usize), end_insert_rows: fn(*const %1QObject), begin_remove_rows: fn(*const %1QObject,%5 usize, usize), end_remove_rows: fn(*const %1QObject), } impl %1%2 { pub fn data_changed(&self, first: usize, last: usize) { (self.data_changed)(self.qobject, first, last); } pub fn begin_reset_model(&self) { (self.begin_reset_model)(self.qobject); } pub fn end_reset_model(&self) { (self.end_reset_model)(self.qobject); } pub fn begin_insert_rows(&self,%3 first: usize, last: usize) { (self.begin_insert_rows)(self.qobject,%4 first, last); } pub fn end_insert_rows(&self) { (self.end_insert_rows)(self.qobject); } pub fn begin_remove_rows(&self,%3 first: usize, last: usize) { (self.begin_remove_rows)(self.qobject,%4 first, last); } pub fn end_remove_rows(&self) { (self.end_remove_rows)(self.qobject); } )").arg(o.name, type, indexDecl, index, indexCDecl); } r << QString(R"(} pub trait %1Trait { fn new(emit: %1Emitter%2)").arg(o.name, modelStruct); for (const Property& p: o.properties) { if (p.type.type == BindingType::Object) { r << ",\n " << snakeCase(p.name) << ": " << p.type.name; } } r << QString(R"() -> Self; fn emit(&self) -> &%1Emitter; )").arg(o.name); for (const Property& p: o.properties) { const QString lc(snakeCase(p.name)); if (p.type.type == BindingType::Object) { r << QString(" fn %1(&self) -> &%2;\n").arg(lc, rustType(p)); r << QString(" fn %1_mut(&mut self) -> &mut %2;\n").arg(lc, rustType(p)); } else { r << QString(" fn %1(&self) -> %2;\n").arg(lc, rustReturnType(p)); if (p.write) { if (p.type.name == "QByteArray") { if (p.optional) { r << QString(" fn set_%1(&mut self, value: Option<&[u8]>);\n").arg(lc); } else { r << QString(" fn set_%1(&mut self, value: &[u8]);\n").arg(lc); } } else { r << QString(" fn set_%1(&mut self, value: %2);\n").arg(lc, rustType(p)); } } } } for (const Function& f: o.functions) { const QString lc(snakeCase(f.name)); QString argList; if (f.args.size() > 0) { for (auto a = f.args.begin(); a < f.args.end(); a++) { auto t = a->type.name == "QByteArray" ?"&[u8]" :a->type.rustType; argList.append(QString(", %1: %2").arg(a->name, t)); } } r << QString(" fn %1(&%2self%4) -> %3;\n") .arg(lc, f.mut ? "mut " : "", f.type.rustType, argList); } if (o.type == ObjectType::List) { r << R"( fn row_count(&self) -> usize; fn insert_rows(&mut self, _row: usize, _count: usize) -> bool { false } fn remove_rows(&mut self, _row: usize, _count: usize) -> bool { false } fn can_fetch_more(&self) -> bool { false } fn fetch_more(&mut self) {} fn sort(&mut self, u8, SortOrder) {} )"; } else if (o.type == ObjectType::Tree) { r << R"( fn row_count(&self, Option) -> usize; fn can_fetch_more(&self, Option) -> bool { false } fn fetch_more(&mut self, Option) {} fn sort(&mut self, u8, SortOrder) {} fn index(&self, item: Option, row: usize) -> usize; fn parent(&self, item: usize) -> Option; fn row(&self, item: usize) -> usize; )"; } if (o.type != ObjectType::Object) { for (auto ip: o.itemProperties) { r << QString(" fn %1(&self, item: usize) -> %2;\n") .arg(snakeCase(ip.name), rustReturnType(ip)); if (ip.write) { if (ip.type.name == "QByteArray") { if (ip.optional) { r << QString(" fn set_%1(&mut self, item: usize, Option<&[u8]>) -> bool;\n") .arg(snakeCase(ip.name)); } else { r << QString(" fn set_%1(&mut self, item: usize, &[u8]) -> bool;\n") .arg(snakeCase(ip.name)); } } else { r << QString(" fn set_%1(&mut self, item: usize, %2) -> bool;\n") .arg(snakeCase(ip.name), rustType(ip)); } } } } r << QString(R"(} #[no_mangle] pub extern "C" fn %1_new( )").arg(lcname); rConstructorArgsDecl(r, lcname, o, conf); r << QString(",\n) -> *mut %1 {\n").arg(o.name); rConstructorArgs(r, lcname, o, conf); r << QString(R"( Box::into_raw(Box::new(d_%2)) } #[no_mangle] pub unsafe extern "C" fn %2_free(ptr: *mut %1) { Box::from_raw(ptr).emit().clear(); } )").arg(o.name, lcname); for (const Property& p: o.properties) { const QString base = QString("%1_%2").arg(lcname, snakeCase(p.name)); QString ret = ") -> " + rustType(p); if (p.type.type == BindingType::Object) { r << QString(R"( #[no_mangle] pub unsafe extern "C" fn %2_get(ptr: *mut %1) -> *mut %4 { (&mut *ptr).%3_mut() } )").arg(o.name, base, snakeCase(p.name), rustType(p)); } else if (p.type.isComplex() && !p.optional) { r << QString(R"( #[no_mangle] pub extern "C" fn %2_get( ptr: *const %1, p: *mut %4, set: fn(*mut %4, *const c_char, c_int), ) { let o = unsafe { &*ptr }; let v = o.%3(); let s: *const c_char = v.as_ptr() as (*const c_char); - set(p, s, v.len() as c_int); + set(p, s, to_c_int(v.len())); } )").arg(o.name, base, snakeCase(p.name), p.type.name); if (p.write && p.type.name == "QString") { r << QString(R"( #[no_mangle] pub extern "C" fn %2_set(ptr: *mut %1, v: *const c_ushort, len: c_int) { let o = unsafe { &mut *ptr }; let mut s = String::new(); set_string_from_utf16(&mut s, v, len); o.set_%3(s); } )").arg(o.name, base, snakeCase(p.name)); } else if (p.write) { r << QString(R"( #[no_mangle] pub extern "C" fn %2_set(ptr: *mut %1, v: *const c_char, len: c_int) { let o = unsafe { &mut *ptr }; - let v = unsafe { slice::from_raw_parts(v as *const u8, len as usize) }; + let v = unsafe { slice::from_raw_parts(v as *const u8, to_usize(len)) }; o.set_%3(v); } )").arg(o.name, base, snakeCase(p.name)); } } else if (p.type.isComplex()) { r << QString(R"( #[no_mangle] pub extern "C" fn %2_get( ptr: *const %1, p: *mut %4, set: fn(*mut %4, *const c_char, c_int), ) { let o = unsafe { &*ptr }; let v = o.%3(); if let Some(v) = v { let s: *const c_char = v.as_ptr() as (*const c_char); - set(p, s, v.len() as c_int); + set(p, s, to_c_int(v.len())); } } )").arg(o.name, base, snakeCase(p.name), p.type.name); if (p.write && p.type.name == "QString") { r << QString(R"( #[no_mangle] pub extern "C" fn %2_set(ptr: *mut %1, v: *const c_ushort, len: c_int) { let o = unsafe { &mut *ptr }; let mut s = String::new(); set_string_from_utf16(&mut s, v, len); o.set_%3(Some(s)); } )").arg(o.name, base, snakeCase(p.name)); } else if (p.write) { r << QString(R"( #[no_mangle] pub extern "C" fn %2_set(ptr: *mut %1, v: *const c_char, len: c_int) { let o = unsafe { &mut *ptr }; - let v = unsafe { slice::from_raw_parts(v as *const u8, len as usize) }; + let v = unsafe { slice::from_raw_parts(v as *const u8, to_usize(len)) }; o.set_%3(Some(v.into())); } )").arg(o.name, base, snakeCase(p.name)); } } else if (p.optional) { r << QString(R"( #[no_mangle] pub unsafe extern "C" fn %2_get(ptr: *const %1) -> COption<%4> { match (&*ptr).%3() { Some(value) => COption { data: value, some: true }, None => COption { data: %4::default(), some: false} } } )").arg(o.name, base, snakeCase(p.name), p.type.rustType); if (p.write) { r << QString(R"( #[no_mangle] pub unsafe extern "C" fn %2_set(ptr: *mut %1, v: %4) { (&mut *ptr).set_%3(Some(v)); } )").arg(o.name, base, snakeCase(p.name), p.type.rustType); } } else { r << QString(R"( #[no_mangle] pub unsafe extern "C" fn %2_get(ptr: *const %1) -> %4 { (&*ptr).%3() } )").arg(o.name, base, snakeCase(p.name), rustType(p)); if (p.write) { r << QString(R"( #[no_mangle] pub unsafe extern "C" fn %2_set(ptr: *mut %1, v: %4) { (&mut *ptr).set_%3(v); } )").arg(o.name, base, snakeCase(p.name), rustType(p)); } } if (p.write && p.optional) { r << QString(R"( #[no_mangle] pub extern "C" fn %2_set_none(ptr: *mut %1) { let o = unsafe { &mut *ptr }; o.set_%3(None); } )").arg(o.name, base, snakeCase(p.name)); } } for (const Function& f: o.functions) { writeFunction(r, f, lcname, o); } if (o.type == ObjectType::List) { r << QString(R"( #[no_mangle] pub unsafe extern "C" fn %2_row_count(ptr: *const %1) -> c_int { - (&*ptr).row_count() as c_int + to_c_int((&*ptr).row_count()) } #[no_mangle] pub unsafe extern "C" fn %2_insert_rows(ptr: *mut %1, row: c_int, count: c_int) -> bool { - (&mut *ptr).insert_rows(row as usize, count as usize) + (&mut *ptr).insert_rows(to_usize(row), to_usize(count)) } #[no_mangle] pub unsafe extern "C" fn %2_remove_rows(ptr: *mut %1, row: c_int, count: c_int) -> bool { - (&mut *ptr).remove_rows(row as usize, count as usize) + (&mut *ptr).remove_rows(to_usize(row), to_usize(count)) } #[no_mangle] pub unsafe extern "C" fn %2_can_fetch_more(ptr: *const %1) -> bool { (&*ptr).can_fetch_more() } #[no_mangle] pub unsafe extern "C" fn %2_fetch_more(ptr: *mut %1) { (&mut *ptr).fetch_more() } #[no_mangle] pub unsafe extern "C" fn %2_sort( ptr: *mut %1, column: u8, order: SortOrder, ) { (&mut *ptr).sort(column, order) } )").arg(o.name, lcname); } else if (o.type == ObjectType::Tree) { r << QString(R"( #[no_mangle] pub unsafe extern "C" fn %2_row_count( ptr: *const %1, item: usize, valid: bool, ) -> c_int { - if valid { - (&*ptr).row_count(Some(item)) as c_int + to_c_int(if valid { + (&*ptr).row_count(Some(item)) } else { - (&*ptr).row_count(None) as c_int - } + (&*ptr).row_count(None) + }) } #[no_mangle] pub unsafe extern "C" fn %2_can_fetch_more( ptr: *const %1, item: usize, valid: bool, ) -> bool { if valid { (&*ptr).can_fetch_more(Some(item)) } else { (&*ptr).can_fetch_more(None) } } #[no_mangle] pub unsafe extern "C" fn %2_fetch_more(ptr: *mut %1, item: usize, valid: bool) { if valid { (&mut *ptr).fetch_more(Some(item)) } else { (&mut *ptr).fetch_more(None) } } #[no_mangle] pub unsafe extern "C" fn %2_sort( ptr: *mut %1, column: u8, order: SortOrder ) { (&mut *ptr).sort(column, order) } #[no_mangle] pub unsafe extern "C" fn %2_index( ptr: *const %1, item: usize, valid: bool, row: c_int, ) -> usize { if !valid { - (&*ptr).index(None, row as usize) + (&*ptr).index(None, to_usize(row)) } else { - (&*ptr).index(Some(item), row as usize) + (&*ptr).index(Some(item), to_usize(row)) } } #[no_mangle] pub unsafe extern "C" fn %2_parent(ptr: *const %1, index: usize) -> QModelIndex { if let Some(parent) = (&*ptr).parent(index) { QModelIndex { - row: (&*ptr).row(parent) as c_int, + row: to_c_int((&*ptr).row(parent)), internal_id: parent, } } else { QModelIndex { row: -1, internal_id: 0, } } } #[no_mangle] pub unsafe extern "C" fn %2_row(ptr: *const %1, item: usize) -> c_int { - (&*ptr).row(item) as c_int + to_c_int((&*ptr).row(item)) } )").arg(o.name, lcname); } if (o.type != ObjectType::Object) { QString indexDecl = ", row: c_int"; - QString index = "row as usize"; + QString index = "to_usize(row)"; if (o.type == ObjectType::Tree) { indexDecl = ", item: usize"; index = "item"; } for (auto ip: o.itemProperties) { if (ip.type.isComplex() && !ip.optional) { r << QString(R"( #[no_mangle] pub extern "C" fn %2_data_%3( ptr: *const %1%4, d: *mut %6, set: fn(*mut %6, *const c_char, len: c_int), ) { let o = unsafe { &*ptr }; let data = o.%3(%5); let s: *const c_char = data.as_ptr() as (*const c_char); - set(d, s, data.len() as c_int); + set(d, s, to_c_int(data.len())); } )").arg(o.name, lcname, snakeCase(ip.name), indexDecl, index, ip.type.name); } else if (ip.type.isComplex()) { r << QString(R"( #[no_mangle] pub extern "C" fn %2_data_%3( ptr: *const %1%4, d: *mut %6, set: fn(*mut %6, *const c_char, len: c_int), ) { let o = unsafe { &*ptr }; let data = o.%3(%5); if let Some(data) = data { let s: *const c_char = data.as_ptr() as (*const c_char); - set(d, s, data.len() as c_int); + set(d, s, to_c_int(data.len())); } } )").arg(o.name, lcname, snakeCase(ip.name), indexDecl, index, ip.type.name); } else { r << QString(R"( #[no_mangle] pub extern "C" fn %2_data_%3(ptr: *const %1%5) -> %4 { let o = unsafe { &*ptr }; o.%3(%6).into() } )").arg(o.name, lcname, snakeCase(ip.name), rustCType(ip), indexDecl, index); } if (ip.write) { QString val = "v"; if (ip.optional) { val = "Some(" + val + ")"; } if (ip.type.name == "QString") { r << QString(R"( #[no_mangle] pub extern "C" fn %2_set_data_%3( ptr: *mut %1%4, s: *const c_ushort, len: c_int, ) -> bool { let o = unsafe { &mut *ptr }; let mut v = String::new(); set_string_from_utf16(&mut v, s, len); o.set_%3(%5, %6) } )").arg(o.name, lcname, snakeCase(ip.name), indexDecl, index, val); } else if (ip.type.name == "QByteArray") { r << QString(R"( #[no_mangle] pub extern "C" fn %2_set_data_%3( ptr: *mut %1%4, s: *const c_char, len: c_int, ) -> bool { let o = unsafe { &mut *ptr }; - let slice = unsafe { ::std::slice::from_raw_parts(s as *const u8, len as usize) }; + let slice = unsafe { ::std::slice::from_raw_parts(s as *const u8, to_usize(len)) }; o.set_%3(%5, %6) } )").arg(o.name, lcname, snakeCase(ip.name), indexDecl, index, ip.optional ?"Some(slice)" :"slice"); } else { const QString type = ip.type.rustType; r << QString(R"( #[no_mangle] pub unsafe extern "C" fn %2_set_data_%3( ptr: *mut %1%4, v: %6, ) -> bool { (&mut *ptr).set_%3(%5, %7) } )").arg(o.name, lcname, snakeCase(ip.name), indexDecl, index, type, val); } } if (ip.write && ip.optional) { r << QString(R"( #[no_mangle] pub unsafe extern "C" fn %2_set_data_%3_none(ptr: *mut %1%4) -> bool { (&mut *ptr).set_%3(%5, None) } )").arg(o.name, lcname, snakeCase(ip.name), indexDecl, index); } } } } QString rustFile(const QDir rustdir, const QString& module) { QDir src(rustdir.absoluteFilePath("src")); QString modulePath = src.absoluteFilePath(module + "/mod.rs"); if (QFile::exists(modulePath)) { return modulePath; } return src.absoluteFilePath(module + ".rs"); } void writeRustTypes(const Configuration& conf, QTextStream& r) { bool hasOption = false; bool hasString = false; bool hasStringWrite = false; bool hasByteArray = false; bool hasListOrTree = false; for (auto o: conf.objects) { hasListOrTree |= o.type != ObjectType::Object; for (auto p: o.properties) { hasOption |= p.optional; hasString |= p.type.type == BindingType::QString; hasStringWrite |= p.type.type == BindingType::QString && p.write; hasByteArray |= p.type.type == BindingType::QByteArray; } for (auto p: o.itemProperties) { hasOption |= p.optional; hasString |= p.type.type == BindingType::QString; hasByteArray |= p.type.type == BindingType::QByteArray; } } if (hasOption || hasListOrTree) { r << R"( #[repr(C)] pub struct COption { data: T, some: bool, } impl From> for COption where T: Default, { fn from(t: Option) -> COption { if let Some(v) = t { COption { data: v, some: true, } } else { COption { data: T::default(), some: false, } } } } )"; } if (hasString) { r << R"( pub enum QString {} fn set_string_from_utf16(s: &mut String, str: *const c_ushort, len: c_int) { - let utf16 = unsafe { slice::from_raw_parts(str, len as usize) }; + let utf16 = unsafe { slice::from_raw_parts(str, to_usize(len)) }; let characters = decode_utf16(utf16.iter().cloned()) .into_iter() .map(|r| r.unwrap()); s.clear(); s.extend(characters); } )"; } if (hasByteArray) { r << R"( pub enum QByteArray {} )"; } if (hasListOrTree) { r << R"( #[repr(C)] pub enum SortOrder { Ascending = 0, Descending = 1, } #[repr(C)] pub struct QModelIndex { row: c_int, internal_id: usize, } +)"; + } + + if (hasString || hasByteArray || hasListOrTree) { + r << R"( + +fn to_usize(n: c_int) -> usize { + if n < 0 { + panic!("Cannot cast {} to usize", n); + } + n as usize +} + +)"; + } + + if (hasString || hasByteArray || hasListOrTree) { + r << R"( +fn to_c_int(n: usize) -> c_int { + if n > c_int::max_value() as usize { + panic!("Cannot cast {} to c_int", n); + } + n as c_int +} + )"; } } void writeRustInterface(const Configuration& conf) { DifferentFileWriter w(rustFile(conf.rustdir, conf.interfaceModule)); QTextStream r(&w.buffer); r << QString(R"(/* generated by rust_qt_binding_generator */ #![allow(unknown_lints)] #![allow(mutex_atomic, needless_pass_by_value)] use libc::{c_char, c_ushort, c_int}; use std::slice; use std::char::decode_utf16; use std::sync::{Arc, Mutex}; use std::ptr::null; use %1::*; )").arg(conf.implementationModule); writeRustTypes(conf, r); for (auto object: conf.objects) { writeRustInterfaceObject(r, object, conf); } } void writeRustImplementationObject(QTextStream& r, const Object& o) { const QString lcname(snakeCase(o.name)); if (o.type != ObjectType::Object) { r << "#[derive(Default, Clone)]\n"; r << QString("struct %1Item {\n").arg(o.name); for (auto ip: o.itemProperties) { const QString lc(snakeCase(ip.name)); r << QString(" %1: %2,\n").arg(lc, ip.type.rustType); } r << "}\n\n"; } QString modelStruct = ""; r << QString("pub struct %1 {\n emit: %1Emitter,\n").arg((o.name)); if (o.type == ObjectType::List) { modelStruct = ", model: " + o.name + "List"; r << QString(" model: %1List,\n").arg(o.name); } else if (o.type == ObjectType::Tree) { modelStruct = ", model: " + o.name + "Tree"; r << QString(" model: %1Tree,\n").arg(o.name); } for (const Property& p: o.properties) { const QString lc(snakeCase(p.name)); r << QString(" %1: %2,\n").arg(lc, rustType(p)); } if (o.type != ObjectType::Object) { r << QString(" list: Vec<%1Item>,\n").arg(o.name); } r << "}\n\n"; for (const Property& p: o.properties) { if (p.type.type == BindingType::Object) { modelStruct += ", " + p.name + ": " + p.type.name; } } r << QString(R"(impl %1Trait for %1 { fn new(emit: %1Emitter%2) -> %1 { %1 { emit: emit, )").arg(o.name, modelStruct); if (o.type != ObjectType::Object) { r << QString(" model: model,\n"); } for (const Property& p: o.properties) { const QString lc(snakeCase(p.name)); if (p.type.type == BindingType::Object) { r << QString(" %1: %1,\n").arg(lc); } else { r << QString(" %1: %2,\n").arg(lc, rustTypeInit(p)); } } r << QString(R"( } } fn emit(&self) -> &%1Emitter { &self.emit } )").arg(o.name); for (const Property& p: o.properties) { const QString lc(snakeCase(p.name)); if (p.type.type == BindingType::Object) { r << QString(R"( fn %1(&self) -> &%2 { &self.%1 } fn %1_mut(&mut self) -> &mut %2 { &mut self.%1 } )").arg(lc, rustReturnType(p)); } else { r << QString(" fn %1(&self) -> %2 {\n").arg(lc, rustReturnType(p)); if (p.type.isComplex()) { if (p.optional) { /* if (rustType(p) == "Option") { r << QString(" self.%1.as_ref().map(|p|p.as_str())\n").arg(lc); } else { } */ r << QString(" self.%1.as_ref().map(|p|&p[..])\n").arg(lc); } else { r << QString(" &self.%1\n").arg(lc); } } else { r << QString(" self.%1\n").arg(lc); } r << " }\n"; if (p.write) { r << QString(R"( fn set_%1(&mut self, value: %2) { self.%1 = value; self.emit.%1_changed(); } )").arg(lc, rustType(p)); } } } if (o.type == ObjectType::List) { r << " fn row_count(&self) -> usize {\n self.list.len()\n }\n"; } else if (o.type == ObjectType::Tree) { r << R"( fn row_count(&self, item: Option) -> usize { self.list.len() } fn index(&self, item: Option, row: usize) -> usize { 0 } fn parent(&self, item: usize) -> Option { None } fn row(&self, item: usize) -> usize { item } )"; } if (o.type != ObjectType::Object) { QString index; if (o.type == ObjectType::Tree) { index = ", item: usize"; } for (auto ip: o.itemProperties) { const QString lc(snakeCase(ip.name)); r << QString(" fn %1(&self, item: usize) -> %2 {\n") .arg(lc, rustReturnType(ip)); if (ip.type.isComplex()) { r << " &self.list[item]." << lc << "\n"; } else { r << " self.list[item]." << lc << "\n"; } r << " }\n"; if (ip.write) { r << QString(" fn set_%1(&mut self, item: usize, v: %2) -> bool {\n") .arg(snakeCase(ip.name), rustType(ip)); r << " self.list[item]." << lc << " = v;\n"; r << " true\n"; r << " }\n"; } } } r << "}\n\n"; } void writeRustImplementation(const Configuration& conf) { DifferentFileWriter w(rustFile(conf.rustdir, conf.implementationModule), conf.overwriteImplementation); QTextStream r(&w.buffer); r << QString(R"(#![allow(unused_imports)] #![allow(unused_variables)] #![allow(dead_code)] use %1::*; )").arg(conf.interfaceModule); for (auto object: conf.objects) { writeRustImplementationObject(r, object); } } diff --git a/templates/qt_quick/rust/src/interface.rs b/templates/qt_quick/rust/src/interface.rs index 1a8e317..50503ea 100644 --- a/templates/qt_quick/rust/src/interface.rs +++ b/templates/qt_quick/rust/src/interface.rs @@ -1,91 +1,108 @@ /* generated by rust_qt_binding_generator */ #![allow(unknown_lints)] #![allow(mutex_atomic, needless_pass_by_value)] use libc::{c_char, c_ushort, c_int}; use std::slice; use std::char::decode_utf16; use std::sync::{Arc, Mutex}; use std::ptr::null; use implementation::*; pub enum QString {} fn set_string_from_utf16(s: &mut String, str: *const c_ushort, len: c_int) { - let utf16 = unsafe { slice::from_raw_parts(str, len as usize) }; + let utf16 = unsafe { slice::from_raw_parts(str, to_usize(len)) }; let characters = decode_utf16(utf16.iter().cloned()) .into_iter() .map(|r| r.unwrap()); s.clear(); s.extend(characters); } + +fn to_usize(n: c_int) -> usize { + if n < 0 { + panic!("Cannot cast {} to usize", n); + } + n as usize +} + + +fn to_c_int(n: usize) -> c_int { + if n > c_int::max_value() as usize { + panic!("Cannot cast {} to c_int", n); + } + n as c_int +} + + pub struct SimpleQObject {} #[derive(Clone)] pub struct SimpleEmitter { qobject: Arc>, message_changed: fn(*const SimpleQObject), } unsafe impl Send for SimpleEmitter {} impl SimpleEmitter { fn clear(&self) { *self.qobject.lock().unwrap() = null(); } pub fn message_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.message_changed)(ptr); } } } pub trait SimpleTrait { fn new(emit: SimpleEmitter) -> Self; fn emit(&self) -> &SimpleEmitter; fn message(&self) -> &str; fn set_message(&mut self, value: String); } #[no_mangle] pub extern "C" fn simple_new( simple: *mut SimpleQObject, message_changed: fn(*const SimpleQObject), ) -> *mut Simple { let simple_emit = SimpleEmitter { qobject: Arc::new(Mutex::new(simple)), message_changed: message_changed, }; let d_simple = Simple::new(simple_emit); Box::into_raw(Box::new(d_simple)) } #[no_mangle] pub unsafe extern "C" fn simple_free(ptr: *mut Simple) { Box::from_raw(ptr).emit().clear(); } #[no_mangle] pub extern "C" fn simple_message_get( ptr: *const Simple, p: *mut QString, set: fn(*mut QString, *const c_char, c_int), ) { let o = unsafe { &*ptr }; let v = o.message(); let s: *const c_char = v.as_ptr() as (*const c_char); - set(p, s, v.len() as c_int); + set(p, s, to_c_int(v.len())); } #[no_mangle] pub extern "C" fn simple_message_set(ptr: *mut Simple, v: *const c_ushort, len: c_int) { let o = unsafe { &mut *ptr }; let mut s = String::new(); set_string_from_utf16(&mut s, v, len); o.set_message(s); } diff --git a/templates/qt_widgets/rust/src/interface.rs b/templates/qt_widgets/rust/src/interface.rs index 1a8e317..50503ea 100644 --- a/templates/qt_widgets/rust/src/interface.rs +++ b/templates/qt_widgets/rust/src/interface.rs @@ -1,91 +1,108 @@ /* generated by rust_qt_binding_generator */ #![allow(unknown_lints)] #![allow(mutex_atomic, needless_pass_by_value)] use libc::{c_char, c_ushort, c_int}; use std::slice; use std::char::decode_utf16; use std::sync::{Arc, Mutex}; use std::ptr::null; use implementation::*; pub enum QString {} fn set_string_from_utf16(s: &mut String, str: *const c_ushort, len: c_int) { - let utf16 = unsafe { slice::from_raw_parts(str, len as usize) }; + let utf16 = unsafe { slice::from_raw_parts(str, to_usize(len)) }; let characters = decode_utf16(utf16.iter().cloned()) .into_iter() .map(|r| r.unwrap()); s.clear(); s.extend(characters); } + +fn to_usize(n: c_int) -> usize { + if n < 0 { + panic!("Cannot cast {} to usize", n); + } + n as usize +} + + +fn to_c_int(n: usize) -> c_int { + if n > c_int::max_value() as usize { + panic!("Cannot cast {} to c_int", n); + } + n as c_int +} + + pub struct SimpleQObject {} #[derive(Clone)] pub struct SimpleEmitter { qobject: Arc>, message_changed: fn(*const SimpleQObject), } unsafe impl Send for SimpleEmitter {} impl SimpleEmitter { fn clear(&self) { *self.qobject.lock().unwrap() = null(); } pub fn message_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.message_changed)(ptr); } } } pub trait SimpleTrait { fn new(emit: SimpleEmitter) -> Self; fn emit(&self) -> &SimpleEmitter; fn message(&self) -> &str; fn set_message(&mut self, value: String); } #[no_mangle] pub extern "C" fn simple_new( simple: *mut SimpleQObject, message_changed: fn(*const SimpleQObject), ) -> *mut Simple { let simple_emit = SimpleEmitter { qobject: Arc::new(Mutex::new(simple)), message_changed: message_changed, }; let d_simple = Simple::new(simple_emit); Box::into_raw(Box::new(d_simple)) } #[no_mangle] pub unsafe extern "C" fn simple_free(ptr: *mut Simple) { Box::from_raw(ptr).emit().clear(); } #[no_mangle] pub extern "C" fn simple_message_get( ptr: *const Simple, p: *mut QString, set: fn(*mut QString, *const c_char, c_int), ) { let o = unsafe { &*ptr }; let v = o.message(); let s: *const c_char = v.as_ptr() as (*const c_char); - set(p, s, v.len() as c_int); + set(p, s, to_c_int(v.len())); } #[no_mangle] pub extern "C" fn simple_message_set(ptr: *mut Simple, v: *const c_ushort, len: c_int) { let o = unsafe { &mut *ptr }; let mut s = String::new(); set_string_from_utf16(&mut s, v, len); o.set_message(s); } diff --git a/tests/rust_functions/src/interface.rs b/tests/rust_functions/src/interface.rs index 1758eb6..a2aed64 100644 --- a/tests/rust_functions/src/interface.rs +++ b/tests/rust_functions/src/interface.rs @@ -1,152 +1,169 @@ /* generated by rust_qt_binding_generator */ #![allow(unknown_lints)] #![allow(mutex_atomic, needless_pass_by_value)] use libc::{c_char, c_ushort, c_int}; use std::slice; use std::char::decode_utf16; use std::sync::{Arc, Mutex}; use std::ptr::null; use implementation::*; pub enum QString {} fn set_string_from_utf16(s: &mut String, str: *const c_ushort, len: c_int) { - let utf16 = unsafe { slice::from_raw_parts(str, len as usize) }; + let utf16 = unsafe { slice::from_raw_parts(str, to_usize(len)) }; let characters = decode_utf16(utf16.iter().cloned()) .into_iter() .map(|r| r.unwrap()); s.clear(); s.extend(characters); } + +fn to_usize(n: c_int) -> usize { + if n < 0 { + panic!("Cannot cast {} to usize", n); + } + n as usize +} + + +fn to_c_int(n: usize) -> c_int { + if n > c_int::max_value() as usize { + panic!("Cannot cast {} to c_int", n); + } + n as c_int +} + + pub struct PersonQObject {} #[derive(Clone)] pub struct PersonEmitter { qobject: Arc>, user_name_changed: fn(*const PersonQObject), } unsafe impl Send for PersonEmitter {} impl PersonEmitter { fn clear(&self) { *self.qobject.lock().unwrap() = null(); } pub fn user_name_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.user_name_changed)(ptr); } } } pub trait PersonTrait { fn new(emit: PersonEmitter) -> Self; fn emit(&self) -> &PersonEmitter; fn user_name(&self) -> &str; fn set_user_name(&mut self, value: String); fn append(&mut self, suffix: String, amount: u32) -> (); fn double_name(&mut self) -> (); fn greet(&self, name: String) -> String; fn quote(&self, prefix: String, suffix: String) -> String; fn quote_bytes(&self, prefix: &[u8], suffix: &[u8]) -> String; fn vowels_in_name(&self) -> u8; } #[no_mangle] pub extern "C" fn person_new( person: *mut PersonQObject, user_name_changed: fn(*const PersonQObject), ) -> *mut Person { let person_emit = PersonEmitter { qobject: Arc::new(Mutex::new(person)), user_name_changed: user_name_changed, }; let d_person = Person::new(person_emit); Box::into_raw(Box::new(d_person)) } #[no_mangle] pub unsafe extern "C" fn person_free(ptr: *mut Person) { Box::from_raw(ptr).emit().clear(); } #[no_mangle] pub extern "C" fn person_user_name_get( ptr: *const Person, p: *mut QString, set: fn(*mut QString, *const c_char, c_int), ) { let o = unsafe { &*ptr }; let v = o.user_name(); let s: *const c_char = v.as_ptr() as (*const c_char); - set(p, s, v.len() as c_int); + set(p, s, to_c_int(v.len())); } #[no_mangle] pub extern "C" fn person_user_name_set(ptr: *mut Person, v: *const c_ushort, len: c_int) { let o = unsafe { &mut *ptr }; let mut s = String::new(); set_string_from_utf16(&mut s, v, len); o.set_user_name(s); } #[no_mangle] pub extern "C" fn person_append(ptr: *mut Person, suffix_str: *const c_ushort, suffix_len: c_int, amount: u32) -> () { let mut suffix = String::new(); set_string_from_utf16(&mut suffix, suffix_str, suffix_len); let o = unsafe { &mut *ptr }; let r = o.append(suffix, amount); r } #[no_mangle] pub extern "C" fn person_double_name(ptr: *mut Person) -> () { let o = unsafe { &mut *ptr }; let r = o.double_name(); r } #[no_mangle] pub extern "C" fn person_greet(ptr: *const Person, name_str: *const c_ushort, name_len: c_int, d: *mut QString, set: fn(*mut QString, str: *const c_char, len: c_int)) { let mut name = String::new(); set_string_from_utf16(&mut name, name_str, name_len); let o = unsafe { &*ptr }; let r = o.greet(name); let s: *const c_char = r.as_ptr() as (*const c_char); set(d, s, r.len() as i32); } #[no_mangle] pub extern "C" fn person_quote(ptr: *const Person, prefix_str: *const c_ushort, prefix_len: c_int, suffix_str: *const c_ushort, suffix_len: c_int, d: *mut QString, set: fn(*mut QString, str: *const c_char, len: c_int)) { let mut prefix = String::new(); set_string_from_utf16(&mut prefix, prefix_str, prefix_len); let mut suffix = String::new(); set_string_from_utf16(&mut suffix, suffix_str, suffix_len); let o = unsafe { &*ptr }; let r = o.quote(prefix, suffix); let s: *const c_char = r.as_ptr() as (*const c_char); set(d, s, r.len() as i32); } #[no_mangle] pub extern "C" fn person_quote_bytes(ptr: *const Person, prefix_str: *const c_char, prefix_len: c_int, suffix_str: *const c_char, suffix_len: c_int, d: *mut QString, set: fn(*mut QString, str: *const c_char, len: c_int)) { - let prefix = unsafe { slice::from_raw_parts(prefix_str as *const u8, prefix_len as usize) }; - let suffix = unsafe { slice::from_raw_parts(suffix_str as *const u8, suffix_len as usize) }; + let prefix = unsafe { slice::from_raw_parts(prefix_str as *const u8, to_usize(prefix_len)) }; + let suffix = unsafe { slice::from_raw_parts(suffix_str as *const u8, to_usize(suffix_len)) }; let o = unsafe { &*ptr }; let r = o.quote_bytes(prefix, suffix); let s: *const c_char = r.as_ptr() as (*const c_char); set(d, s, r.len() as i32); } #[no_mangle] pub extern "C" fn person_vowels_in_name(ptr: *const Person) -> u8 { let o = unsafe { &*ptr }; let r = o.vowels_in_name(); r } diff --git a/tests/rust_list/src/interface.rs b/tests/rust_list/src/interface.rs index ba7e7a2..cd2adff 100644 --- a/tests/rust_list/src/interface.rs +++ b/tests/rust_list/src/interface.rs @@ -1,222 +1,239 @@ /* generated by rust_qt_binding_generator */ #![allow(unknown_lints)] #![allow(mutex_atomic, needless_pass_by_value)] use libc::{c_char, c_ushort, c_int}; use std::slice; use std::char::decode_utf16; use std::sync::{Arc, Mutex}; use std::ptr::null; use implementation::*; #[repr(C)] pub struct COption { data: T, some: bool, } impl From> for COption where T: Default, { fn from(t: Option) -> COption { if let Some(v) = t { COption { data: v, some: true, } } else { COption { data: T::default(), some: false, } } } } pub enum QString {} fn set_string_from_utf16(s: &mut String, str: *const c_ushort, len: c_int) { - let utf16 = unsafe { slice::from_raw_parts(str, len as usize) }; + let utf16 = unsafe { slice::from_raw_parts(str, to_usize(len)) }; let characters = decode_utf16(utf16.iter().cloned()) .into_iter() .map(|r| r.unwrap()); s.clear(); s.extend(characters); } #[repr(C)] pub enum SortOrder { Ascending = 0, Descending = 1, } #[repr(C)] pub struct QModelIndex { row: c_int, internal_id: usize, } + +fn to_usize(n: c_int) -> usize { + if n < 0 { + panic!("Cannot cast {} to usize", n); + } + n as usize +} + + +fn to_c_int(n: usize) -> c_int { + if n > c_int::max_value() as usize { + panic!("Cannot cast {} to c_int", n); + } + n as c_int +} + + pub struct PersonsQObject {} #[derive(Clone)] pub struct PersonsEmitter { qobject: Arc>, new_data_ready: fn(*const PersonsQObject), } unsafe impl Send for PersonsEmitter {} impl PersonsEmitter { fn clear(&self) { *self.qobject.lock().unwrap() = null(); } pub fn new_data_ready(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.new_data_ready)(ptr); } } } pub struct PersonsList { qobject: *const PersonsQObject, data_changed: fn(*const PersonsQObject, usize, usize), begin_reset_model: fn(*const PersonsQObject), end_reset_model: fn(*const PersonsQObject), begin_insert_rows: fn(*const PersonsQObject, usize, usize), end_insert_rows: fn(*const PersonsQObject), begin_remove_rows: fn(*const PersonsQObject, usize, usize), end_remove_rows: fn(*const PersonsQObject), } impl PersonsList { pub fn data_changed(&self, first: usize, last: usize) { (self.data_changed)(self.qobject, first, last); } pub fn begin_reset_model(&self) { (self.begin_reset_model)(self.qobject); } pub fn end_reset_model(&self) { (self.end_reset_model)(self.qobject); } pub fn begin_insert_rows(&self, first: usize, last: usize) { (self.begin_insert_rows)(self.qobject, first, last); } pub fn end_insert_rows(&self) { (self.end_insert_rows)(self.qobject); } pub fn begin_remove_rows(&self, first: usize, last: usize) { (self.begin_remove_rows)(self.qobject, first, last); } pub fn end_remove_rows(&self) { (self.end_remove_rows)(self.qobject); } } pub trait PersonsTrait { fn new(emit: PersonsEmitter, model: PersonsList) -> Self; fn emit(&self) -> &PersonsEmitter; fn row_count(&self) -> usize; fn insert_rows(&mut self, _row: usize, _count: usize) -> bool { false } fn remove_rows(&mut self, _row: usize, _count: usize) -> bool { false } fn can_fetch_more(&self) -> bool { false } fn fetch_more(&mut self) {} fn sort(&mut self, u8, SortOrder) {} fn user_name(&self, item: usize) -> &str; fn set_user_name(&mut self, item: usize, String) -> bool; } #[no_mangle] pub extern "C" fn persons_new( persons: *mut PersonsQObject, persons_new_data_ready: fn(*const PersonsQObject), persons_data_changed: fn(*const PersonsQObject, usize, usize), persons_begin_reset_model: fn(*const PersonsQObject), persons_end_reset_model: fn(*const PersonsQObject), persons_begin_insert_rows: fn(*const PersonsQObject, usize, usize), persons_end_insert_rows: fn(*const PersonsQObject), persons_begin_remove_rows: fn(*const PersonsQObject, usize, usize), persons_end_remove_rows: fn(*const PersonsQObject), ) -> *mut Persons { let persons_emit = PersonsEmitter { qobject: Arc::new(Mutex::new(persons)), new_data_ready: persons_new_data_ready, }; let model = PersonsList { qobject: persons, data_changed: persons_data_changed, begin_reset_model: persons_begin_reset_model, end_reset_model: persons_end_reset_model, begin_insert_rows: persons_begin_insert_rows, end_insert_rows: persons_end_insert_rows, begin_remove_rows: persons_begin_remove_rows, end_remove_rows: persons_end_remove_rows, }; let d_persons = Persons::new(persons_emit, model); Box::into_raw(Box::new(d_persons)) } #[no_mangle] pub unsafe extern "C" fn persons_free(ptr: *mut Persons) { Box::from_raw(ptr).emit().clear(); } #[no_mangle] pub unsafe extern "C" fn persons_row_count(ptr: *const Persons) -> c_int { - (&*ptr).row_count() as c_int + to_c_int((&*ptr).row_count()) } #[no_mangle] pub unsafe extern "C" fn persons_insert_rows(ptr: *mut Persons, row: c_int, count: c_int) -> bool { - (&mut *ptr).insert_rows(row as usize, count as usize) + (&mut *ptr).insert_rows(to_usize(row), to_usize(count)) } #[no_mangle] pub unsafe extern "C" fn persons_remove_rows(ptr: *mut Persons, row: c_int, count: c_int) -> bool { - (&mut *ptr).remove_rows(row as usize, count as usize) + (&mut *ptr).remove_rows(to_usize(row), to_usize(count)) } #[no_mangle] pub unsafe extern "C" fn persons_can_fetch_more(ptr: *const Persons) -> bool { (&*ptr).can_fetch_more() } #[no_mangle] pub unsafe extern "C" fn persons_fetch_more(ptr: *mut Persons) { (&mut *ptr).fetch_more() } #[no_mangle] pub unsafe extern "C" fn persons_sort( ptr: *mut Persons, column: u8, order: SortOrder, ) { (&mut *ptr).sort(column, order) } #[no_mangle] pub extern "C" fn persons_data_user_name( ptr: *const Persons, row: c_int, d: *mut QString, set: fn(*mut QString, *const c_char, len: c_int), ) { let o = unsafe { &*ptr }; - let data = o.user_name(row as usize); + let data = o.user_name(to_usize(row)); let s: *const c_char = data.as_ptr() as (*const c_char); - set(d, s, data.len() as c_int); + set(d, s, to_c_int(data.len())); } #[no_mangle] pub extern "C" fn persons_set_data_user_name( ptr: *mut Persons, row: c_int, s: *const c_ushort, len: c_int, ) -> bool { let o = unsafe { &mut *ptr }; let mut v = String::new(); set_string_from_utf16(&mut v, s, len); - o.set_user_name(row as usize, v) + o.set_user_name(to_usize(row), v) } diff --git a/tests/rust_list_types/src/interface.rs b/tests/rust_list_types/src/interface.rs index d2606fe..be4f34b 100644 --- a/tests/rust_list_types/src/interface.rs +++ b/tests/rust_list_types/src/interface.rs @@ -1,509 +1,526 @@ /* generated by rust_qt_binding_generator */ #![allow(unknown_lints)] #![allow(mutex_atomic, needless_pass_by_value)] use libc::{c_char, c_ushort, c_int}; use std::slice; use std::char::decode_utf16; use std::sync::{Arc, Mutex}; use std::ptr::null; use implementation::*; #[repr(C)] pub struct COption { data: T, some: bool, } impl From> for COption where T: Default, { fn from(t: Option) -> COption { if let Some(v) = t { COption { data: v, some: true, } } else { COption { data: T::default(), some: false, } } } } pub enum QString {} fn set_string_from_utf16(s: &mut String, str: *const c_ushort, len: c_int) { - let utf16 = unsafe { slice::from_raw_parts(str, len as usize) }; + let utf16 = unsafe { slice::from_raw_parts(str, to_usize(len)) }; let characters = decode_utf16(utf16.iter().cloned()) .into_iter() .map(|r| r.unwrap()); s.clear(); s.extend(characters); } pub enum QByteArray {} #[repr(C)] pub enum SortOrder { Ascending = 0, Descending = 1, } #[repr(C)] pub struct QModelIndex { row: c_int, internal_id: usize, } + +fn to_usize(n: c_int) -> usize { + if n < 0 { + panic!("Cannot cast {} to usize", n); + } + n as usize +} + + +fn to_c_int(n: usize) -> c_int { + if n > c_int::max_value() as usize { + panic!("Cannot cast {} to c_int", n); + } + n as c_int +} + + pub struct ListQObject {} #[derive(Clone)] pub struct ListEmitter { qobject: Arc>, new_data_ready: fn(*const ListQObject), } unsafe impl Send for ListEmitter {} impl ListEmitter { fn clear(&self) { *self.qobject.lock().unwrap() = null(); } pub fn new_data_ready(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.new_data_ready)(ptr); } } } pub struct ListList { qobject: *const ListQObject, data_changed: fn(*const ListQObject, usize, usize), begin_reset_model: fn(*const ListQObject), end_reset_model: fn(*const ListQObject), begin_insert_rows: fn(*const ListQObject, usize, usize), end_insert_rows: fn(*const ListQObject), begin_remove_rows: fn(*const ListQObject, usize, usize), end_remove_rows: fn(*const ListQObject), } impl ListList { pub fn data_changed(&self, first: usize, last: usize) { (self.data_changed)(self.qobject, first, last); } pub fn begin_reset_model(&self) { (self.begin_reset_model)(self.qobject); } pub fn end_reset_model(&self) { (self.end_reset_model)(self.qobject); } pub fn begin_insert_rows(&self, first: usize, last: usize) { (self.begin_insert_rows)(self.qobject, first, last); } pub fn end_insert_rows(&self) { (self.end_insert_rows)(self.qobject); } pub fn begin_remove_rows(&self, first: usize, last: usize) { (self.begin_remove_rows)(self.qobject, first, last); } pub fn end_remove_rows(&self) { (self.end_remove_rows)(self.qobject); } } pub trait ListTrait { fn new(emit: ListEmitter, model: ListList) -> Self; fn emit(&self) -> &ListEmitter; fn row_count(&self) -> usize; fn insert_rows(&mut self, _row: usize, _count: usize) -> bool { false } fn remove_rows(&mut self, _row: usize, _count: usize) -> bool { false } fn can_fetch_more(&self) -> bool { false } fn fetch_more(&mut self) {} fn sort(&mut self, u8, SortOrder) {} fn boolean(&self, item: usize) -> bool; fn set_boolean(&mut self, item: usize, bool) -> bool; fn bytearray(&self, item: usize) -> &[u8]; fn set_bytearray(&mut self, item: usize, &[u8]) -> bool; fn f32(&self, item: usize) -> f32; fn set_f32(&mut self, item: usize, f32) -> bool; fn f64(&self, item: usize) -> f64; fn set_f64(&mut self, item: usize, f64) -> bool; fn i16(&self, item: usize) -> i16; fn set_i16(&mut self, item: usize, i16) -> bool; fn i32(&self, item: usize) -> i32; fn set_i32(&mut self, item: usize, i32) -> bool; fn i64(&self, item: usize) -> i64; fn set_i64(&mut self, item: usize, i64) -> bool; fn i8(&self, item: usize) -> i8; fn set_i8(&mut self, item: usize, i8) -> bool; fn optional_boolean(&self, item: usize) -> Option; fn set_optional_boolean(&mut self, item: usize, Option) -> bool; fn optional_bytearray(&self, item: usize) -> Option<&[u8]>; fn set_optional_bytearray(&mut self, item: usize, Option<&[u8]>) -> bool; fn optional_string(&self, item: usize) -> Option<&str>; fn set_optional_string(&mut self, item: usize, Option) -> bool; fn string(&self, item: usize) -> &str; fn set_string(&mut self, item: usize, String) -> bool; fn u16(&self, item: usize) -> u16; fn set_u16(&mut self, item: usize, u16) -> bool; fn u32(&self, item: usize) -> u32; fn set_u32(&mut self, item: usize, u32) -> bool; fn u64(&self, item: usize) -> u64; fn set_u64(&mut self, item: usize, u64) -> bool; fn u8(&self, item: usize) -> u8; fn set_u8(&mut self, item: usize, u8) -> bool; } #[no_mangle] pub extern "C" fn list_new( list: *mut ListQObject, list_new_data_ready: fn(*const ListQObject), list_data_changed: fn(*const ListQObject, usize, usize), list_begin_reset_model: fn(*const ListQObject), list_end_reset_model: fn(*const ListQObject), list_begin_insert_rows: fn(*const ListQObject, usize, usize), list_end_insert_rows: fn(*const ListQObject), list_begin_remove_rows: fn(*const ListQObject, usize, usize), list_end_remove_rows: fn(*const ListQObject), ) -> *mut List { let list_emit = ListEmitter { qobject: Arc::new(Mutex::new(list)), new_data_ready: list_new_data_ready, }; let model = ListList { qobject: list, data_changed: list_data_changed, begin_reset_model: list_begin_reset_model, end_reset_model: list_end_reset_model, begin_insert_rows: list_begin_insert_rows, end_insert_rows: list_end_insert_rows, begin_remove_rows: list_begin_remove_rows, end_remove_rows: list_end_remove_rows, }; let d_list = List::new(list_emit, model); Box::into_raw(Box::new(d_list)) } #[no_mangle] pub unsafe extern "C" fn list_free(ptr: *mut List) { Box::from_raw(ptr).emit().clear(); } #[no_mangle] pub unsafe extern "C" fn list_row_count(ptr: *const List) -> c_int { - (&*ptr).row_count() as c_int + to_c_int((&*ptr).row_count()) } #[no_mangle] pub unsafe extern "C" fn list_insert_rows(ptr: *mut List, row: c_int, count: c_int) -> bool { - (&mut *ptr).insert_rows(row as usize, count as usize) + (&mut *ptr).insert_rows(to_usize(row), to_usize(count)) } #[no_mangle] pub unsafe extern "C" fn list_remove_rows(ptr: *mut List, row: c_int, count: c_int) -> bool { - (&mut *ptr).remove_rows(row as usize, count as usize) + (&mut *ptr).remove_rows(to_usize(row), to_usize(count)) } #[no_mangle] pub unsafe extern "C" fn list_can_fetch_more(ptr: *const List) -> bool { (&*ptr).can_fetch_more() } #[no_mangle] pub unsafe extern "C" fn list_fetch_more(ptr: *mut List) { (&mut *ptr).fetch_more() } #[no_mangle] pub unsafe extern "C" fn list_sort( ptr: *mut List, column: u8, order: SortOrder, ) { (&mut *ptr).sort(column, order) } #[no_mangle] pub extern "C" fn list_data_boolean(ptr: *const List, row: c_int) -> bool { let o = unsafe { &*ptr }; - o.boolean(row as usize).into() + o.boolean(to_usize(row)).into() } #[no_mangle] pub unsafe extern "C" fn list_set_data_boolean( ptr: *mut List, row: c_int, v: bool, ) -> bool { - (&mut *ptr).set_boolean(row as usize, v) + (&mut *ptr).set_boolean(to_usize(row), v) } #[no_mangle] pub extern "C" fn list_data_bytearray( ptr: *const List, row: c_int, d: *mut QByteArray, set: fn(*mut QByteArray, *const c_char, len: c_int), ) { let o = unsafe { &*ptr }; - let data = o.bytearray(row as usize); + let data = o.bytearray(to_usize(row)); let s: *const c_char = data.as_ptr() as (*const c_char); - set(d, s, data.len() as c_int); + set(d, s, to_c_int(data.len())); } #[no_mangle] pub extern "C" fn list_set_data_bytearray( ptr: *mut List, row: c_int, s: *const c_char, len: c_int, ) -> bool { let o = unsafe { &mut *ptr }; - let slice = unsafe { ::std::slice::from_raw_parts(s as *const u8, len as usize) }; - o.set_bytearray(row as usize, slice) + let slice = unsafe { ::std::slice::from_raw_parts(s as *const u8, to_usize(len)) }; + o.set_bytearray(to_usize(row), slice) } #[no_mangle] pub extern "C" fn list_data_f32(ptr: *const List, row: c_int) -> f32 { let o = unsafe { &*ptr }; - o.f32(row as usize).into() + o.f32(to_usize(row)).into() } #[no_mangle] pub unsafe extern "C" fn list_set_data_f32( ptr: *mut List, row: c_int, v: f32, ) -> bool { - (&mut *ptr).set_f32(row as usize, v) + (&mut *ptr).set_f32(to_usize(row), v) } #[no_mangle] pub extern "C" fn list_data_f64(ptr: *const List, row: c_int) -> f64 { let o = unsafe { &*ptr }; - o.f64(row as usize).into() + o.f64(to_usize(row)).into() } #[no_mangle] pub unsafe extern "C" fn list_set_data_f64( ptr: *mut List, row: c_int, v: f64, ) -> bool { - (&mut *ptr).set_f64(row as usize, v) + (&mut *ptr).set_f64(to_usize(row), v) } #[no_mangle] pub extern "C" fn list_data_i16(ptr: *const List, row: c_int) -> i16 { let o = unsafe { &*ptr }; - o.i16(row as usize).into() + o.i16(to_usize(row)).into() } #[no_mangle] pub unsafe extern "C" fn list_set_data_i16( ptr: *mut List, row: c_int, v: i16, ) -> bool { - (&mut *ptr).set_i16(row as usize, v) + (&mut *ptr).set_i16(to_usize(row), v) } #[no_mangle] pub extern "C" fn list_data_i32(ptr: *const List, row: c_int) -> i32 { let o = unsafe { &*ptr }; - o.i32(row as usize).into() + o.i32(to_usize(row)).into() } #[no_mangle] pub unsafe extern "C" fn list_set_data_i32( ptr: *mut List, row: c_int, v: i32, ) -> bool { - (&mut *ptr).set_i32(row as usize, v) + (&mut *ptr).set_i32(to_usize(row), v) } #[no_mangle] pub extern "C" fn list_data_i64(ptr: *const List, row: c_int) -> i64 { let o = unsafe { &*ptr }; - o.i64(row as usize).into() + o.i64(to_usize(row)).into() } #[no_mangle] pub unsafe extern "C" fn list_set_data_i64( ptr: *mut List, row: c_int, v: i64, ) -> bool { - (&mut *ptr).set_i64(row as usize, v) + (&mut *ptr).set_i64(to_usize(row), v) } #[no_mangle] pub extern "C" fn list_data_i8(ptr: *const List, row: c_int) -> i8 { let o = unsafe { &*ptr }; - o.i8(row as usize).into() + o.i8(to_usize(row)).into() } #[no_mangle] pub unsafe extern "C" fn list_set_data_i8( ptr: *mut List, row: c_int, v: i8, ) -> bool { - (&mut *ptr).set_i8(row as usize, v) + (&mut *ptr).set_i8(to_usize(row), v) } #[no_mangle] pub extern "C" fn list_data_optional_boolean(ptr: *const List, row: c_int) -> COption { let o = unsafe { &*ptr }; - o.optional_boolean(row as usize).into() + o.optional_boolean(to_usize(row)).into() } #[no_mangle] pub unsafe extern "C" fn list_set_data_optional_boolean( ptr: *mut List, row: c_int, v: bool, ) -> bool { - (&mut *ptr).set_optional_boolean(row as usize, Some(v)) + (&mut *ptr).set_optional_boolean(to_usize(row), Some(v)) } #[no_mangle] pub unsafe extern "C" fn list_set_data_optional_boolean_none(ptr: *mut List, row: c_int) -> bool { - (&mut *ptr).set_optional_boolean(row as usize, None) + (&mut *ptr).set_optional_boolean(to_usize(row), None) } #[no_mangle] pub extern "C" fn list_data_optional_bytearray( ptr: *const List, row: c_int, d: *mut QByteArray, set: fn(*mut QByteArray, *const c_char, len: c_int), ) { let o = unsafe { &*ptr }; - let data = o.optional_bytearray(row as usize); + let data = o.optional_bytearray(to_usize(row)); if let Some(data) = data { let s: *const c_char = data.as_ptr() as (*const c_char); - set(d, s, data.len() as c_int); + set(d, s, to_c_int(data.len())); } } #[no_mangle] pub extern "C" fn list_set_data_optional_bytearray( ptr: *mut List, row: c_int, s: *const c_char, len: c_int, ) -> bool { let o = unsafe { &mut *ptr }; - let slice = unsafe { ::std::slice::from_raw_parts(s as *const u8, len as usize) }; - o.set_optional_bytearray(row as usize, Some(slice)) + let slice = unsafe { ::std::slice::from_raw_parts(s as *const u8, to_usize(len)) }; + o.set_optional_bytearray(to_usize(row), Some(slice)) } #[no_mangle] pub unsafe extern "C" fn list_set_data_optional_bytearray_none(ptr: *mut List, row: c_int) -> bool { - (&mut *ptr).set_optional_bytearray(row as usize, None) + (&mut *ptr).set_optional_bytearray(to_usize(row), None) } #[no_mangle] pub extern "C" fn list_data_optional_string( ptr: *const List, row: c_int, d: *mut QString, set: fn(*mut QString, *const c_char, len: c_int), ) { let o = unsafe { &*ptr }; - let data = o.optional_string(row as usize); + let data = o.optional_string(to_usize(row)); if let Some(data) = data { let s: *const c_char = data.as_ptr() as (*const c_char); - set(d, s, data.len() as c_int); + set(d, s, to_c_int(data.len())); } } #[no_mangle] pub extern "C" fn list_set_data_optional_string( ptr: *mut List, row: c_int, s: *const c_ushort, len: c_int, ) -> bool { let o = unsafe { &mut *ptr }; let mut v = String::new(); set_string_from_utf16(&mut v, s, len); - o.set_optional_string(row as usize, Some(v)) + o.set_optional_string(to_usize(row), Some(v)) } #[no_mangle] pub unsafe extern "C" fn list_set_data_optional_string_none(ptr: *mut List, row: c_int) -> bool { - (&mut *ptr).set_optional_string(row as usize, None) + (&mut *ptr).set_optional_string(to_usize(row), None) } #[no_mangle] pub extern "C" fn list_data_string( ptr: *const List, row: c_int, d: *mut QString, set: fn(*mut QString, *const c_char, len: c_int), ) { let o = unsafe { &*ptr }; - let data = o.string(row as usize); + let data = o.string(to_usize(row)); let s: *const c_char = data.as_ptr() as (*const c_char); - set(d, s, data.len() as c_int); + set(d, s, to_c_int(data.len())); } #[no_mangle] pub extern "C" fn list_set_data_string( ptr: *mut List, row: c_int, s: *const c_ushort, len: c_int, ) -> bool { let o = unsafe { &mut *ptr }; let mut v = String::new(); set_string_from_utf16(&mut v, s, len); - o.set_string(row as usize, v) + o.set_string(to_usize(row), v) } #[no_mangle] pub extern "C" fn list_data_u16(ptr: *const List, row: c_int) -> u16 { let o = unsafe { &*ptr }; - o.u16(row as usize).into() + o.u16(to_usize(row)).into() } #[no_mangle] pub unsafe extern "C" fn list_set_data_u16( ptr: *mut List, row: c_int, v: u16, ) -> bool { - (&mut *ptr).set_u16(row as usize, v) + (&mut *ptr).set_u16(to_usize(row), v) } #[no_mangle] pub extern "C" fn list_data_u32(ptr: *const List, row: c_int) -> u32 { let o = unsafe { &*ptr }; - o.u32(row as usize).into() + o.u32(to_usize(row)).into() } #[no_mangle] pub unsafe extern "C" fn list_set_data_u32( ptr: *mut List, row: c_int, v: u32, ) -> bool { - (&mut *ptr).set_u32(row as usize, v) + (&mut *ptr).set_u32(to_usize(row), v) } #[no_mangle] pub extern "C" fn list_data_u64(ptr: *const List, row: c_int) -> u64 { let o = unsafe { &*ptr }; - o.u64(row as usize).into() + o.u64(to_usize(row)).into() } #[no_mangle] pub unsafe extern "C" fn list_set_data_u64( ptr: *mut List, row: c_int, v: u64, ) -> bool { - (&mut *ptr).set_u64(row as usize, v) + (&mut *ptr).set_u64(to_usize(row), v) } #[no_mangle] pub extern "C" fn list_data_u8(ptr: *const List, row: c_int) -> u8 { let o = unsafe { &*ptr }; - o.u8(row as usize).into() + o.u8(to_usize(row)).into() } #[no_mangle] pub unsafe extern "C" fn list_set_data_u8( ptr: *mut List, row: c_int, v: u8, ) -> bool { - (&mut *ptr).set_u8(row as usize, v) + (&mut *ptr).set_u8(to_usize(row), v) } diff --git a/tests/rust_object/src/interface.rs b/tests/rust_object/src/interface.rs index a23660f..0dc2d3a 100644 --- a/tests/rust_object/src/interface.rs +++ b/tests/rust_object/src/interface.rs @@ -1,91 +1,108 @@ /* generated by rust_qt_binding_generator */ #![allow(unknown_lints)] #![allow(mutex_atomic, needless_pass_by_value)] use libc::{c_char, c_ushort, c_int}; use std::slice; use std::char::decode_utf16; use std::sync::{Arc, Mutex}; use std::ptr::null; use implementation::*; pub enum QString {} fn set_string_from_utf16(s: &mut String, str: *const c_ushort, len: c_int) { - let utf16 = unsafe { slice::from_raw_parts(str, len as usize) }; + let utf16 = unsafe { slice::from_raw_parts(str, to_usize(len)) }; let characters = decode_utf16(utf16.iter().cloned()) .into_iter() .map(|r| r.unwrap()); s.clear(); s.extend(characters); } + +fn to_usize(n: c_int) -> usize { + if n < 0 { + panic!("Cannot cast {} to usize", n); + } + n as usize +} + + +fn to_c_int(n: usize) -> c_int { + if n > c_int::max_value() as usize { + panic!("Cannot cast {} to c_int", n); + } + n as c_int +} + + pub struct PersonQObject {} #[derive(Clone)] pub struct PersonEmitter { qobject: Arc>, user_name_changed: fn(*const PersonQObject), } unsafe impl Send for PersonEmitter {} impl PersonEmitter { fn clear(&self) { *self.qobject.lock().unwrap() = null(); } pub fn user_name_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.user_name_changed)(ptr); } } } pub trait PersonTrait { fn new(emit: PersonEmitter) -> Self; fn emit(&self) -> &PersonEmitter; fn user_name(&self) -> &str; fn set_user_name(&mut self, value: String); } #[no_mangle] pub extern "C" fn person_new( person: *mut PersonQObject, user_name_changed: fn(*const PersonQObject), ) -> *mut Person { let person_emit = PersonEmitter { qobject: Arc::new(Mutex::new(person)), user_name_changed: user_name_changed, }; let d_person = Person::new(person_emit); Box::into_raw(Box::new(d_person)) } #[no_mangle] pub unsafe extern "C" fn person_free(ptr: *mut Person) { Box::from_raw(ptr).emit().clear(); } #[no_mangle] pub extern "C" fn person_user_name_get( ptr: *const Person, p: *mut QString, set: fn(*mut QString, *const c_char, c_int), ) { let o = unsafe { &*ptr }; let v = o.user_name(); let s: *const c_char = v.as_ptr() as (*const c_char); - set(p, s, v.len() as c_int); + set(p, s, to_c_int(v.len())); } #[no_mangle] pub extern "C" fn person_user_name_set(ptr: *mut Person, v: *const c_ushort, len: c_int) { let o = unsafe { &mut *ptr }; let mut s = String::new(); set_string_from_utf16(&mut s, v, len); o.set_user_name(s); } diff --git a/tests/rust_object_types/src/interface.rs b/tests/rust_object_types/src/interface.rs index e14d231..cf3e522 100644 --- a/tests/rust_object_types/src/interface.rs +++ b/tests/rust_object_types/src/interface.rs @@ -1,518 +1,535 @@ /* generated by rust_qt_binding_generator */ #![allow(unknown_lints)] #![allow(mutex_atomic, needless_pass_by_value)] use libc::{c_char, c_ushort, c_int}; use std::slice; use std::char::decode_utf16; use std::sync::{Arc, Mutex}; use std::ptr::null; use implementation::*; #[repr(C)] pub struct COption { data: T, some: bool, } impl From> for COption where T: Default, { fn from(t: Option) -> COption { if let Some(v) = t { COption { data: v, some: true, } } else { COption { data: T::default(), some: false, } } } } pub enum QString {} fn set_string_from_utf16(s: &mut String, str: *const c_ushort, len: c_int) { - let utf16 = unsafe { slice::from_raw_parts(str, len as usize) }; + let utf16 = unsafe { slice::from_raw_parts(str, to_usize(len)) }; let characters = decode_utf16(utf16.iter().cloned()) .into_iter() .map(|r| r.unwrap()); s.clear(); s.extend(characters); } pub enum QByteArray {} + +fn to_usize(n: c_int) -> usize { + if n < 0 { + panic!("Cannot cast {} to usize", n); + } + n as usize +} + + +fn to_c_int(n: usize) -> c_int { + if n > c_int::max_value() as usize { + panic!("Cannot cast {} to c_int", n); + } + n as c_int +} + + pub struct ObjectQObject {} #[derive(Clone)] pub struct ObjectEmitter { qobject: Arc>, boolean_changed: fn(*const ObjectQObject), bytearray_changed: fn(*const ObjectQObject), f32_changed: fn(*const ObjectQObject), f64_changed: fn(*const ObjectQObject), i16_changed: fn(*const ObjectQObject), i32_changed: fn(*const ObjectQObject), i64_changed: fn(*const ObjectQObject), i8_changed: fn(*const ObjectQObject), optional_boolean_changed: fn(*const ObjectQObject), optional_bytearray_changed: fn(*const ObjectQObject), optional_string_changed: fn(*const ObjectQObject), optional_u64_changed: fn(*const ObjectQObject), string_changed: fn(*const ObjectQObject), u16_changed: fn(*const ObjectQObject), u32_changed: fn(*const ObjectQObject), u64_changed: fn(*const ObjectQObject), u8_changed: fn(*const ObjectQObject), } unsafe impl Send for ObjectEmitter {} impl ObjectEmitter { fn clear(&self) { *self.qobject.lock().unwrap() = null(); } pub fn boolean_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.boolean_changed)(ptr); } } pub fn bytearray_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.bytearray_changed)(ptr); } } pub fn f32_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.f32_changed)(ptr); } } pub fn f64_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.f64_changed)(ptr); } } pub fn i16_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.i16_changed)(ptr); } } pub fn i32_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.i32_changed)(ptr); } } pub fn i64_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.i64_changed)(ptr); } } pub fn i8_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.i8_changed)(ptr); } } pub fn optional_boolean_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.optional_boolean_changed)(ptr); } } pub fn optional_bytearray_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.optional_bytearray_changed)(ptr); } } pub fn optional_string_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.optional_string_changed)(ptr); } } pub fn optional_u64_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.optional_u64_changed)(ptr); } } pub fn string_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.string_changed)(ptr); } } pub fn u16_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.u16_changed)(ptr); } } pub fn u32_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.u32_changed)(ptr); } } pub fn u64_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.u64_changed)(ptr); } } pub fn u8_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.u8_changed)(ptr); } } } pub trait ObjectTrait { fn new(emit: ObjectEmitter) -> Self; fn emit(&self) -> &ObjectEmitter; fn boolean(&self) -> bool; fn set_boolean(&mut self, value: bool); fn bytearray(&self) -> &[u8]; fn set_bytearray(&mut self, value: &[u8]); fn f32(&self) -> f32; fn set_f32(&mut self, value: f32); fn f64(&self) -> f64; fn set_f64(&mut self, value: f64); fn i16(&self) -> i16; fn set_i16(&mut self, value: i16); fn i32(&self) -> i32; fn set_i32(&mut self, value: i32); fn i64(&self) -> i64; fn set_i64(&mut self, value: i64); fn i8(&self) -> i8; fn set_i8(&mut self, value: i8); fn optional_boolean(&self) -> Option; fn set_optional_boolean(&mut self, value: Option); fn optional_bytearray(&self) -> Option<&[u8]>; fn set_optional_bytearray(&mut self, value: Option<&[u8]>); fn optional_string(&self) -> Option<&str>; fn set_optional_string(&mut self, value: Option); fn optional_u64(&self) -> Option; fn set_optional_u64(&mut self, value: Option); fn string(&self) -> &str; fn set_string(&mut self, value: String); fn u16(&self) -> u16; fn set_u16(&mut self, value: u16); fn u32(&self) -> u32; fn set_u32(&mut self, value: u32); fn u64(&self) -> u64; fn set_u64(&mut self, value: u64); fn u8(&self) -> u8; fn set_u8(&mut self, value: u8); } #[no_mangle] pub extern "C" fn object_new( object: *mut ObjectQObject, boolean_changed: fn(*const ObjectQObject), bytearray_changed: fn(*const ObjectQObject), f32_changed: fn(*const ObjectQObject), f64_changed: fn(*const ObjectQObject), i16_changed: fn(*const ObjectQObject), i32_changed: fn(*const ObjectQObject), i64_changed: fn(*const ObjectQObject), i8_changed: fn(*const ObjectQObject), optional_boolean_changed: fn(*const ObjectQObject), optional_bytearray_changed: fn(*const ObjectQObject), optional_string_changed: fn(*const ObjectQObject), optional_u64_changed: fn(*const ObjectQObject), string_changed: fn(*const ObjectQObject), u16_changed: fn(*const ObjectQObject), u32_changed: fn(*const ObjectQObject), u64_changed: fn(*const ObjectQObject), u8_changed: fn(*const ObjectQObject), ) -> *mut Object { let object_emit = ObjectEmitter { qobject: Arc::new(Mutex::new(object)), boolean_changed: boolean_changed, bytearray_changed: bytearray_changed, f32_changed: f32_changed, f64_changed: f64_changed, i16_changed: i16_changed, i32_changed: i32_changed, i64_changed: i64_changed, i8_changed: i8_changed, optional_boolean_changed: optional_boolean_changed, optional_bytearray_changed: optional_bytearray_changed, optional_string_changed: optional_string_changed, optional_u64_changed: optional_u64_changed, string_changed: string_changed, u16_changed: u16_changed, u32_changed: u32_changed, u64_changed: u64_changed, u8_changed: u8_changed, }; let d_object = Object::new(object_emit); Box::into_raw(Box::new(d_object)) } #[no_mangle] pub unsafe extern "C" fn object_free(ptr: *mut Object) { Box::from_raw(ptr).emit().clear(); } #[no_mangle] pub unsafe extern "C" fn object_boolean_get(ptr: *const Object) -> bool { (&*ptr).boolean() } #[no_mangle] pub unsafe extern "C" fn object_boolean_set(ptr: *mut Object, v: bool) { (&mut *ptr).set_boolean(v); } #[no_mangle] pub extern "C" fn object_bytearray_get( ptr: *const Object, p: *mut QByteArray, set: fn(*mut QByteArray, *const c_char, c_int), ) { let o = unsafe { &*ptr }; let v = o.bytearray(); let s: *const c_char = v.as_ptr() as (*const c_char); - set(p, s, v.len() as c_int); + set(p, s, to_c_int(v.len())); } #[no_mangle] pub extern "C" fn object_bytearray_set(ptr: *mut Object, v: *const c_char, len: c_int) { let o = unsafe { &mut *ptr }; - let v = unsafe { slice::from_raw_parts(v as *const u8, len as usize) }; + let v = unsafe { slice::from_raw_parts(v as *const u8, to_usize(len)) }; o.set_bytearray(v); } #[no_mangle] pub unsafe extern "C" fn object_f32_get(ptr: *const Object) -> f32 { (&*ptr).f32() } #[no_mangle] pub unsafe extern "C" fn object_f32_set(ptr: *mut Object, v: f32) { (&mut *ptr).set_f32(v); } #[no_mangle] pub unsafe extern "C" fn object_f64_get(ptr: *const Object) -> f64 { (&*ptr).f64() } #[no_mangle] pub unsafe extern "C" fn object_f64_set(ptr: *mut Object, v: f64) { (&mut *ptr).set_f64(v); } #[no_mangle] pub unsafe extern "C" fn object_i16_get(ptr: *const Object) -> i16 { (&*ptr).i16() } #[no_mangle] pub unsafe extern "C" fn object_i16_set(ptr: *mut Object, v: i16) { (&mut *ptr).set_i16(v); } #[no_mangle] pub unsafe extern "C" fn object_i32_get(ptr: *const Object) -> i32 { (&*ptr).i32() } #[no_mangle] pub unsafe extern "C" fn object_i32_set(ptr: *mut Object, v: i32) { (&mut *ptr).set_i32(v); } #[no_mangle] pub unsafe extern "C" fn object_i64_get(ptr: *const Object) -> i64 { (&*ptr).i64() } #[no_mangle] pub unsafe extern "C" fn object_i64_set(ptr: *mut Object, v: i64) { (&mut *ptr).set_i64(v); } #[no_mangle] pub unsafe extern "C" fn object_i8_get(ptr: *const Object) -> i8 { (&*ptr).i8() } #[no_mangle] pub unsafe extern "C" fn object_i8_set(ptr: *mut Object, v: i8) { (&mut *ptr).set_i8(v); } #[no_mangle] pub unsafe extern "C" fn object_optional_boolean_get(ptr: *const Object) -> COption { match (&*ptr).optional_boolean() { Some(value) => COption { data: value, some: true }, None => COption { data: bool::default(), some: false} } } #[no_mangle] pub unsafe extern "C" fn object_optional_boolean_set(ptr: *mut Object, v: bool) { (&mut *ptr).set_optional_boolean(Some(v)); } #[no_mangle] pub extern "C" fn object_optional_boolean_set_none(ptr: *mut Object) { let o = unsafe { &mut *ptr }; o.set_optional_boolean(None); } #[no_mangle] pub extern "C" fn object_optional_bytearray_get( ptr: *const Object, p: *mut QByteArray, set: fn(*mut QByteArray, *const c_char, c_int), ) { let o = unsafe { &*ptr }; let v = o.optional_bytearray(); if let Some(v) = v { let s: *const c_char = v.as_ptr() as (*const c_char); - set(p, s, v.len() as c_int); + set(p, s, to_c_int(v.len())); } } #[no_mangle] pub extern "C" fn object_optional_bytearray_set(ptr: *mut Object, v: *const c_char, len: c_int) { let o = unsafe { &mut *ptr }; - let v = unsafe { slice::from_raw_parts(v as *const u8, len as usize) }; + let v = unsafe { slice::from_raw_parts(v as *const u8, to_usize(len)) }; o.set_optional_bytearray(Some(v.into())); } #[no_mangle] pub extern "C" fn object_optional_bytearray_set_none(ptr: *mut Object) { let o = unsafe { &mut *ptr }; o.set_optional_bytearray(None); } #[no_mangle] pub extern "C" fn object_optional_string_get( ptr: *const Object, p: *mut QString, set: fn(*mut QString, *const c_char, c_int), ) { let o = unsafe { &*ptr }; let v = o.optional_string(); if let Some(v) = v { let s: *const c_char = v.as_ptr() as (*const c_char); - set(p, s, v.len() as c_int); + set(p, s, to_c_int(v.len())); } } #[no_mangle] pub extern "C" fn object_optional_string_set(ptr: *mut Object, v: *const c_ushort, len: c_int) { let o = unsafe { &mut *ptr }; let mut s = String::new(); set_string_from_utf16(&mut s, v, len); o.set_optional_string(Some(s)); } #[no_mangle] pub extern "C" fn object_optional_string_set_none(ptr: *mut Object) { let o = unsafe { &mut *ptr }; o.set_optional_string(None); } #[no_mangle] pub unsafe extern "C" fn object_optional_u64_get(ptr: *const Object) -> COption { match (&*ptr).optional_u64() { Some(value) => COption { data: value, some: true }, None => COption { data: u64::default(), some: false} } } #[no_mangle] pub unsafe extern "C" fn object_optional_u64_set(ptr: *mut Object, v: u64) { (&mut *ptr).set_optional_u64(Some(v)); } #[no_mangle] pub extern "C" fn object_optional_u64_set_none(ptr: *mut Object) { let o = unsafe { &mut *ptr }; o.set_optional_u64(None); } #[no_mangle] pub extern "C" fn object_string_get( ptr: *const Object, p: *mut QString, set: fn(*mut QString, *const c_char, c_int), ) { let o = unsafe { &*ptr }; let v = o.string(); let s: *const c_char = v.as_ptr() as (*const c_char); - set(p, s, v.len() as c_int); + set(p, s, to_c_int(v.len())); } #[no_mangle] pub extern "C" fn object_string_set(ptr: *mut Object, v: *const c_ushort, len: c_int) { let o = unsafe { &mut *ptr }; let mut s = String::new(); set_string_from_utf16(&mut s, v, len); o.set_string(s); } #[no_mangle] pub unsafe extern "C" fn object_u16_get(ptr: *const Object) -> u16 { (&*ptr).u16() } #[no_mangle] pub unsafe extern "C" fn object_u16_set(ptr: *mut Object, v: u16) { (&mut *ptr).set_u16(v); } #[no_mangle] pub unsafe extern "C" fn object_u32_get(ptr: *const Object) -> u32 { (&*ptr).u32() } #[no_mangle] pub unsafe extern "C" fn object_u32_set(ptr: *mut Object, v: u32) { (&mut *ptr).set_u32(v); } #[no_mangle] pub unsafe extern "C" fn object_u64_get(ptr: *const Object) -> u64 { (&*ptr).u64() } #[no_mangle] pub unsafe extern "C" fn object_u64_set(ptr: *mut Object, v: u64) { (&mut *ptr).set_u64(v); } #[no_mangle] pub unsafe extern "C" fn object_u8_get(ptr: *const Object) -> u8 { (&*ptr).u8() } #[no_mangle] pub unsafe extern "C" fn object_u8_set(ptr: *mut Object, v: u8) { (&mut *ptr).set_u8(v); } diff --git a/tests/rust_objects/src/interface.rs b/tests/rust_objects/src/interface.rs index 7c39126..371ca53 100644 --- a/tests/rust_objects/src/interface.rs +++ b/tests/rust_objects/src/interface.rs @@ -1,201 +1,218 @@ /* generated by rust_qt_binding_generator */ #![allow(unknown_lints)] #![allow(mutex_atomic, needless_pass_by_value)] use libc::{c_char, c_ushort, c_int}; use std::slice; use std::char::decode_utf16; use std::sync::{Arc, Mutex}; use std::ptr::null; use implementation::*; pub enum QString {} fn set_string_from_utf16(s: &mut String, str: *const c_ushort, len: c_int) { - let utf16 = unsafe { slice::from_raw_parts(str, len as usize) }; + let utf16 = unsafe { slice::from_raw_parts(str, to_usize(len)) }; let characters = decode_utf16(utf16.iter().cloned()) .into_iter() .map(|r| r.unwrap()); s.clear(); s.extend(characters); } + +fn to_usize(n: c_int) -> usize { + if n < 0 { + panic!("Cannot cast {} to usize", n); + } + n as usize +} + + +fn to_c_int(n: usize) -> c_int { + if n > c_int::max_value() as usize { + panic!("Cannot cast {} to c_int", n); + } + n as c_int +} + + pub struct GroupQObject {} #[derive(Clone)] pub struct GroupEmitter { qobject: Arc>, } unsafe impl Send for GroupEmitter {} impl GroupEmitter { fn clear(&self) { *self.qobject.lock().unwrap() = null(); } } pub trait GroupTrait { fn new(emit: GroupEmitter, person: Person) -> Self; fn emit(&self) -> &GroupEmitter; fn person(&self) -> &Person; fn person_mut(&mut self) -> &mut Person; } #[no_mangle] pub extern "C" fn group_new( group: *mut GroupQObject, person: *mut PersonQObject, object: *mut InnerObjectQObject, description_changed: fn(*const InnerObjectQObject), ) -> *mut Group { let object_emit = InnerObjectEmitter { qobject: Arc::new(Mutex::new(object)), description_changed: description_changed, }; let d_object = InnerObject::new(object_emit); let person_emit = PersonEmitter { qobject: Arc::new(Mutex::new(person)), }; let d_person = Person::new(person_emit, d_object); let group_emit = GroupEmitter { qobject: Arc::new(Mutex::new(group)), }; let d_group = Group::new(group_emit, d_person); Box::into_raw(Box::new(d_group)) } #[no_mangle] pub unsafe extern "C" fn group_free(ptr: *mut Group) { Box::from_raw(ptr).emit().clear(); } #[no_mangle] pub unsafe extern "C" fn group_person_get(ptr: *mut Group) -> *mut Person { (&mut *ptr).person_mut() } pub struct InnerObjectQObject {} #[derive(Clone)] pub struct InnerObjectEmitter { qobject: Arc>, description_changed: fn(*const InnerObjectQObject), } unsafe impl Send for InnerObjectEmitter {} impl InnerObjectEmitter { fn clear(&self) { *self.qobject.lock().unwrap() = null(); } pub fn description_changed(&self) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.description_changed)(ptr); } } } pub trait InnerObjectTrait { fn new(emit: InnerObjectEmitter) -> Self; fn emit(&self) -> &InnerObjectEmitter; fn description(&self) -> &str; fn set_description(&mut self, value: String); } #[no_mangle] pub extern "C" fn inner_object_new( inner_object: *mut InnerObjectQObject, description_changed: fn(*const InnerObjectQObject), ) -> *mut InnerObject { let inner_object_emit = InnerObjectEmitter { qobject: Arc::new(Mutex::new(inner_object)), description_changed: description_changed, }; let d_inner_object = InnerObject::new(inner_object_emit); Box::into_raw(Box::new(d_inner_object)) } #[no_mangle] pub unsafe extern "C" fn inner_object_free(ptr: *mut InnerObject) { Box::from_raw(ptr).emit().clear(); } #[no_mangle] pub extern "C" fn inner_object_description_get( ptr: *const InnerObject, p: *mut QString, set: fn(*mut QString, *const c_char, c_int), ) { let o = unsafe { &*ptr }; let v = o.description(); let s: *const c_char = v.as_ptr() as (*const c_char); - set(p, s, v.len() as c_int); + set(p, s, to_c_int(v.len())); } #[no_mangle] pub extern "C" fn inner_object_description_set(ptr: *mut InnerObject, v: *const c_ushort, len: c_int) { let o = unsafe { &mut *ptr }; let mut s = String::new(); set_string_from_utf16(&mut s, v, len); o.set_description(s); } pub struct PersonQObject {} #[derive(Clone)] pub struct PersonEmitter { qobject: Arc>, } unsafe impl Send for PersonEmitter {} impl PersonEmitter { fn clear(&self) { *self.qobject.lock().unwrap() = null(); } } pub trait PersonTrait { fn new(emit: PersonEmitter, object: InnerObject) -> Self; fn emit(&self) -> &PersonEmitter; fn object(&self) -> &InnerObject; fn object_mut(&mut self) -> &mut InnerObject; } #[no_mangle] pub extern "C" fn person_new( person: *mut PersonQObject, object: *mut InnerObjectQObject, description_changed: fn(*const InnerObjectQObject), ) -> *mut Person { let object_emit = InnerObjectEmitter { qobject: Arc::new(Mutex::new(object)), description_changed: description_changed, }; let d_object = InnerObject::new(object_emit); let person_emit = PersonEmitter { qobject: Arc::new(Mutex::new(person)), }; let d_person = Person::new(person_emit, d_object); Box::into_raw(Box::new(d_person)) } #[no_mangle] pub unsafe extern "C" fn person_free(ptr: *mut Person) { Box::from_raw(ptr).emit().clear(); } #[no_mangle] pub unsafe extern "C" fn person_object_get(ptr: *mut Person) -> *mut InnerObject { (&mut *ptr).object_mut() } diff --git a/tests/rust_tree/src/interface.rs b/tests/rust_tree/src/interface.rs index 594f00a..afa7b8e 100644 --- a/tests/rust_tree/src/interface.rs +++ b/tests/rust_tree/src/interface.rs @@ -1,266 +1,283 @@ /* generated by rust_qt_binding_generator */ #![allow(unknown_lints)] #![allow(mutex_atomic, needless_pass_by_value)] use libc::{c_char, c_ushort, c_int}; use std::slice; use std::char::decode_utf16; use std::sync::{Arc, Mutex}; use std::ptr::null; use implementation::*; #[repr(C)] pub struct COption { data: T, some: bool, } impl From> for COption where T: Default, { fn from(t: Option) -> COption { if let Some(v) = t { COption { data: v, some: true, } } else { COption { data: T::default(), some: false, } } } } pub enum QString {} fn set_string_from_utf16(s: &mut String, str: *const c_ushort, len: c_int) { - let utf16 = unsafe { slice::from_raw_parts(str, len as usize) }; + let utf16 = unsafe { slice::from_raw_parts(str, to_usize(len)) }; let characters = decode_utf16(utf16.iter().cloned()) .into_iter() .map(|r| r.unwrap()); s.clear(); s.extend(characters); } #[repr(C)] pub enum SortOrder { Ascending = 0, Descending = 1, } #[repr(C)] pub struct QModelIndex { row: c_int, internal_id: usize, } + +fn to_usize(n: c_int) -> usize { + if n < 0 { + panic!("Cannot cast {} to usize", n); + } + n as usize +} + + +fn to_c_int(n: usize) -> c_int { + if n > c_int::max_value() as usize { + panic!("Cannot cast {} to c_int", n); + } + n as c_int +} + + pub struct PersonsQObject {} #[derive(Clone)] pub struct PersonsEmitter { qobject: Arc>, new_data_ready: fn(*const PersonsQObject, item: usize, valid: bool), } unsafe impl Send for PersonsEmitter {} impl PersonsEmitter { fn clear(&self) { *self.qobject.lock().unwrap() = null(); } pub fn new_data_ready(&self, item: Option) { let ptr = *self.qobject.lock().unwrap(); if !ptr.is_null() { (self.new_data_ready)(ptr, item.unwrap_or(13), item.is_some()); } } } pub struct PersonsTree { qobject: *const PersonsQObject, data_changed: fn(*const PersonsQObject, usize, usize), begin_reset_model: fn(*const PersonsQObject), end_reset_model: fn(*const PersonsQObject), begin_insert_rows: fn(*const PersonsQObject, item: usize, valid: bool, usize, usize), end_insert_rows: fn(*const PersonsQObject), begin_remove_rows: fn(*const PersonsQObject, item: usize, valid: bool, usize, usize), end_remove_rows: fn(*const PersonsQObject), } impl PersonsTree { pub fn data_changed(&self, first: usize, last: usize) { (self.data_changed)(self.qobject, first, last); } pub fn begin_reset_model(&self) { (self.begin_reset_model)(self.qobject); } pub fn end_reset_model(&self) { (self.end_reset_model)(self.qobject); } pub fn begin_insert_rows(&self, item: Option, first: usize, last: usize) { (self.begin_insert_rows)(self.qobject, item.unwrap_or(13), item.is_some(), first, last); } pub fn end_insert_rows(&self) { (self.end_insert_rows)(self.qobject); } pub fn begin_remove_rows(&self, item: Option, first: usize, last: usize) { (self.begin_remove_rows)(self.qobject, item.unwrap_or(13), item.is_some(), first, last); } pub fn end_remove_rows(&self) { (self.end_remove_rows)(self.qobject); } } pub trait PersonsTrait { fn new(emit: PersonsEmitter, model: PersonsTree) -> Self; fn emit(&self) -> &PersonsEmitter; fn row_count(&self, Option) -> usize; fn can_fetch_more(&self, Option) -> bool { false } fn fetch_more(&mut self, Option) {} fn sort(&mut self, u8, SortOrder) {} fn index(&self, item: Option, row: usize) -> usize; fn parent(&self, item: usize) -> Option; fn row(&self, item: usize) -> usize; fn user_name(&self, item: usize) -> &str; fn set_user_name(&mut self, item: usize, String) -> bool; } #[no_mangle] pub extern "C" fn persons_new( persons: *mut PersonsQObject, persons_new_data_ready: fn(*const PersonsQObject, item: usize, valid: bool), persons_data_changed: fn(*const PersonsQObject, usize, usize), persons_begin_reset_model: fn(*const PersonsQObject), persons_end_reset_model: fn(*const PersonsQObject), persons_begin_insert_rows: fn(*const PersonsQObject, item: usize, valid: bool, usize, usize), persons_end_insert_rows: fn(*const PersonsQObject), persons_begin_remove_rows: fn(*const PersonsQObject, item: usize, valid: bool, usize, usize), persons_end_remove_rows: fn(*const PersonsQObject), ) -> *mut Persons { let persons_emit = PersonsEmitter { qobject: Arc::new(Mutex::new(persons)), new_data_ready: persons_new_data_ready, }; let model = PersonsTree { qobject: persons, data_changed: persons_data_changed, begin_reset_model: persons_begin_reset_model, end_reset_model: persons_end_reset_model, begin_insert_rows: persons_begin_insert_rows, end_insert_rows: persons_end_insert_rows, begin_remove_rows: persons_begin_remove_rows, end_remove_rows: persons_end_remove_rows, }; let d_persons = Persons::new(persons_emit, model); Box::into_raw(Box::new(d_persons)) } #[no_mangle] pub unsafe extern "C" fn persons_free(ptr: *mut Persons) { Box::from_raw(ptr).emit().clear(); } #[no_mangle] pub unsafe extern "C" fn persons_row_count( ptr: *const Persons, item: usize, valid: bool, ) -> c_int { - if valid { - (&*ptr).row_count(Some(item)) as c_int + to_c_int(if valid { + (&*ptr).row_count(Some(item)) } else { - (&*ptr).row_count(None) as c_int - } + (&*ptr).row_count(None) + }) } #[no_mangle] pub unsafe extern "C" fn persons_can_fetch_more( ptr: *const Persons, item: usize, valid: bool, ) -> bool { if valid { (&*ptr).can_fetch_more(Some(item)) } else { (&*ptr).can_fetch_more(None) } } #[no_mangle] pub unsafe extern "C" fn persons_fetch_more(ptr: *mut Persons, item: usize, valid: bool) { if valid { (&mut *ptr).fetch_more(Some(item)) } else { (&mut *ptr).fetch_more(None) } } #[no_mangle] pub unsafe extern "C" fn persons_sort( ptr: *mut Persons, column: u8, order: SortOrder ) { (&mut *ptr).sort(column, order) } #[no_mangle] pub unsafe extern "C" fn persons_index( ptr: *const Persons, item: usize, valid: bool, row: c_int, ) -> usize { if !valid { - (&*ptr).index(None, row as usize) + (&*ptr).index(None, to_usize(row)) } else { - (&*ptr).index(Some(item), row as usize) + (&*ptr).index(Some(item), to_usize(row)) } } #[no_mangle] pub unsafe extern "C" fn persons_parent(ptr: *const Persons, index: usize) -> QModelIndex { if let Some(parent) = (&*ptr).parent(index) { QModelIndex { - row: (&*ptr).row(parent) as c_int, + row: to_c_int((&*ptr).row(parent)), internal_id: parent, } } else { QModelIndex { row: -1, internal_id: 0, } } } #[no_mangle] pub unsafe extern "C" fn persons_row(ptr: *const Persons, item: usize) -> c_int { - (&*ptr).row(item) as c_int + to_c_int((&*ptr).row(item)) } #[no_mangle] pub extern "C" fn persons_data_user_name( ptr: *const Persons, item: usize, d: *mut QString, set: fn(*mut QString, *const c_char, len: c_int), ) { let o = unsafe { &*ptr }; let data = o.user_name(item); let s: *const c_char = data.as_ptr() as (*const c_char); - set(d, s, data.len() as c_int); + set(d, s, to_c_int(data.len())); } #[no_mangle] pub extern "C" fn persons_set_data_user_name( ptr: *mut Persons, item: usize, s: *const c_ushort, len: c_int, ) -> bool { let o = unsafe { &mut *ptr }; let mut v = String::new(); set_string_from_utf16(&mut v, s, len); o.set_user_name(item, v) }