Skip to content

Commit

Permalink
former : experimenting
Browse files Browse the repository at this point in the history
  • Loading branch information
@Wandalen
Wandalen committed Apr 10, 2024
1 parent c89aa33 commit c6d2fc4
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 82 deletions.
8 changes: 5 additions & 3 deletions module/core/former/tests/inc/former_tests/a_containers_with_subformer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,18 @@ pub struct Struct1
{
#[ subformer( former::VectorDefinition ) ]
vec_1 : Vec< String >,
// #[ subformer( former::HashMapSubformer ) ]
// #[ subformer( former::HashMapDefinition ) ]
hashmap_1 : std::collections::HashMap< String, String >,
// // #[ subformer( former::HashSetSubformer ) ]
#[ subformer( former::HashSetDefinition ) ]
hashset_1 : std::collections::HashSet< String >,
}

// = generated




// = generated

include!( "./only_test/containers_with_subformer.rs" );
// include!( "./only_test/containers_with_subformer.rs" );
// xxx : uncomment
136 changes: 68 additions & 68 deletions module/core/former/tests/inc/former_tests/only_test/containers_with_subformer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,73 +224,73 @@ tests_impls_optional!
// };
// a_id!( command, expected );
// }
//
// //
//
// fn test_hashset()
// {
//
// // test.case( "implicit construction" );
//
// let command = Struct1::former()
// .hashset_1().add( "v1" ).add( "v2" ).end()
// .form()
// ;
// // dbg!( &command );
//
// let expected = Struct1
// {
// vec_1 : vec![],
// hashmap_1 : hmap!{},
// hashset_1 : hset!{ "v1".to_string(), "v2".to_string() },
// };
// a_id!( command, expected );
//
// // test.case( "replace" );
//
// let command = Struct1::former()
// .hashset_1().replace( hset!{ "v1".to_string(), "v2".to_string() } ).end()
// .form()
// ;
// let expected = Struct1
// {
// vec_1 : vec![],
// hashmap_1 : hmap!{},
// hashset_1 : hset!{ "v1".to_string(), "v2".to_string() },
// };
// a_id!( command, expected );
//
// let command = Struct1::former()
// .hashset_1().add( "x" ).replace( hset!{ "v1".to_string(), "v2".to_string() } ).end()
// .form()
// ;
// let expected = Struct1
// {
// vec_1 : vec![],
// hashmap_1 : hmap!{},
// hashset_1 : hset!{ "v1".to_string(), "v2".to_string() },
// };
// a_id!( command, expected );
//
// // test.case( "replace and add" );
//
// let command = Struct1::former()
// .hashset_1().replace( hset!{ "v1".to_string(), "v2".to_string() } ).add( "v3" ).end()
// .form()
// ;
// // dbg!( &command );
//
// let expected = Struct1
// {
// vec_1 : vec![],
// hashmap_1 : hmap!{},
// hashset_1 : hset!{ "v1".to_string(), "v2".to_string(), "v3".to_string() },
// };
// a_id!( command, expected );
// }
//
// //
//

//

fn test_hashset()
{

// test.case( "implicit construction" );

let command = Struct1::former()
.hashset_1().add( "v1" ).add( "v2" ).end()
.form()
;
// dbg!( &command );

let expected = Struct1
{
vec_1 : vec![],
hashmap_1 : hmap!{},
hashset_1 : hset!{ "v1".to_string(), "v2".to_string() },
};
a_id!( command, expected );

// test.case( "replace" );

let command = Struct1::former()
.hashset_1().replace( hset!{ "v1".to_string(), "v2".to_string() } ).end()
.form()
;
let expected = Struct1
{
vec_1 : vec![],
hashmap_1 : hmap!{},
hashset_1 : hset!{ "v1".to_string(), "v2".to_string() },
};
a_id!( command, expected );

let command = Struct1::former()
.hashset_1().add( "x" ).replace( hset!{ "v1".to_string(), "v2".to_string() } ).end()
.form()
;
let expected = Struct1
{
vec_1 : vec![],
hashmap_1 : hmap!{},
hashset_1 : hset!{ "v1".to_string(), "v2".to_string() },
};
a_id!( command, expected );

// test.case( "replace and add" );

let command = Struct1::former()
.hashset_1().replace( hset!{ "v1".to_string(), "v2".to_string() } ).add( "v3" ).end()
.form()
;
// dbg!( &command );

let expected = Struct1
{
vec_1 : vec![],
hashmap_1 : hmap!{},
hashset_1 : hset!{ "v1".to_string(), "v2".to_string(), "v3".to_string() },
};
a_id!( command, expected );
}

//

// fn test_complex()
// {
//
Expand Down Expand Up @@ -321,7 +321,7 @@ tests_index!
new,
test_vector,
// test_hashmap,
// test_hashset,
test_hashset,
// test_complex,
// xxx
}
24 changes: 13 additions & 11 deletions module/core/former_meta/src/derive/former.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ fn field_name_map( field : &FormerField< '_ > ) -> syn::Ident
/// ```
#[ inline ]
fn field_setter_map( field : &FormerField< '_ > ) -> Result< TokenStream >
fn field_setter_map( field : &FormerField< '_ >, struct_name : &syn::Ident ) -> Result< TokenStream >
{
let ident = &field.ident;

Expand All @@ -538,7 +538,7 @@ fn field_setter_map( field : &FormerField< '_ > ) -> Result< TokenStream >
let setter_tokens = if let Some( subformer_ty ) = &field.attrs.subformer
{
// subformer_field_setter( ident, ident, non_optional_ty, &subformer_ty.expr )
subformer_field_setter( field, &subformer_ty.expr )
subformer_field_setter( field, struct_name, &subformer_ty.expr )
}
else
{
Expand Down Expand Up @@ -643,6 +643,7 @@ fn field_setter
fn subformer_field_setter
(
field : &FormerField< '_ >,
struct_name : &syn::Ident,
// field_ident : &syn::Ident,
// setter_name : &syn::Ident,
// non_optional_type : &syn::Type,
Expand Down Expand Up @@ -671,10 +672,10 @@ fn subformer_field_setter

use convert_case::{ Case, Casing };
// let ident = field_ident;
let field_forming_end_name = format!( "former{}End", field_ident.to_string().to_case( Case::Camel ) );
let field_forming_end_name = format!( "{}Former{}End", struct_name, field_ident.to_string().to_case( Case::Camel ) );
let field_forming_end = syn::Ident::new( &field_forming_end_name, field_ident.span() );
let field_set_name = format!( "{}_set", field_ident );
let field_set = syn::Ident::new( &field_forming_end_name, field_ident.span() );
let field_set = syn::Ident::new( &field_set_name, field_ident.span() );

qt!
{
Expand All @@ -688,22 +689,22 @@ fn subformer_field_setter
#( #params, )*
Self,
Self,
#field_set,
#field_forming_end,
>
>,
{
Former2::_begin( None, Some( self ), #field_set )
Former2::_begin( None, Some( self ), #field_forming_end )
}

pub fn #field_ident( self ) ->
former::ContainerSubformer::
<
#( #params, )* #subformer_definition< #( #params, )* Self, Self, #field_set >
#( #params, )* #subformer_definition< #( #params, )* Self, Self, #field_forming_end >
>
{
self.#field_set::< former::ContainerSubformer::
<
#( #params, )* #subformer_definition< #( #params, )* Self, Self, #field_set >
#( #params, )* #subformer_definition< #( #params, )* Self, Self, #field_forming_end >
>>()
}

Expand Down Expand Up @@ -810,6 +811,7 @@ fn subformer_field_setter
fn fields_setter_callback_descriptor_map
(
field : &FormerField< '_ >,
struct_name : &syn::Ident,
former : &syn::Ident,
former_storage : &syn::Ident,
former_definition : &syn::Ident,
Expand All @@ -829,7 +831,7 @@ Result< TokenStream >

use convert_case::{ Case, Casing };
let ident = field.ident;
let field_forming_end_name = format!( "former{}End", ident.to_string().to_case( Case::Camel ) );
let field_forming_end_name = format!( "{}Former{}End", struct_name, field.ident.to_string().to_case( Case::Camel ) );
let field_forming_end = syn::Ident::new( &field_forming_end_name, ident.span() );

let field_ty = field.non_optional_ty;
Expand Down Expand Up @@ -1134,8 +1136,8 @@ pub fn former( input : proc_macro::TokenStream ) -> Result< TokenStream >
field_optional_map( former_field ),
field_form_map( former_field ),
field_name_map( former_field ),
field_setter_map( former_field ),
fields_setter_callback_descriptor_map( former_field, &former, &former_storage, &former_definition ),
field_setter_map( former_field, &struct_name ),
fields_setter_callback_descriptor_map( former_field, &struct_name, &former, &former_storage, &former_definition ),
)}).multiunzip();

let ( _doc_former_mod, doc_former_struct ) = doc_generate( struct_name );
Expand Down

0 comments on commit c6d2fc4

Please sign in to comment.