Sort out const attribute generation

Author: twistedfall

binding-generator/src/return_type_wrapper.rs

@@ -15,19 +15,28 @@ pub enum DefinitionLocation {
 #[derive(Debug)]
 pub struct ReturnTypeWrapper<'tu> {
 	type_ref: TypeRef<'tu>,
-	gen_env: &'tu GeneratorEnv<'tu>,
+	const_hint: Option<bool>,
 	definition_location: DefinitionLocation,
+	gen_env: &'tu GeneratorEnv<'tu>,
 }
 
 impl<'tu> ReturnTypeWrapper<'tu> {
-	pub fn new(type_ref: TypeRef<'tu>, gen_env: &'tu GeneratorEnv<'tu>, definition_location: DefinitionLocation) -> Self {
-		Self { type_ref, gen_env, definition_location }
+	pub fn new(type_ref: TypeRef<'tu>, definition_location: DefinitionLocation, gen_env: &'tu GeneratorEnv<'tu>) -> Self {
+		Self::new_ext(type_ref, None, definition_location, gen_env)
+	}
+
+	pub fn new_ext(type_ref: TypeRef<'tu>, const_hint: Option<bool>, definition_location: DefinitionLocation, gen_env: &'tu GeneratorEnv<'tu>) -> Self {
+		Self { type_ref, const_hint, definition_location, gen_env }
 	}
 
 	pub fn type_ref(&self) -> &TypeRef<'tu> {
 		&self.type_ref
 	}
 
+	pub fn const_hint(&self) -> Option<bool> {
+		self.const_hint
+	}
+
 	pub fn definition_location(&self) -> Cow<str> {
 		match &self.definition_location {
 			DefinitionLocation::Module => {

binding-generator/src/settings.rs

@@ -15,22 +15,22 @@ pub static FUNC_RENAME: Lazy<HashMap<&str, &str>> = Lazy::new(|| hashmap! {
 	"cv_aruco_getPredefinedDictionary_int" => "+_i32",
 
 	// ### bioinspired ###
-	"cv_bioinspired_Retina_create_Size_bool_int_bool_float_float" => "+_ext",
+	"cv_bioinspired_Retina_create_Size_const_bool_int_const_bool_const_float_const_float" => "+_ext",
 	"cv_bioinspired_Retina_getMagnoRAW_const__OutputArrayR" => "+_to",
 	"cv_bioinspired_Retina_getParvoRAW_const__OutputArrayR" => "+_to",
-	"cv_bioinspired_Retina_setup_FileStorageR_bool" => "+_from_storage",
-	"cv_bioinspired_Retina_setup_String_bool" => "+_from_file",
+	"cv_bioinspired_Retina_setup_FileStorageR_const_bool" => "+_from_storage",
+	"cv_bioinspired_Retina_setup_String_const_bool" => "+_from_file",
 	"cv_bioinspired_Retina_write_const_FileStorageR" => "+_to_storage",
-	"cv_bioinspired_TransientAreasSegmentationModule_setup_FileStorageR_bool" => "+_from_storage",
-	"cv_bioinspired_TransientAreasSegmentationModule_setup_String_bool" => "+_from_file",
+	"cv_bioinspired_TransientAreasSegmentationModule_setup_FileStorageR_const_bool" => "+_from_storage",
+	"cv_bioinspired_TransientAreasSegmentationModule_setup_String_const_bool" => "+_from_file",
 	"cv_bioinspired_TransientAreasSegmentationModule_write_const_FileStorageR" => "+_to_storage",
-	"cv_bioinspired_createRetina_OCL_Size_bool_int_bool_float_float" => "+_ext", // 3.2 only
+	"cv_bioinspired_createRetina_OCL_Size_const_bool_int_const_bool_const_float_const_float" => "+_ext", // 3.2 only
 
 	// ### calib3d ###
 	"cv_LMSolver_create_const_Ptr_Callback_R_int_double" => "+_ext",
 	"cv_findEssentialMat_const__InputArrayR_const__InputArrayR_const__InputArrayR_int_double_double_const__OutputArrayR" => "+_matrix",
 	"cv_findFundamentalMat_const__InputArrayR_const__InputArrayR_const__OutputArrayR_int_double_double" => "+_mask",
-	"cv_findHomography_const__InputArrayR_const__InputArrayR_int_double_const__OutputArrayR_int_double" => "+_ext",
+	"cv_findHomography_const__InputArrayR_const__InputArrayR_int_double_const__OutputArrayR_const_int_const_double" => "+_ext",
 	"cv_fisheye_initUndistortRectifyMap_const__InputArrayR_const__InputArrayR_const__InputArrayR_const__InputArrayR_const_SizeR_int_const__OutputArrayR_const__OutputArrayR" => "fisheye_+",
 	"cv_fisheye_projectPoints_const__InputArrayR_const__OutputArrayR_const_Affine3dR_const__InputArrayR_const__InputArrayR_double_const__OutputArrayR" => "fisheye_+",
 	"cv_fisheye_projectPoints_const__InputArrayR_const__OutputArrayR_const__InputArrayR_const__InputArrayR_const__InputArrayR_const__InputArrayR_double_const__OutputArrayR" => "fisheye_+_vec",
@@ -211,7 +211,7 @@ pub static FUNC_RENAME: Lazy<HashMap<&str, &str>> = Lazy::new(|| hashmap! {
 	"cv_cuda_GpuMat_GpuMat_int_int_int_voidX_size_t" => "+_rows_cols_with_data",
 	"cv_cuda_GpuMat_download_const_const__OutputArrayR_StreamR" => "+_async",
 	"cv_cuda_GpuMat_upload_const__InputArrayR_StreamR" => "+_async",
-	"cv_directx_getTypeFromD3DFORMAT_int" => "get_type_from_d3d_format",
+	"cv_directx_getTypeFromD3DFORMAT_const_int" => "get_type_from_d3d_format",
 	"cv_divide_const__InputArrayR_const__InputArrayR_const__OutputArrayR_double_int" => "+2",
 	"cv_getNumberOfCPUs" => "get_number_of_cpus",
 	"cv_hconcat_const__InputArrayR_const__InputArrayR_const__OutputArrayR" => "+2",
@@ -349,12 +349,12 @@ pub static FUNC_RENAME: Lazy<HashMap<&str, &str>> = Lazy::new(|| hashmap! {
 	"cv_dnn_Layer_finalize_const_vector_Mat_R" => "+_mat",
 	"cv_dnn_Layer_finalize_const_vector_Mat_R_vector_Mat_R" => "+_mat_to",
 	"cv_dnn_Layer_forward_vector_MatX_R_vector_Mat_R_vector_Mat_R" => "+_mat",
-	"cv_dnn_NMSBoxes_const_vector_Rect2d_R_const_vector_float_R_float_float_vector_int_R_float_int" => "+_f64",
+	"cv_dnn_NMSBoxes_const_vector_Rect2d_R_const_vector_float_R_const_float_const_float_vector_int_R_const_float_const_int" => "+_f64",
 	"cv_dnn_Net_connect_String_String" => "+_first_second",
 	"cv_dnn_Net_forward_const_StringR" => "+_single",
 	"cv_dnn_Net_forward_const__OutputArrayR_const_StringR" => "+_layer",
 	"cv_dnn_Net_getMemoryConsumption_const_const_vector_MatShape_R_vector_int_R_vector_size_t_R_vector_size_t_R" => "+_for_layers",
-	"cv_dnn_Net_getMemoryConsumption_const_int_const_vector_MatShape_R_size_tR_size_tR" => "+_for_layer",
+	"cv_dnn_Net_getMemoryConsumption_const_const_int_const_vector_MatShape_R_size_tR_size_tR" => "+_for_layer",
 	"cv_dnn_blobFromImage_const__InputArrayR_const__OutputArrayR_double_const_SizeR_const_ScalarR_bool_bool_int" => "+_to",
 	"cv_dnn_blobFromImages_const__InputArrayR_const__OutputArrayR_double_Size_const_ScalarR_bool_bool_int" => "+_to",
 	"cv_dnn_readNetFromCaffe_const_charX_size_t_const_charX_size_t" => "+_str",
@@ -746,10 +746,10 @@ pub static FUNC_MANUAL: Lazy<HashMap<&str, CompiledInterpolation>> = Lazy::new(|
 
 pub static FUNC_SPECIALIZE: Lazy<HashMap<&str, Vec<HashMap<&str, &str>>>> = Lazy::new(|| hashmap! {
 	"cv_dnn_Dict_set_const_StringR_const_TR" => vec![
-		hashmap! { "T" => "cv::String" },
-		hashmap! { "T" => "cv::dnn::DictValue" },
-		hashmap! { "T" => "double" },
-		hashmap! { "T" => "int64_t" },
+		hashmap! { "const T" => "cv::String" },
+		hashmap! { "const T" => "cv::dnn::DictValue" },
+		hashmap! { "const T" => "double" },
+		hashmap! { "const T" => "int64_t" },
 	],
 	"cv_dnn_DictValue_get_const_int" => vec![
 		hashmap! { "T" => "cv::String" },

binding-generator/src/smart_ptr.rs

@@ -7,12 +7,10 @@ use clang::Entity;
 
 use crate::{
 	DefaultElement,
-	DefinitionLocation,
 	DependentType,
 	Element,
 	EntityElement,
 	GeneratorEnv,
-	ReturnTypeWrapper,
 	type_ref::TemplateArg,
 	TypeRef,
 };
@@ -42,18 +40,15 @@ impl<'tu> SmartPtr<'tu> {
 	}
 
 	pub fn dependent_types<D: DependentType<'tu>>(&self) -> Vec<D> {
-		let canon = self.type_ref().canonical_clang();
-		let mut out = vec![
-			D::from_return_type_wrapper(ReturnTypeWrapper::new(canon.clone(), self.gen_env, DefinitionLocation::Module))
-		];
 		if self.pointee().as_typedef().is_some() {
-			out.extend(canon.dependent_types())
+			self.type_ref().canonical_clang().dependent_types()
+		} else {
+			vec![]
 		}
-		out
 	}
 
 	pub fn rust_localalias(&self) -> Cow<str> {
-		format!("PtrOf{typ}", typ=self.pointee().rust_safe_id()).into()
+		format!("PtrOf{typ}", typ=self.pointee().rust_safe_id_ext(false)).into()
 	}
 
 	pub fn rust_fullalias(&self) -> Cow<str> {