Copypaste enum analysis and function generation to bitfield

src/analysis/flags.rs

@@ -0,0 +1,117 @@
+use super::{function_parameters::TransformationType, imports::Imports, *};
+use crate::{config::gobjects::GObject, env::Env, nameutil::*, traits::*};
+
+use log::info;
+
+#[derive(Debug, Default)]
+pub struct Info {
+    pub full_name: String,
+    pub type_id: library::TypeId,
+    pub name: String,
+    pub functions: Vec<functions::Info>,
+    pub specials: special_functions::Infos,
+}
+
+impl Info {
+    pub fn type_<'a>(&self, library: &'a library::Library) -> &'a library::Bitfield {
+        let type_ = library
+            .type_(self.type_id)
+            .maybe_ref()
+            .unwrap_or_else(|| panic!("{} is not an flags.", self.full_name));
+        type_
+    }
+}
+
+pub fn new(env: &Env, obj: &GObject, imports: &mut Imports) -> Option<Info> {
+    info!("Analyzing flags {}", obj.name);
+
+    if !obj.status.need_generate() {
+        return None;
+    }
+
+    if !obj
+        .type_id
+        .map_or(false, |tid| tid.ns_id == namespaces::MAIN)
+    {
+        return None;
+    }
+
+    let flags_tid = env.library.find_type(0, &obj.name)?;
+    let type_ = env.type_(flags_tid);
+    let flags: &library::Bitfield = type_.maybe_ref()?;
+
+    let name = split_namespace_name(&obj.name).1;
+
+    // Mark the type as available within the bitfield namespace:
+    imports.add_defined(&format!("crate::{}", name));
+
+    let has_get_type = flags.glib_get_type.is_some();
+    if has_get_type {
+        imports.add("glib::Type");
+        imports.add("glib::StaticType");
+        imports.add("glib::value::SetValue");
+        imports.add("glib::value::FromValue");
+        imports.add("glib::value::FromValueOptional");
+    }
+
+    if obj.generate_display_trait {
+        imports.add("std::fmt");
+    }
+
+    let mut functions = functions::analyze(
+        env,
+        &flags.functions,
+        flags_tid,
+        false,
+        false,
+        obj,
+        imports,
+        None,
+        None,
+    );
+
+    // Gir does not currently mark the first parameter of associated bitfield functions -
+    // that are identical to its bitfield type - as instance parameter since most languages
+    // do not support this.
+    for f in &mut functions {
+        if f.parameters.c_parameters.is_empty() {
+            continue;
+        }
+
+        let first_param = &mut f.parameters.c_parameters[0];
+
+        if first_param.typ == flags_tid {
+            first_param.instance_parameter = true;
+
+            let t = f
+                .parameters
+                .transformations
+                .iter_mut()
+                .find(|t| t.ind_c == 0)
+                .unwrap();
+
+            if let TransformationType::ToGlibScalar { name, .. } = &mut t.transformation_type {
+                *name = "self".to_owned();
+            } else {
+                panic!(
+                    "Bitfield function instance param must be passed as scalar, not {:?}",
+                    t.transformation_type
+                );
+            }
+        }
+    }
+
+    let specials = special_functions::extract(&mut functions, type_);
+
+    special_functions::analyze_imports(&specials, imports);
+
+    let info = Info {
+        full_name: obj.name.clone(),
+        type_id: flags_tid,
+        name: name.to_owned(),
+        functions,
+        specials,
+    };
+
+    Some(info)
+}

src/analysis/mod.rs

@@ -15,6 +15,7 @@ pub mod constants;
 pub mod conversion_type;
 pub mod enums;
 pub mod ffi_type;
+pub mod flags;
 pub mod function_parameters;
 pub mod functions;
 pub mod general;
@@ -48,6 +49,9 @@ pub struct Analysis {
     pub constants: Vec<constants::Info>,
     pub enumerations: Vec<enums::Info>,
     pub enum_imports: Imports,
+
+    pub flags: Vec<flags::Info>,
+    pub flags_imports: Imports,
 }
 
 pub fn run(env: &mut Env) {
@@ -90,6 +94,8 @@ pub fn run(env: &mut Env) {
 
     analyze_enums(env);
 
+    analyze_flags(env);
+
     analyze_constants(env);
 
     // Analyze free functions as the last step once all types are analyzed
@@ -119,6 +125,30 @@ fn analyze_enums(env: &mut Env) {
     env.analysis.enum_imports = imports;
 }
 
+fn analyze_flags(env: &mut Env) {
+    let mut imports = Imports::new(&env.library);
+    imports.add("glib::translate::*");
+    imports.add("bitflags::bitflags");
+
+    for obj in env.config.objects.values() {
+        if obj.status.ignored() {
+            continue;
+        }
+        let tid = match env.library.find_type(0, &obj.name) {
+            Some(x) => x,
+            None => continue,
+        };
+
+        if let Type::Bitfield(_) = env.library.type_(tid) {
+            if let Some(info) = flags::new(env, obj, &mut imports) {
+                env.analysis.flags.push(info);
+            }
+        }
+    }
+
+    env.analysis.flags_imports = imports;
+}
+
 fn analyze_global_functions(env: &mut Env) {
     let ns = env.library.namespace(library::MAIN_NAMESPACE);
 

src/codegen/flags.rs

@@ -1,5 +1,6 @@
+use super::{function, trait_impls};
 use crate::{
-    analysis::{imports::Imports, namespaces},
+    analysis::flags::Info,
     codegen::general::{
         self, cfg_deprecated, derives, version_condition, version_condition_string,
     },
@@ -16,62 +17,40 @@ use std::{
 };
 
 pub fn generate(env: &Env, root_path: &Path, mod_rs: &mut Vec<String>) {
-    let configs: Vec<&GObject> = env
-        .config
-        .objects
-        .values()
-        .filter(|c| {
-            c.status.need_generate() && c.type_id.map_or(false, |tid| tid.ns_id == namespaces::MAIN)
-        })
-        .collect();
-    let has_any = configs
-        .iter()
-        .any(|c| matches!(*env.library.type_(c.type_id.unwrap()), Type::Bitfield(_)));
-
-    if !has_any {
+    if env.analysis.flags.is_empty() {
         return;
     }
 
     let path = root_path.join("flags.rs");
     file_saver::save_to_file(path, env.config.make_backup, |w| {
-        let mut imports = Imports::new(&env.library);
-        imports.add("glib::translate::*");
-        imports.add("bitflags::bitflags");
-
-        for config in &configs {
-            if let Type::Bitfield(ref flags) = *env.library.type_(config.type_id.unwrap()) {
-                if flags.glib_get_type.is_some() {
-                    imports.add("glib::Type");
-                    imports.add("glib::StaticType");
-                    imports.add("glib::value::SetValue");
-                    imports.add("glib::value::FromValue");
-                    imports.add("glib::value::FromValueOptional");
-                    break;
-                }
-            }
-        }
-
         general::start_comments(w, &env.config)?;
-        general::uses(w, env, &imports)?;
+        general::uses(w, env, &env.analysis.flags_imports)?;
         writeln!(w)?;
 
         mod_rs.push("\nmod flags;".into());
-        for config in &configs {
-            if let Type::Bitfield(ref flags) = *env.library.type_(config.type_id.unwrap()) {
-                if let Some(cfg) = version_condition_string(env, flags.version, false, 0) {
-                    mod_rs.push(cfg);
-                }
-                mod_rs.push(format!("pub use self::flags::{};", flags.name));
-                generate_flags(env, w, flags, config)?;
+        for flags_analysis in &env.analysis.flags {
+            let config = &env.config.objects[&flags_analysis.full_name];
+            let flags = flags_analysis.type_(&env.library);
+
+            if let Some(cfg) = version_condition_string(env, flags.version, false, 0) {
+                mod_rs.push(cfg);
             }
+            mod_rs.push(format!("pub use self::flags::{};", flags.name));
+            generate_flags(env, w, flags, config, flags_analysis)?;
         }
 
         Ok(())
     });
 }
 
 #[allow(clippy::write_literal)]
-fn generate_flags(env: &Env, w: &mut dyn Write, flags: &Bitfield, config: &GObject) -> Result<()> {
+fn generate_flags(
+    env: &Env,
+    w: &mut dyn Write,
+    flags: &Bitfield,
+    config: &GObject,
+    analysis: &Info,
+) -> Result<()> {
     let sys_crate_name = env.main_sys_crate_name();
     cfg_deprecated(w, env, flags.deprecated_version, false, 0)?;
     version_condition(w, env, flags.version, false, 0)?;
@@ -106,12 +85,46 @@ fn generate_flags(env: &Env, w: &mut dyn Write, flags: &Bitfield, config: &GObje
 
     writeln!(
         w,
-        "{}",
-        "    }
-}
-"
+        "    }}
+}}"
     )?;
 
+    let functions = analysis
+        .functions
+        .iter()
+        .filter(|f| f.status.need_generate())
+        .collect::<Vec<_>>();
+
+    if !functions.is_empty() {
+        let static_tostring = analysis
+            .specials
+            .get(&crate::analysis::special_functions::Type::Display)
+            .and_then(|f| if f.returns_static_ref { Some(f) } else { None });
+
+        writeln!(w)?;
+        version_condition(w, env, flags.version, false, 0)?;
+        write!(w, "impl {} {{", analysis.name)?;
+        for func_analysis in functions {
+            if Some(&func_analysis.glib_name) == static_tostring.map(|t| &t.glib_name) {
+                function::generate_static_to_str(w, env, func_analysis)?;
+            } else {
+                function::generate(w, env, func_analysis, false, false, 1)?;
+            }
+        }
+        writeln!(w, "}}")?;
+    }
+
+    trait_impls::generate(
+        w,
+        env,
+        &analysis.name,
+        &analysis.functions,
+        &analysis.specials,
+        None,
+    )?;
+
+    writeln!(w)?;
+
     version_condition(w, env, flags.version, false, 0)?;
     writeln!(
         w,