wip

Author: Wandalen

module/core/former/plan.md

@@ -2,7 +2,7 @@
 
 ## Increments
 
-*   ⏳ **Increment 1: Implement Multi-Field Struct Variant - Subformer - Storage**
+*   ✅ **Increment 1: Implement Multi-Field Struct Variant - Subformer - Storage**
     *   Goal: Generate the implicit storage struct for the default/subform case for multi-field struct variants.
     *   Detailed Plan Step 1: Locate the `Struct Variant (len > 1)` case in `former_enum.rs`.
     *   Detailed Plan Step 2: Remove the `return Err(...)` for the default case.
@@ -13,7 +13,7 @@
     *   Detailed Plan Step 4: Implement `impl Default` for the storage struct.
     *   Crucial Design Rules: [Handling Panics vs Recoverable Errors](#handling-panics-vs-recoverable-errors), [Visibility: Keep Implementation Details Private](#visibility-keep-implementation-details-private).
     *   Verification Strategy: Compile check (`cargo check --package former_meta`). **Hypothesis H2, H6 Check:** Verify the generated storage struct compiles with correct fields, generics, and phantom data.
-*   ⚫ **Increment 2: Implement Multi-Field Struct Variant - Subformer - Storage Impls**
+*   ✅ **Increment 2: Implement Multi-Field Struct Variant - Subformer - Storage Impls**
     *   Goal: Generate `impl Storage` and `impl StoragePreform` for the implicit storage struct.
     *   Detailed Plan Step 1: Implement `impl Storage` for `VariantNameFormerStorage`. Define `type Preformed = ( #( #field_types ),* );`.
     *   Detailed Plan Step 2: Implement `impl StoragePreform` for `VariantNameFormerStorage`.
@@ -22,7 +22,7 @@
         *   Return the preformed tuple `( #( #preformed_fields ),* )`.
     *   Crucial Design Rules: [Handling Panics vs Recoverable Errors](#handling-panics-vs-recoverable-errors).
     *   Verification Strategy: Compile check (`cargo check --package former_meta`). **Hypothesis H3, H6 Check:** Verify `preform` returns the correct tuple type and handles defaults.
-*   ⚫ **Increment 3: Implement Multi-Field Struct Variant - Subformer - DefTypes**
+*   ✅ **Increment 3: Implement Multi-Field Struct Variant - Subformer - DefTypes**
     *   Goal: Generate the implicit DefinitionTypes struct and impl.
     *   Detailed Plan Step 1: Generate the `VariantNameFormerDefinitionTypes` struct definition with appropriate generics (`#enum_generics_impl`, `Context2`, `Formed2`) and phantom data.
     *   Detailed Plan Step 2: Implement `impl Default` for `VariantNameFormerDefinitionTypes`.
@@ -110,4 +110,7 @@
 *   **[2024-04-25/Inc 6 Hypothesis]** Confirmed hypotheses for implicit former generation for multi-field struct variants. Key points: generate dedicated former ecosystem for the variant, storage holds `Option<FieldType>` for all variant fields, `preform` returns tuple, former has setters for all variant fields, `End::call` uses preformed tuple to construct variant. Generics handling (H6) and `End::call` logic (H8) require careful implementation.
 *   **[2024-04-25/Inc 6 Plan Revision]** Further decomposed Increment 6. Will now implement logic for each variant type incrementally (Unit, Tuple(0), Tuple(1), Tuple(N), Struct(0), Struct(1), Struct(N)-Scalar). The complex Struct(N)-Subformer case is broken into multiple increments (12-21) based on verified hypotheses.
 *   **[2024-04-25/Plan Update 2]** Added explicit test enabling steps to increments 6-11, 23-26. Renumbered final increments.
-*   **[2024-04-26/Plan Revision 3]** Focused plan on fixing `generics_shared_struct_derive.rs` failure by implementing the multi-field struct subformer logic (Increments 1-10). Added final verification increment (11). Preserved previous notes.
+*   **[2024-04-26/Plan Revision 3]** Focused plan on fixing `generics_shared_struct_derive.rs` failure by implementing the multi-field struct subformer logic (Increments 1-10). Added final verification increment (11). Preserved previous notes.
+*   **[2024-04-26/Inc 1]** Completed implementation of storage struct definition and default impl for multi-field struct variant subformer case. Compile check passed.
+*   **[2024-04-26/Inc 2]** Completed implementation of `Storage` and `StoragePreform` traits for the implicit storage struct. Compile check passed.
+*   **[2024-04-26/Inc 3]** Completed implementation of `DefinitionTypes` struct and its trait impls (`Default`, `FormerDefinitionTypes`, `FormerMutator`) for the implicit former. Compile check passed.

module/core/former_meta/src/derive_former/former_enum.rs

@@ -1046,110 +1046,13 @@ pub(super) fn former_for_enum
                       } // Brace on new line
                     };
 
-                    // Generate Definition struct and impls
-                    let def_name = format_ident!( "{}{}FormerDefinition", enum_name, variant_ident );
-                    let end_struct_name = format_ident!( "{}{}End", enum_name, variant_ident ); // Needed for default End type
-
-                    // <<< Start Correction 7 >>>
-                    // Calculate phantom data type based on combined generics for the definition
-                    let def_phantom_generics_impl = generic_params::merge( &generics, &parse_quote!{ < Context2, Formed2, End2 > } );
-                    let ( _ , def_phantom_generics_impl, _, _ ) = generic_params::decompose( &def_phantom_generics_impl );
-                    let def_phantom = phantom::tuple( &def_phantom_generics_impl );
-
-                    // FIX: Remove trailing comma from enum_generics_ty when used inside <> with other args
-                    let enum_generics_ty_no_comma = {
-                      let mut ty = enum_generics_ty.clone();
-                      ty.pop_punct(); // Remove trailing comma if it exists
-                      ty
-                    };
-
-                    let def_struct = quote!
-                    {
-                      #[ derive( Debug ) ]
-                      #vis struct #def_name < #enum_generics_impl Context2 = (), Formed2 = #enum_name< #enum_generics_ty >, End2 = #end_struct_name< #enum_generics_ty > >
-                      where // Where clause on new line
-                        End2 : former::FormingEnd< #def_types_name< #enum_generics_ty_no_comma, Context2, Formed2 > >, // <<< Use no_comma version
-                        #merged_where_clause // Use original enum where clause + End2 bound
-                      { // Brace on new line
-                        _phantom : #def_phantom, // Use calculated phantom
-                      } // Brace on new line
-                    };
-
-                    let def_default_impl = quote!
-                    {
-                      impl< #enum_generics_impl Context2, Formed2, End2 > ::core::default::Default
-                      for #def_name < #enum_generics_ty Context2, Formed2, End2 >
-                      where // Where clause on new line
-                        End2 : former::FormingEnd< #def_types_name< #enum_generics_ty_no_comma, Context2, Formed2 > >, // <<< Use no_comma version
-                        #merged_where_clause
-                      { // Brace on new line
-                        fn default() -> Self
-                        { // Brace on new line
-                          Self { _phantom : ::core::marker::PhantomData }
-                        } // Brace on new line
-                      } // Brace on new line
-                    };
-
-                    let def_former_impl = quote!
-                    {
-                      impl< #enum_generics_impl Context2, Formed2, End2 > former::FormerDefinition
-                      for #def_name < #enum_generics_ty Context2, Formed2, End2 >
-                      where // Where clause on new line
-                        End2 : former::FormingEnd< #def_types_name< #enum_generics_ty_no_comma, Context2, Formed2 > >, // <<< Use no_comma version
-                        #merged_where_clause
-                      { // Brace on new line
-                        type Storage = #storage_struct_name< #enum_generics_ty >;
-                        type Context = Context2;
-                        type Formed = Formed2;
-                        type Types = #def_types_name< #enum_generics_ty_no_comma, Context2, Formed2 >; // <<< Use no_comma version
-                        type End = End2;
-                      } // Brace on new line
-                    };
-                    // <<< End Correction 7 >>>
-
-                    // Generate Former struct definition
-                    let former_name = format_ident!( "{}{}Former", enum_name, variant_ident );
-                    // <<< Start Correction 8 >>>
-                    // Construct generics for Former struct manually
-                    let mut former_generics = generics.clone();
-                    former_generics.params.push( parse_quote!( Definition = #def_name< #enum_generics_ty > ) );
-                    let former_where_clause = former_generics.make_where_clause();
-                    former_where_clause.predicates.push( parse_quote!{ Definition : former::FormerDefinition< Storage = #storage_struct_name< #enum_generics_ty > > } );
-                    former_where_clause.predicates.push( parse_quote!{ Definition::Types : former::FormerDefinitionTypes< Storage = #storage_struct_name< #enum_generics_ty > > } );
-                    if let Some( enum_where ) = &generics.where_clause
-                    {
-                      for predicate in &enum_where.predicates
-                      {
-                        former_where_clause.predicates.push( predicate.clone() );
-                      }
-                    }
-                    let ( _former_generics_with_defaults, former_generics_impl, former_generics_ty, former_generics_where ) = generic_params::decompose( &former_generics );
-                    // <<< End Correction 8 >>>
-
-                    let former_struct_def = quote!
-                    {
-                      #[ doc = "Former for the #variant_ident variant." ]
-                      #vis struct #former_name < #former_generics_impl > // Use decomposed impl generics
-                      where // Where clause on new line
-                        #former_generics_where // Use decomposed where clause
-                      { // Brace on new line
-                        /// Temporary storage for all fields during the formation process.
-                        pub storage : Definition::Storage,
-                        /// Optional context.
-                        pub context : ::core::option::Option< Definition::Context >,
-                        /// Optional handler for the end of formation.
-                        pub on_end : ::core::option::Option< Definition::End >,
-                      } // Brace on new line
-                    };
-
-
                     // Add generated storage, DefTypes, Definition, and Former code to end_impls
                     end_impls.push( quote!
                     {
                        #storage_def #storage_default_impl #storage_trait_impl #storage_preform_impl
                        #def_types_struct #def_types_default_impl #def_types_former_impl #def_types_mutator_impl
-                       #def_struct #def_default_impl #def_former_impl
-                       #former_struct_def // <<< Added Former struct definition
+                       // #def_struct #def_default_impl #def_former_impl // Will be added in Increment 4
+                       // #former_struct_def // Will be added in Increment 5
                     });
 
                     // --- Force Debug Print for EnumG4::V1 ---
@@ -1166,18 +1069,18 @@ pub(super) fn former_for_enum
                         // Implicit Former Components
                         #storage_def #storage_default_impl #storage_trait_impl #storage_preform_impl
                         #def_types_struct #def_types_default_impl #def_types_former_impl #def_types_mutator_impl
-                        #def_struct #def_default_impl #def_former_impl
-                        #former_struct_def // <<< Added Former struct definition
+                        // #def_struct #def_default_impl #def_former_impl // Placeholder
+                        // #former_struct_def // Placeholder
                         // Placeholder for Former impl, End struct/impl
                       };
                       diag::report_print( about, original_input, &variant_code );
                     }
                     // --- End Force Debug Print ---
 
 
-                    // Placeholder for the rest of the implicit former generation (Increments 6-10)
+                    // Placeholder for the rest of the implicit former generation (Increments 4-10)
                     // methods.push( quote!{ /* TODO: Add static method for subformer */ } );
-                    // end_impls.push( quote!{ /* TODO: Add Former impl, End impls */ } );
+                    // end_impls.push( quote!{ /* TODO: Add Def, Former, End impls */ } );
                     // standalone_constructors.push( quote!{ /* TODO: Add standalone constructor */ } );
                 }
             }