Prep for type name deferral (#2955)

kennykerr · web-flow · commit 927aa8458ed7 · 2024-03-26T13:11:36.000-05:00
diff --git a/crates/libs/bindgen/src/metadata.rs b/crates/libs/bindgen/src/metadata.rs
@@ -418,10 +418,10 @@ pub fn type_def_has_callback(row: TypeDef) -> bool {
         false
     }
     let type_name = row.type_name();
-    if type_name.namespace.is_empty() {
+    if type_name.namespace().is_empty() {
         check(row)
     } else {
-        for row in row.reader().get_type_def(type_name.namespace, type_name.name) {
+        for row in row.reader().get_type_def(type_name.namespace(), type_name.name()) {
             if check(row) {
                 return true;
             }
@@ -473,7 +473,7 @@ pub fn type_interfaces(ty: &Type) -> Vec<Interface> {
                     "StaticAttribute" | "ActivatableAttribute" => {
                         for (_, arg) in attribute.args() {
                             if let Value::TypeName(type_name) = arg {
-                                let def = row.reader().get_type_def(type_name.namespace, type_name.name).next().expect("Type not found");
+                                let def = row.reader().get_type_def(type_name.namespace(), type_name.name()).next().expect("Type not found");
                                 result.push(Interface { ty: Type::TypeDef(def, Vec::new()), kind: InterfaceKind::Static });
                                 break;
                             }
@@ -601,10 +601,10 @@ pub fn type_def_has_explicit_layout(row: TypeDef) -> bool {
         false
     }
     let type_name = row.type_name();
-    if type_name.namespace.is_empty() {
+    if type_name.namespace().is_empty() {
         check(row)
     } else {
-        for row in row.reader().get_type_def(type_name.namespace, type_name.name) {
+        for row in row.reader().get_type_def(type_name.namespace(), type_name.name()) {
             if check(row) {
                 return true;
             }
@@ -635,10 +635,10 @@ pub fn type_def_has_packing(row: TypeDef) -> bool {
         false
     }
     let type_name = row.type_name();
-    if type_name.namespace.is_empty() {
+    if type_name.namespace().is_empty() {
         check(row)
     } else {
-        for row in row.reader().get_type_def(type_name.namespace, type_name.name) {
+        for row in row.reader().get_type_def(type_name.namespace(), type_name.name()) {
             if check(row) {
                 return true;
             }
@@ -741,7 +741,7 @@ pub fn type_def_bases(mut row: TypeDef) -> Vec<TypeDef> {
     loop {
         match row.extends() {
             Some(base) if base != TypeName::Object => {
-                row = row.reader().get_type_def(base.namespace, base.name).next().expect("Type not found");
+                row = row.reader().get_type_def(base.namespace(), base.name()).next().expect("Type not found");
                 bases.push(row);
             }
             _ => break,
diff --git a/crates/libs/bindgen/src/rdl/from_reader.rs b/crates/libs/bindgen/src/rdl/from_reader.rs
@@ -169,12 +169,12 @@ impl Writer {
 
     fn type_def(&self, def: metadata::TypeDef) -> TokenStream {
         if let Some(extends) = def.extends() {
-            if extends.namespace == "System" {
-                if extends.name == "Enum" {
+            if extends.namespace() == "System" {
+                if extends.name() == "Enum" {
                     self.enum_def(def)
-                } else if extends.name == "ValueType" {
+                } else if extends.name() == "ValueType" {
                     self.struct_def(def)
-                } else if extends.name == "MulticastDelegate" {
+                } else if extends.name() == "MulticastDelegate" {
                     self.delegate_def(def)
                 } else {
                     self.class_def(def)
@@ -294,8 +294,8 @@ impl Writer {
 
         if let Some(type_name) = def.extends() {
             if type_name != metadata::TypeName::Object {
-                let namespace = self.namespace(type_name.namespace);
-                let name = to_ident(type_name.name);
+                let namespace = self.namespace(type_name.namespace());
+                let name = to_ident(type_name.name());
                 // TODO: ideally the "class" contextual keyword wouldn't be needed here
                 // but currently there's no way to tell the base class apart from a required interface.
                 types.insert(0, quote! { class #namespace #name });
@@ -356,8 +356,8 @@ impl Writer {
             }
 
             metadata::Type::TypeRef(type_name) => {
-                let namespace = self.namespace(type_name.namespace);
-                let name = to_ident(type_name.name);
+                let namespace = self.namespace(type_name.namespace());
+                let name = to_ident(type_name.name());
                 quote! { #namespace #name }
             }
 
diff --git a/crates/libs/bindgen/src/rust/cfg.rs b/crates/libs/bindgen/src/rust/cfg.rs
@@ -80,7 +80,7 @@ pub fn type_def_cfg_combine(writer: &Writer, row: metadata::TypeDef, generics: &
         type_cfg_combine(writer, generic, cfg);
     }
 
-    if cfg.types.entry(type_name.namespace).or_default().insert(row) {
+    if cfg.types.entry(type_name.namespace()).or_default().insert(row) {
         match type_kind {
             metadata::TypeKind::Class => {
                 if let Some(default_interface) = metadata::type_def_default_interface(row) {
@@ -98,8 +98,8 @@ pub fn type_def_cfg_combine(writer: &Writer, row: metadata::TypeDef, generics: &
             }
             metadata::TypeKind::Struct => {
                 row.fields().for_each(|field| field_cfg_combine(writer, field, Some(row), cfg));
-                if !type_name.namespace.is_empty() {
-                    for def in row.reader().get_type_def(type_name.namespace, type_name.name) {
+                if !type_name.namespace().is_empty() {
+                    for def in row.reader().get_type_def(type_name.namespace(), type_name.name()) {
                         if def != row {
                             type_def_cfg_combine(writer, def, &[], cfg);
                         }
diff --git a/crates/libs/bindgen/src/rust/enums.rs b/crates/libs/bindgen/src/rust/enums.rs
@@ -3,7 +3,7 @@ use metadata::HasAttributes;
 
 pub fn writer(writer: &Writer, def: metadata::TypeDef) -> TokenStream {
     let type_name = def.type_name();
-    let ident = to_ident(type_name.name);
+    let ident = to_ident(type_name.name());
     let underlying_type = def.underlying_type();
     let underlying_type = writer.type_name(&underlying_type);
 
@@ -72,7 +72,7 @@ pub fn writer(writer: &Writer, def: metadata::TypeDef) -> TokenStream {
     }
 
     if !writer.sys {
-        let name = type_name.name;
+        let name = type_name.name();
         tokens.combine(&quote! {
             #features
             impl windows_core::TypeKind for #ident {
diff --git a/crates/libs/bindgen/src/rust/handles.rs b/crates/libs/bindgen/src/rust/handles.rs
@@ -92,8 +92,8 @@ pub fn gen_win_handle(writer: &Writer, def: metadata::TypeDef) -> TokenStream {
 
     if let Some(dependency) = type_def_usable_for(def) {
         let type_name = dependency.type_name();
-        let mut dependency = writer.namespace(type_name.namespace);
-        dependency.push_str(type_name.name);
+        let mut dependency = writer.namespace(type_name.namespace());
+        dependency.push_str(type_name.name());
 
         tokens.combine(&quote! {
             impl windows_core::CanInto<#dependency> for #ident {}
diff --git a/crates/libs/bindgen/src/rust/mod.rs b/crates/libs/bindgen/src/rust/mod.rs
@@ -186,13 +186,13 @@ fn namespace(writer: &Writer, tree: &Tree) -> String {
         match item {
             metadata::Item::Type(def) => {
                 let type_name = def.type_name();
-                if writer.reader.remap_types().any(|(x, _)| x == &type_name) {
+                if writer.reader.remap_type(&type_name).is_some() {
                     continue;
                 }
-                if writer.reader.core_types().any(|(x, _)| x == &type_name) {
+                if writer.reader.core_type(&type_name).is_some() {
                     continue;
                 }
-                types.entry(def.kind()).or_default().entry(type_name.name).or_default().combine(&writer.type_def(def));
+                types.entry(def.kind()).or_default().entry(type_name.name()).or_default().combine(&writer.type_def(def));
             }
             metadata::Item::Fn(def, namespace) => {
                 let name = def.name();
@@ -230,7 +230,7 @@ fn namespace_impl(writer: &Writer, tree: &Tree) -> String {
     for item in writer.reader.namespace_items(tree.namespace) {
         if let metadata::Item::Type(def) = item {
             let type_name = def.type_name();
-            if writer.reader.core_types().any(|(x, _)| x == &type_name) {
+            if writer.reader.core_type(&type_name).is_some() {
                 continue;
             }
             if def.kind() != metadata::TypeKind::Interface {
@@ -239,7 +239,7 @@ fn namespace_impl(writer: &Writer, tree: &Tree) -> String {
             let tokens = implements::writer(writer, def);
 
             if !tokens.is_empty() {
-                types.insert(type_name.name, tokens);
+                types.insert(type_name.name(), tokens);
             }
         }
     }
diff --git a/crates/libs/bindgen/src/rust/standalone.rs b/crates/libs/bindgen/src/rust/standalone.rs
@@ -154,8 +154,8 @@ fn type_collect_standalone(writer: &Writer, ty: &metadata::Type, set: &mut std::
     // Note this is a bit overeager as we can collect a typedef that is used
     // by one architecture but not by another
     let type_name = def.type_name();
-    if !type_name.namespace.is_empty() {
-        for row in def.reader().get_type_def(type_name.namespace, type_name.name) {
+    if !type_name.namespace().is_empty() {
+        for row in def.reader().get_type_def(type_name.namespace(), type_name.name()) {
             if def != row {
                 type_collect_standalone(writer, &metadata::Type::TypeDef(row, Vec::new()), set);
             }
diff --git a/crates/libs/bindgen/src/rust/writer.rs b/crates/libs/bindgen/src/rust/writer.rs
@@ -56,11 +56,11 @@ impl Writer {
     pub fn type_def_name_imp(&self, def: metadata::TypeDef, generics: &[metadata::Type], suffix: &str) -> TokenStream {
         let type_name = def.type_name();
 
-        if type_name.namespace.is_empty() {
+        if type_name.namespace().is_empty() {
             to_ident(&self.scoped_name(def))
         } else {
-            let mut namespace = self.namespace(type_name.namespace);
-            let mut name = to_ident(type_name.name);
+            let mut namespace = self.namespace(type_name.namespace());
+            let mut name = to_ident(type_name.name());
             name.push_str(suffix);
 
             if generics.is_empty() || self.sys {
@@ -106,7 +106,7 @@ impl Writer {
         } else {
             let kind = self.type_name(ty);
 
-            if ty.is_generic() {
+            if matches!(ty, metadata::Type::GenericParam(_)) {
                 quote! { <#kind as windows_core::Type<#kind>>::Default }
             } else if metadata::type_is_nullable(ty) && !self.sys {
                 quote! { Option<#kind> }
diff --git a/crates/libs/bindgen/src/winmd/from_reader.rs b/crates/libs/bindgen/src/winmd/from_reader.rs
@@ -23,7 +23,7 @@ pub fn from_reader(reader: &metadata::Reader, config: std::collections::BTreeMap
 
         let generics = &metadata::type_def_generics(def);
 
-        let extends = if let Some(extends) = def.extends() { writer.insert_type_ref(extends.namespace, extends.name) } else { TypeDefOrRef::none() };
+        let extends = if let Some(extends) = def.extends() { writer.insert_type_ref(extends.namespace(), extends.name()) } else { TypeDefOrRef::none() };
 
         writer.tables.TypeDef.push(TypeDef {
             Extends: extends,
diff --git a/crates/libs/metadata/src/filter.rs b/crates/libs/metadata/src/filter.rs
@@ -84,7 +84,7 @@ mod tests {
 
     fn includes_type_name(filter: &Filter, full_name: &'static str) -> bool {
         let type_name = crate::TypeName::parse(full_name);
-        filter.includes_type_name(type_name.namespace, type_name.name)
+        filter.includes_type_name(type_name.namespace(), type_name.name())
     }
 
     #[test]
diff --git a/crates/libs/metadata/src/reader.rs b/crates/libs/metadata/src/reader.rs
@@ -140,19 +140,19 @@ impl Reader {
         self.nested.get(&type_def).map(|map| map.values().copied()).into_iter().flatten()
     }
 
-    pub fn remap_types(&self) -> impl Iterator<Item = &(TypeName, TypeName)> + '_ {
+    pub fn remap_type(&self, type_name: &TypeName) -> Option<TypeName> {
         if self.sys {
-            [].iter()
+            None
         } else {
-            REMAP_TYPES.iter()
+            REMAP_TYPES.iter().find_map(|(key, value)| (type_name == key).then(|| value.clone()))
         }
     }
 
-    pub fn core_types(&self) -> impl Iterator<Item = &(TypeName, Type)> + '_ {
+    pub fn core_type(&self, type_name: &TypeName) -> Option<Type> {
         if self.sys {
-            SYS_CORE_TYPES.iter()
+            SYS_CORE_TYPES.iter().find_map(|(key, value)| (type_name == key).then(|| value.clone()))
         } else {
-            CORE_TYPES.iter()
+            CORE_TYPES.iter().find_map(|(key, value)| (type_name == key).then(|| value.clone()))
         }
     }
 
@@ -164,30 +164,27 @@ impl Reader {
 
         let mut full_name = code.type_name();
 
-        for (known_name, kind) in self.core_types() {
-            if full_name == *known_name {
-                return kind.clone();
-            }
+        if let Some(to) = self.remap_type(&full_name) {
+            full_name = to.clone();
         }
 
-        for (from, to) in self.remap_types() {
-            if full_name == *from {
-                full_name = *to;
-                break;
-            }
+        if let Some(kind) = self.core_type(&full_name) {
+            return kind;
         }
 
+        // TODO: this needs to be deferred via a TypeName's optional nested type name?
         if let Some(outer) = enclosing {
-            if full_name.namespace.is_empty() {
+            if full_name.namespace().is_empty() {
                 let nested = &self.nested[&outer];
-                let Some(inner) = nested.get(full_name.name) else {
-                    panic!("Nested type not found: {}.{}", outer.type_name(), full_name.name);
+                let Some(inner) = nested.get(full_name.name()) else {
+                    panic!("Nested type not found: {}.{}", outer.type_name(), full_name.name());
                 };
                 return Type::TypeDef(*inner, Vec::new());
             }
         }
 
-        if let Some(def) = self.get_type_def(full_name.namespace, full_name.name).next() {
+        // TODO: this needs to just return a TypeRef and avoid resolving as its too early to bake in the type
+        if let Some(def) = self.get_type_def(full_name.namespace(), full_name.name()).next() {
             Type::TypeDef(def, Vec::new())
         } else {
             Type::TypeRef(full_name)
@@ -252,7 +249,7 @@ impl Reader {
                 blob.read_usize(); // ELEMENT_TYPE_VALUETYPE or ELEMENT_TYPE_CLASS
 
                 let type_name = TypeDefOrRef::decode(blob.file, blob.read_usize()).type_name();
-                let def = self.get_type_def(type_name.namespace, type_name.name).next().unwrap_or_else(|| panic!("Type not found: {}", type_name));
+                let def = self.get_type_def(type_name.namespace(), type_name.name()).next().unwrap_or_else(|| panic!("Type not found: {}", type_name));
                 let mut args = Vec::with_capacity(blob.read_usize());
 
                 for _ in 0..args.capacity() {
diff --git a/crates/libs/metadata/src/tables.rs b/crates/libs/metadata/src/tables.rs
@@ -109,7 +109,7 @@ impl Attribute {
                 0x50 => Value::TypeName(TypeName::parse(values.read_str())),
                 0x55 => {
                     let type_name = TypeName::parse(name);
-                    let def = reader.get_type_def(type_name.namespace, type_name.name).next().expect("Type not found");
+                    let def = reader.get_type_def(type_name.namespace(), type_name.name()).next().expect("Type not found");
                     name = values.read_str();
                     Value::EnumDef(def, Box::new(values.read_integer(def.underlying_type())))
                 }
diff --git a/crates/libs/metadata/src/type.rs b/crates/libs/metadata/src/type.rs
@@ -144,11 +144,6 @@ impl Type {
         matches!(self, Type::ConstRef(_))
     }
 
-    /// Returns `true` if the `Type` is a generic parameter.
-    pub fn is_generic(&self) -> bool {
-        matches!(self, Type::GenericParam(_))
-    }
-
     /// Returns `true` if the `Type` is a pointer.
     pub fn is_pointer(&self) -> bool {
         matches!(self, Type::ConstPtr(_, _) | Type::MutPtr(_, _))
diff --git a/crates/libs/metadata/src/type_name.rs b/crates/libs/metadata/src/type_name.rs

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ pub fn type_def_cfg_combine(writer: &Writer, row: metadata::TypeDef, generics: &`
`80`	`80`	`type_cfg_combine(writer, generic, cfg);`
`81`	`81`	`}`
`82`	`82`
`83`		`- if cfg.types.entry(type_name.namespace).or_default().insert(row) {`
	`83`	`+ if cfg.types.entry(type_name.namespace()).or_default().insert(row) {`
`84`	`84`	`match type_kind {`
`85`	`85`	`metadata::TypeKind::Class => {`
`86`	`86`	`if let Some(default_interface) = metadata::type_def_default_interface(row) {`
`@@ -98,8 +98,8 @@ pub fn type_def_cfg_combine(writer: &Writer, row: metadata::TypeDef, generics: &`
`98`	`98`	`}`
`99`	`99`	`metadata::TypeKind::Struct => {`
`100`	`100`	`row.fields().for_each(\|field\| field_cfg_combine(writer, field, Some(row), cfg));`
`101`		`- if !type_name.namespace.is_empty() {`
`102`		`- for def in row.reader().get_type_def(type_name.namespace, type_name.name) {`
	`101`	`+ if !type_name.namespace().is_empty() {`
	`102`	`+ for def in row.reader().get_type_def(type_name.namespace(), type_name.name()) {`
`103`	`103`	`if def != row {`
`104`	`104`	`type_def_cfg_combine(writer, def, &[], cfg);`
`105`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -186,13 +186,13 @@ fn namespace(writer: &Writer, tree: &Tree) -> String {`
`186`	`186`	`match item {`
`187`	`187`	`metadata::Item::Type(def) => {`
`188`	`188`	`let type_name = def.type_name();`
`189`		`- if writer.reader.remap_types().any(\|(x, _)\| x == &type_name) {`
	`189`	`+ if writer.reader.remap_type(&type_name).is_some() {`
`190`	`190`	`continue;`
`191`	`191`	`}`
`192`		`- if writer.reader.core_types().any(\|(x, _)\| x == &type_name) {`
	`192`	`+ if writer.reader.core_type(&type_name).is_some() {`
`193`	`193`	`continue;`
`194`	`194`	`}`
`195`		`- types.entry(def.kind()).or_default().entry(type_name.name).or_default().combine(&writer.type_def(def));`
	`195`	`+ types.entry(def.kind()).or_default().entry(type_name.name()).or_default().combine(&writer.type_def(def));`
`196`	`196`	`}`
`197`	`197`	`metadata::Item::Fn(def, namespace) => {`
`198`	`198`	`let name = def.name();`
`@@ -230,7 +230,7 @@ fn namespace_impl(writer: &Writer, tree: &Tree) -> String {`
`230`	`230`	`for item in writer.reader.namespace_items(tree.namespace) {`
`231`	`231`	`if let metadata::Item::Type(def) = item {`
`232`	`232`	`let type_name = def.type_name();`
`233`		`- if writer.reader.core_types().any(\|(x, _)\| x == &type_name) {`
	`233`	`+ if writer.reader.core_type(&type_name).is_some() {`
`234`	`234`	`continue;`
`235`	`235`	`}`
`236`	`236`	`if def.kind() != metadata::TypeKind::Interface {`
`@@ -239,7 +239,7 @@ fn namespace_impl(writer: &Writer, tree: &Tree) -> String {`
`239`	`239`	`let tokens = implements::writer(writer, def);`
`240`	`240`
`241`	`241`	`if !tokens.is_empty() {`
`242`		`- types.insert(type_name.name, tokens);`
	`242`	`+ types.insert(type_name.name(), tokens);`
`243`	`243`	`}`
`244`	`244`	`}`
`245`	`245`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ mod tests {`
`84`	`84`
`85`	`85`	`fn includes_type_name(filter: &Filter, full_name: &'static str) -> bool {`
`86`	`86`	`let type_name = crate::TypeName::parse(full_name);`
`87`		`- filter.includes_type_name(type_name.namespace, type_name.name)`
	`87`	`+ filter.includes_type_name(type_name.namespace(), type_name.name())`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`#[test]`