foo

Author: lilizoey

godot-codegen/src/generator/central_files.rs

@@ -265,7 +265,7 @@ fn make_global_enums(api: &ExtensionApi) -> Vec<TokenStream> {
             continue;
         }
 
-        let def = enum_.to_declaration();
+        let def = enum_.to_definition();
         global_enum_defs.push(def);
     }
 

godot-codegen/src/generator/enums.rs

@@ -17,7 +17,7 @@ use proc_macro2::{Ident, TokenStream};
 use quote::{quote, ToTokens};
 
 pub fn make_enums(enums: &[domain::Enum]) -> TokenStream {
-    let definitions = enums.iter().map(Enum::to_declaration);
+    let definitions = enums.iter().map(Enum::to_definition);
 
     quote! {
         #( #definitions )*
@@ -26,17 +26,20 @@ pub fn make_enums(enums: &[domain::Enum]) -> TokenStream {
 
 /// Codegen methods.
 impl domain::Enum {
-    /// Creates a declaration of this enum.
+    /// Creates a definition of this enum.
     ///
     /// This will also implement all relevant traits and generate appropriate constants for each enumerator.
-    pub fn to_declaration(&self) -> TokenStream {
+    pub fn to_definition(&self) -> TokenStream {
         // Things needed for the type definition
         let derives = self.derives();
         let enum_doc = self.enum_doc();
         let name = &self.name;
 
         // Values
-        let enumerators = self.to_const_declarations();
+        let enumerators = self
+            .enumerators
+            .iter()
+            .map(|enumerator| enumerator.to_definition(name.clone().into_token_stream()));
 
         // Trait implementations
         let engine_trait_impl = self.to_engine_trait_impl();
@@ -56,7 +59,7 @@ impl domain::Enum {
             }
 
             impl #name {
-                #enumerators
+                #( #enumerators )*
             }
 
             #engine_trait_impl
@@ -135,19 +138,6 @@ impl domain::Enum {
         }
     }
 
-    /// Creates declarations for all the constants of this enum.
-    fn to_const_declarations(&self) -> TokenStream {
-        let declarations = self
-            .enumerators
-            .iter()
-            .map(|field| field.to_const_declaration((&self.name).into_token_stream()))
-            .collect::<Vec<_>>();
-
-        quote! {
-            #( #declarations )*
-        }
-    }
-
     /// Creates implementations for any bitwise operators.
     ///
     /// Currently this is just [`BitOr`](std::ops::BitOr) for bitfields but that could be expanded in the future.
@@ -196,13 +186,13 @@ impl domain::Enum {
 
 /// Codegen methods.
 impl domain::Enumerator {
-    /// Creates a `const` declaration for self of the type `enum_type`.
+    /// Creates a `const` definition for self of the type `enum_type`.
     ///
-    /// That is, it'll be a declaration like
+    /// That is, it'll be a definition like
     /// ```ignore
     /// pub const NAME: enum_type = ..;
     /// ```
-    fn to_const_declaration(&self, enum_type: TokenStream) -> TokenStream {
+    fn to_definition(&self, enum_type: TokenStream) -> TokenStream {
         let Self {
             name,
             godot_name,