Skip to content

Commit

Permalink
Merge pull request #46 from EPashkin/regen
Browse files Browse the repository at this point in the history 
Regen
  • Loading branch information
@antoyo
antoyo committed Jan 24, 2019
2 parents 5937d58 + 3effd20 commit f8cf9de
Show file tree
Hide file tree
Showing 16 changed files with 333 additions and 242 deletions.
2 changes: 1 addition & 1 deletion gir
Submodule gir updated 27 files
+4 −2 README.md
+71 −6 src/analysis/bounds.rs
+1 −1 src/analysis/child_properties.rs
+1 −0 src/analysis/conversion_type.rs
+3 −4 src/analysis/ffi_type.rs
+15 −6 src/analysis/function_parameters.rs
+450 −41 src/analysis/functions.rs
+11 −37 src/analysis/object.rs
+14 −10 src/analysis/out_parameters.rs
+4 −4 src/analysis/properties.rs
+94 −6 src/analysis/rust_type.rs
+15 −2 src/analysis/trampolines.rs
+5 −0 src/chunk/chunk.rs
+65 −30 src/codegen/function.rs
+414 −22 src/codegen/function_body_chunk.rs
+13 −4 src/codegen/object.rs
+1 −1 src/codegen/properties.rs
+1 −3 src/codegen/sys/ffi_type.rs
+1 −1 src/codegen/trampoline_from_glib.rs
+12 −4 src/config/gobjects.rs
+9 −0 src/config/work_mode.rs
+90 −0 src/library.rs
+61 −1 src/library_postprocessing.rs
+1 −1 src/main.rs
+12 −0 src/nameutil.rs
+1 −0 src/parser.rs
+21 −7 src/writer/to_code.rs
4 changes: 2 additions & 2 deletions src/auto/context_menu_item.rs
View file
Expand Up @@ -19,12 +19,12 @@ glib_wrapper! {

impl ContextMenuItem {
//#[cfg_attr(feature = "v2_18", deprecated)]
//pub fn new<P: IsA</*Ignored*/gtk::Action>>(action: &P) -> ContextMenuItem {
//pub fn new(action: /*Ignored*/&gtk::Action) -> ContextMenuItem {
// unsafe { TODO: call ffi::webkit_context_menu_item_new() }
//}

//#[cfg(any(feature = "v2_18", feature = "dox"))]
//pub fn new_from_gaction<'a, P: IsA</*Ignored*/gio::Action>, Q: Into<Option<&'a glib::Variant>>>(action: &P, label: &str, target: Q) -> ContextMenuItem {
//pub fn new_from_gaction<'a, P: Into<Option<&'a glib::Variant>>>(action: /*Ignored*/&gio::Action, label: &str, target: P) -> ContextMenuItem {
// unsafe { TODO: call ffi::webkit_context_menu_item_new_from_gaction() }
//}

Expand Down
6 changes: 2 additions & 4 deletions src/auto/cookie_manager.rs
View file
Expand Up @@ -156,8 +156,7 @@ impl<O: IsA<CookieManager>> CookieManagerExt for O {
fn get_accept_policy<'a, P: IsA<gio::Cancellable> + 'a, Q: Into<Option<&'a P>>, R: FnOnce(Result<CookieAcceptPolicy, Error>) + Send + 'static>(&self, cancellable: Q, callback: R) {
let cancellable = cancellable.into();
let user_data: Box<Box<R>> = Box::new(Box::new(callback));
unsafe extern "C" fn get_accept_policy_trampoline<R: FnOnce(Result<CookieAcceptPolicy, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer)
{
unsafe extern "C" fn get_accept_policy_trampoline<R: FnOnce(Result<CookieAcceptPolicy, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer) {
let mut error = ptr::null_mut();
let ret = ffi::webkit_cookie_manager_get_accept_policy_finish(_source_object as *mut _, res, &mut error);
let result = if error.is_null() { Ok(from_glib(ret)) } else { Err(from_glib_full(error)) };
Expand Down Expand Up @@ -225,8 +224,7 @@ impl<O: IsA<CookieManager>> CookieManagerExt for O {
fn get_domains_with_cookies<'a, P: IsA<gio::Cancellable> + 'a, Q: Into<Option<&'a P>>, R: FnOnce(Result<Vec<GString>, Error>) + Send + 'static>(&self, cancellable: Q, callback: R) {
let cancellable = cancellable.into();
let user_data: Box<Box<R>> = Box::new(Box::new(callback));
unsafe extern "C" fn get_domains_with_cookies_trampoline<R: FnOnce(Result<Vec<GString>, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer)
{
unsafe extern "C" fn get_domains_with_cookies_trampoline<R: FnOnce(Result<Vec<GString>, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer) {
let mut error = ptr::null_mut();
let ret = ffi::webkit_cookie_manager_get_domains_with_cookies_finish(_source_object as *mut _, res, &mut error);
let result = if error.is_null() { Ok(FromGlibPtrContainer::from_glib_full(ret)) } else { Err(from_glib_full(error)) };
Expand Down
3 changes: 1 addition & 2 deletions src/auto/favicon_database.rs
View file
Expand Up @@ -56,8 +56,7 @@ impl<O: IsA<FaviconDatabase>> FaviconDatabaseExt for O {
fn get_favicon<'a, P: IsA<gio::Cancellable> + 'a, Q: Into<Option<&'a P>>, R: FnOnce(Result<cairo::Surface, Error>) + Send + 'static>(&self, page_uri: &str, cancellable: Q, callback: R) {
let cancellable = cancellable.into();
let user_data: Box<Box<R>> = Box::new(Box::new(callback));
unsafe extern "C" fn get_favicon_trampoline<R: FnOnce(Result<cairo::Surface, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer)
{
unsafe extern "C" fn get_favicon_trampoline<R: FnOnce(Result<cairo::Surface, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer) {
let mut error = ptr::null_mut();
let ret = ffi::webkit_favicon_database_get_favicon_finish(_source_object as *mut _, res, &mut error);
let result = if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) };
Expand Down
12 changes: 6 additions & 6 deletions src/auto/print_operation.rs
View file
Expand Up @@ -50,9 +50,9 @@ pub trait PrintOperationExt: 'static {

fn run_dialog<'a, P: IsA<gtk::Window> + 'a, Q: Into<Option<&'a P>>>(&self, parent: Q) -> PrintOperationResponse;

fn set_page_setup<P: IsA<gtk::PageSetup>>(&self, page_setup: &P);
fn set_page_setup(&self, page_setup: &gtk::PageSetup);

fn set_print_settings<P: IsA<gtk::PrintSettings>>(&self, print_settings: &P);
fn set_print_settings(&self, print_settings: &gtk::PrintSettings);

fn get_property_web_view(&self) -> Option<WebView>;

Expand Down Expand Up @@ -94,15 +94,15 @@ impl<O: IsA<PrintOperation>> PrintOperationExt for O {
}
}

fn set_page_setup<P: IsA<gtk::PageSetup>>(&self, page_setup: &P) {
fn set_page_setup(&self, page_setup: &gtk::PageSetup) {
unsafe {
ffi::webkit_print_operation_set_page_setup(self.as_ref().to_glib_none().0, page_setup.as_ref().to_glib_none().0);
ffi::webkit_print_operation_set_page_setup(self.as_ref().to_glib_none().0, page_setup.to_glib_none().0);
}
}

fn set_print_settings<P: IsA<gtk::PrintSettings>>(&self, print_settings: &P) {
fn set_print_settings(&self, print_settings: &gtk::PrintSettings) {
unsafe {
ffi::webkit_print_operation_set_print_settings(self.as_ref().to_glib_none().0, print_settings.as_ref().to_glib_none().0);
ffi::webkit_print_operation_set_print_settings(self.as_ref().to_glib_none().0, print_settings.to_glib_none().0);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/auto/uri_scheme_request.rs
View file
Expand Up @@ -22,7 +22,7 @@ glib_wrapper! {
pub const NONE_URI_SCHEME_REQUEST: Option<&URISchemeRequest> = None;

pub trait URISchemeRequestExt: 'static {
//fn finish<'a, P: IsA</*Ignored*/gio::InputStream>, Q: Into<Option<&'a str>>>(&self, stream: &P, stream_length: i64, mime_type: Q);
//fn finish<'a, P: Into<Option<&'a str>>>(&self, stream: /*Ignored*/&gio::InputStream, stream_length: i64, mime_type: P);

#[cfg(any(feature = "v2_2", feature = "dox"))]
fn finish_error(&self, error: &mut Error);
Expand All @@ -37,7 +37,7 @@ pub trait URISchemeRequestExt: 'static {
}

impl<O: IsA<URISchemeRequest>> URISchemeRequestExt for O {
//fn finish<'a, P: IsA</*Ignored*/gio::InputStream>, Q: Into<Option<&'a str>>>(&self, stream: &P, stream_length: i64, mime_type: Q) {
//fn finish<'a, P: Into<Option<&'a str>>>(&self, stream: /*Ignored*/&gio::InputStream, stream_length: i64, mime_type: P) {
// unsafe { TODO: call ffi::webkit_uri_scheme_request_finish() }
//}

Expand Down
2 changes: 1 addition & 1 deletion src/auto/versions.txt
View file
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 2f0a317)
Generated by gir (https://github.com/gtk-rs/gir @ beae3da)
from gir-files (https://github.com/gtk-rs/gir-files @ 62f3bf0)
30 changes: 24 additions & 6 deletions src/auto/web_context.rs
View file
Expand Up @@ -14,6 +14,7 @@ use SecurityManager;
#[cfg(any(feature = "v2_16", feature = "dox"))]
use SecurityOrigin;
use TLSErrorsPolicy;
use URISchemeRequest;
#[cfg(any(feature = "v2_10", feature = "dox"))]
use WebsiteDataManager;
use ffi;
Expand Down Expand Up @@ -139,7 +140,7 @@ pub trait WebContextExt: 'static {

fn prefetch_dns(&self, hostname: &str);

//fn register_uri_scheme(&self, scheme: &str, callback: /*Unknown conversion*//*Unimplemented*/URISchemeRequestCallback, user_data_destroy_func: /*Unknown conversion*//*Unimplemented*/DestroyNotify);
fn register_uri_scheme<P: Fn(&URISchemeRequest) + 'static>(&self, scheme: &str, callback: P);

fn set_additional_plugins_directory(&self, directory: &str);

Expand Down Expand Up @@ -235,8 +236,7 @@ impl<O: IsA<WebContext>> WebContextExt for O {
fn get_plugins<'a, P: IsA<gio::Cancellable> + 'a, Q: Into<Option<&'a P>>, R: FnOnce(Result<Vec<Plugin>, Error>) + Send + 'static>(&self, cancellable: Q, callback: R) {
let cancellable = cancellable.into();
let user_data: Box<Box<R>> = Box::new(Box::new(callback));
unsafe extern "C" fn get_plugins_trampoline<R: FnOnce(Result<Vec<Plugin>, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer)
{
unsafe extern "C" fn get_plugins_trampoline<R: FnOnce(Result<Vec<Plugin>, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer) {
let mut error = ptr::null_mut();
let ret = ffi::webkit_web_context_get_plugins_finish(_source_object as *mut _, res, &mut error);
let result = if error.is_null() { Ok(FromGlibPtrContainer::from_glib_full(ret)) } else { Err(from_glib_full(error)) };
Expand Down Expand Up @@ -343,9 +343,27 @@ impl<O: IsA<WebContext>> WebContextExt for O {
}
}

//fn register_uri_scheme(&self, scheme: &str, callback: /*Unknown conversion*//*Unimplemented*/URISchemeRequestCallback, user_data_destroy_func: /*Unknown conversion*//*Unimplemented*/DestroyNotify) {
// unsafe { TODO: call ffi::webkit_web_context_register_uri_scheme() }
//}
fn register_uri_scheme<P: Fn(&URISchemeRequest) + 'static>(&self, scheme: &str, callback: P) {
let callback_data: Box_<Option<P>> = Box::new(callback.into());
unsafe extern "C" fn callback_func<P: Fn(&URISchemeRequest) + 'static>(request: *mut ffi::WebKitURISchemeRequest, user_data: glib_ffi::gpointer) {
let request = from_glib_borrow(request);
let callback: &Box_<Option<P>> = &*(user_data as *mut _);
if let Some(ref callback) = **callback {
callback(&request)
} else {
panic!("cannot get closure...")
};
}
let callback = if callback_data.is_some() { Some(callback_func::<P> as _) } else { None };
unsafe extern "C" fn user_data_destroy_func_func<P: Fn(&URISchemeRequest) + 'static>(data: glib_ffi::gpointer) {
let _callback: Box_<Option<P>> = Box_::from_raw(data as *mut _);
}
let destroy_call4 = Some(user_data_destroy_func_func::<P> as _);
let super_callback0: Box_<Option<P>> = callback_data;
unsafe {
ffi::webkit_web_context_register_uri_scheme(self.as_ref().to_glib_none().0, scheme.to_glib_none().0, callback, Box::into_raw(super_callback0) as *mut _, destroy_call4);
}
}

fn set_additional_plugins_directory(&self, directory: &str) {
unsafe {
Expand Down
6 changes: 3 additions & 3 deletions src/auto/web_resource.rs
View file
Expand Up @@ -20,6 +20,7 @@ use glib_ffi;
use gobject_ffi;
use std::boxed::Box as Box_;
use std::fmt;
use std::mem;
use std::mem::transmute;
use std::ptr;

Expand Down Expand Up @@ -63,10 +64,9 @@ impl<O: IsA<WebResource>> WebResourceExt for O {
fn get_data<'a, P: IsA<gio::Cancellable> + 'a, Q: Into<Option<&'a P>>, R: FnOnce(Result<(Vec<u8>, usize), Error>) + Send + 'static>(&self, cancellable: Q, callback: R) {
let cancellable = cancellable.into();
let user_data: Box<Box<R>> = Box::new(Box::new(callback));
unsafe extern "C" fn get_data_trampoline<R: FnOnce(Result<(Vec<u8>, usize), Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer)
{
unsafe extern "C" fn get_data_trampoline<R: FnOnce(Result<(Vec<u8>, usize), Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer) {
let mut error = ptr::null_mut();
let mut length = ::std::mem::uninitialized();
let mut length = mem::uninitialized();
let ret = ffi::webkit_web_resource_get_data_finish(_source_object as *mut _, res, &mut length, &mut error);
let result = if error.is_null() { Ok((FromGlibContainer::from_glib_full_num(ret, length as usize), length)) } else { Err(from_glib_full(error)) };
let callback: Box<Box<R>> = Box::from_raw(user_data as *mut _);
Expand Down
20 changes: 8 additions & 12 deletions src/auto/web_view.rs
View file
Expand Up @@ -256,10 +256,10 @@ pub trait WebViewExt: 'static {
//#[cfg(feature = "futures")]
//fn save_future(&self, save_mode: SaveMode) -> Box_<futures_core::Future<Item = (Self, /*Ignored*/gio::InputStream), Error = (Self, Error)>> where Self: Sized + Clone;

//fn save_to_file<'a, P: IsA</*Ignored*/gio::File>, Q: IsA<gio::Cancellable> + 'a, R: Into<Option<&'a Q>>, S: FnOnce(Result<(), Error>) + Send + 'static>(&self, file: &P, save_mode: SaveMode, cancellable: R, callback: S);
//fn save_to_file<'a, P: IsA<gio::Cancellable> + 'a, Q: Into<Option<&'a P>>, R: FnOnce(Result<(), Error>) + Send + 'static>(&self, file: /*Ignored*/&gio::File, save_mode: SaveMode, cancellable: Q, callback: R);

//#[cfg(feature = "futures")]
//fn save_to_file_future<P: IsA</*Ignored*/gio::File> + Clone + 'static>(&self, file: &P, save_mode: SaveMode) -> Box_<futures_core::Future<Item = (Self, ()), Error = (Self, Error)>> where Self: Sized + Clone;
//fn save_to_file_future(&self, file: /*Ignored*/&gio::File, save_mode: SaveMode) -> Box_<futures_core::Future<Item = (Self, ()), Error = (Self, Error)>> where Self: Sized + Clone;

#[cfg(any(feature = "v2_8", feature = "dox"))]
fn set_background_color(&self, rgba: &gdk::RGBA);
Expand Down Expand Up @@ -380,8 +380,7 @@ impl<O: IsA<WebView>> WebViewExt for O {
fn can_execute_editing_command<'a, P: IsA<gio::Cancellable> + 'a, Q: Into<Option<&'a P>>, R: FnOnce(Result<(), Error>) + Send + 'static>(&self, command: &str, cancellable: Q, callback: R) {
let cancellable = cancellable.into();
let user_data: Box<Box<R>> = Box::new(Box::new(callback));
unsafe extern "C" fn can_execute_editing_command_trampoline<R: FnOnce(Result<(), Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer)
{
unsafe extern "C" fn can_execute_editing_command_trampoline<R: FnOnce(Result<(), Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer) {
let mut error = ptr::null_mut();
let _ = ffi::webkit_web_view_can_execute_editing_command_finish(_source_object as *mut _, res, &mut error);
let result = if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) };
Expand Down Expand Up @@ -547,8 +546,7 @@ impl<O: IsA<WebView>> WebViewExt for O {
fn get_snapshot<'a, P: IsA<gio::Cancellable> + 'a, Q: Into<Option<&'a P>>, R: FnOnce(Result<cairo::Surface, Error>) + Send + 'static>(&self, region: SnapshotRegion, options: SnapshotOptions, cancellable: Q, callback: R) {
let cancellable = cancellable.into();
let user_data: Box<Box<R>> = Box::new(Box::new(callback));
unsafe extern "C" fn get_snapshot_trampoline<R: FnOnce(Result<cairo::Surface, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer)
{
unsafe extern "C" fn get_snapshot_trampoline<R: FnOnce(Result<cairo::Surface, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer) {
let mut error = ptr::null_mut();
let ret = ffi::webkit_web_view_get_snapshot_finish(_source_object as *mut _, res, &mut error);
let result = if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) };
Expand Down Expand Up @@ -747,8 +745,7 @@ impl<O: IsA<WebView>> WebViewExt for O {
fn run_javascript<'a, P: IsA<gio::Cancellable> + 'a, Q: Into<Option<&'a P>>, R: FnOnce(Result<JavascriptResult, Error>) + Send + 'static>(&self, script: &str, cancellable: Q, callback: R) {
let cancellable = cancellable.into();
let user_data: Box<Box<R>> = Box::new(Box::new(callback));
unsafe extern "C" fn run_javascript_trampoline<R: FnOnce(Result<JavascriptResult, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer)
{
unsafe extern "C" fn run_javascript_trampoline<R: FnOnce(Result<JavascriptResult, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer) {
let mut error = ptr::null_mut();
let ret = ffi::webkit_web_view_run_javascript_finish(_source_object as *mut _, res, &mut error);
let result = if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) };
Expand Down Expand Up @@ -788,8 +785,7 @@ impl<O: IsA<WebView>> WebViewExt for O {
fn run_javascript_from_gresource<'a, P: IsA<gio::Cancellable> + 'a, Q: Into<Option<&'a P>>, R: FnOnce(Result<JavascriptResult, Error>) + Send + 'static>(&self, resource: &str, cancellable: Q, callback: R) {
let cancellable = cancellable.into();
let user_data: Box<Box<R>> = Box::new(Box::new(callback));
unsafe extern "C" fn run_javascript_from_gresource_trampoline<R: FnOnce(Result<JavascriptResult, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer)
{
unsafe extern "C" fn run_javascript_from_gresource_trampoline<R: FnOnce(Result<JavascriptResult, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer) {
let mut error = ptr::null_mut();
let ret = ffi::webkit_web_view_run_javascript_from_gresource_finish(_source_object as *mut _, res, &mut error);
let result = if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) };
Expand Down Expand Up @@ -853,12 +849,12 @@ impl<O: IsA<WebView>> WebViewExt for O {
//})
//}

//fn save_to_file<'a, P: IsA</*Ignored*/gio::File>, Q: IsA<gio::Cancellable> + 'a, R: Into<Option<&'a Q>>, S: FnOnce(Result<(), Error>) + Send + 'static>(&self, file: &P, save_mode: SaveMode, cancellable: R, callback: S) {
//fn save_to_file<'a, P: IsA<gio::Cancellable> + 'a, Q: Into<Option<&'a P>>, R: FnOnce(Result<(), Error>) + Send + 'static>(&self, file: /*Ignored*/&gio::File, save_mode: SaveMode, cancellable: Q, callback: R) {
// unsafe { TODO: call ffi::webkit_web_view_save_to_file() }
//}

//#[cfg(feature = "futures")]
//fn save_to_file_future<P: IsA</*Ignored*/gio::File> + Clone + 'static>(&self, file: &P, save_mode: SaveMode) -> Box_<futures_core::Future<Item = (Self, ()), Error = (Self, Error)>> where Self: Sized + Clone {
//fn save_to_file_future(&self, file: /*Ignored*/&gio::File, save_mode: SaveMode) -> Box_<futures_core::Future<Item = (Self, ()), Error = (Self, Error)>> where Self: Sized + Clone {
//use gio::GioFuture;
//use fragile::Fragile;

Expand Down

0 comments on commit f8cf9de

Please sign in to comment.