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 6, 2024
1 parent 12c258b commit 999db8f
Show file tree
Hide file tree
Showing 3 changed files with 195 additions and 14 deletions.
62 changes: 62 additions & 0 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 @@ -339,6 +339,35 @@ where
// former::VectorSubformer::begin( formed, Some( self ), on_end )
// }

#[ inline( always ) ]
pub fn vec_1_set< Former2 >( self ) -> Former2
where
Former2 : former::FormerBegin
<
former::VectorDefinition
<
String,
Self,
Self,
Struct1FormerVec_1End,
>
>,
{
Former2::_begin( None, Some( self ), Struct1FormerVec_1End )
}

pub fn vec_1( self ) ->
former::ContainerSubformer::
<
String, former::VectorDefinition< String, Self, Self, Struct1FormerVec_1End >
>
{
self.vec_1_set::< former::ContainerSubformer::
<
String, former::VectorDefinition< String, Self, Self, Struct1FormerVec_1End >
>>()
}

// #[ doc = "Subformer setter for the 'hashmap_1' field." ]
// #[ inline ]
// pub fn hashmap_1( mut self ) -> former::HashMapSubformer< String, String, std::collections::HashMap< String, String >, Self, impl Fn( std::collections::HashMap< String, String >, core::option::Option< Self > ) -> Self, >
Expand Down Expand Up @@ -381,6 +410,39 @@ where
}
}

// zzz : description
/// Return original former after subformer for `vec_1` is done.
#[ allow( non_camel_case_types ) ]
pub struct Struct1FormerVec_1End;
#[ automatically_derived ]
impl< Definition > former::FormingEnd
<
former::VectorDefinition< String, Struct1Former< Definition >, Struct1Former< Definition >, former::NoEnd >,
>
for Struct1FormerVec_1End
where
Definition : former::FormerDefinition,
Definition::Types : former::FormerDefinitionTypes
<
Storage = Struct1FormerStorage
>,
{
#[ inline( always ) ]
fn call( &self, storage : Vec< String >, super_former : Option< Struct1Former< Definition > > ) -> Struct1Former< Definition >
{
let mut super_former = super_former.unwrap();
if let Some( ref mut field ) = super_former.storage.vec_1
{
former::ContainerAssign::assign( field, storage );
}
else
{
super_former.storage.vec_1 = Some( storage );
}
super_former
}
}

// = generated

// include!( "./only_test/containers_with_subformer.rs" );
Expand Down
8 changes: 7 additions & 1 deletion module/core/former/tests/inc/former_tests/a_containers_with_subformer_manual.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,13 @@ where
>,
{
#[ inline( always ) ]
fn call( &self, storage : std::collections::HashMap< String, String >, super_former : Option< Struct1Former< Definition > > ) -> Struct1Former< Definition >
fn call
(
&self,
storage : std::collections::HashMap< String, String >,
super_former : Option< Struct1Former< Definition > >,
)
-> Struct1Former< Definition >
{
let mut super_former = super_former.unwrap();
if let Some( ref mut field ) = super_former.storage.hashmap_1
Expand Down
139 changes: 126 additions & 13 deletions module/core/former_meta/src/derive/former.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ struct Attributes
{
default : Option< AttributeDefault >,
setter : Option< AttributeSetter >,
// #[ allow( dead_code ) ]
subformer : Option< AttributeFormer >,
alias : Option< AttributeAlias >,
}
Expand Down Expand Up @@ -494,7 +493,8 @@ fn field_name_map( field : &FormerField< '_ > ) -> syn::Ident
///
/// If aliases provided, also generate aliases
///
/// # Example of output
/// # Example of generated code
///
/// ```ignore
/// #[ doc = "Setter for the 'int_1' field." ]
/// #[ inline ]
Expand Down Expand Up @@ -537,7 +537,6 @@ 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 )
// field_setter( ident, ident, non_optional_ty )
}
else
{
Expand All @@ -563,12 +562,123 @@ fn field_setter_map( field : &FormerField< '_ > ) -> Result< TokenStream >
r
}

// zzz : description and exmaple

/// Generate unit struct which is descriptor of callback which should be called after subforming process of a specific field. Descriptors are used insted of closures to inline code and let optimizer play with optimization.
///
/// # Example of generated code
///
/// ```rust, ignore
/// #[ allow( non_camel_case_types ) ]
/// pub struct Struct1FormerVec_1End;
/// #[ automatically_derived ]
/// impl< Definition > former::FormingEnd
/// <
/// former::VectorDefinition< String, Struct1Former< Definition >, Struct1Former< Definition >, former::NoEnd >,
/// >
/// for Struct1FormerVec_1End
/// where
/// Definition : former::FormerDefinition,
/// Definition::Types : former::FormerDefinitionTypes
/// <
/// Storage = Struct1FormerStorage
/// >,
/// {
/// #[ inline( always ) ]
/// fn call
/// (
/// &self, storage : Vec< String >,
/// super_former : Option< Struct1Former< Definition > >,
/// )
/// -> Struct1Former< Definition >
/// {
/// let mut super_former = super_former.unwrap();
/// if let Some( ref mut field ) = super_former.storage.vec_1
/// {
/// former::ContainerAssign::assign( field, storage );
/// }
/// else
/// {
/// super_former.storage.vec_1 = Some( storage );
/// }
/// super_former
/// }
/// }
/// ```
#[ inline ]
fn fields_setter_callback_descriptor_map
(
field : &FormerField< '_ >,
former : &syn::Ident,
former_storage : &syn::Ident,
former_definition : &syn::Ident,
)
->
Result< TokenStream >
{
let ident = &field.ident;

if field.attrs.subformer.is_none()
{
return Ok( qt!{ } );
}


let r = qt!
{
xxx

// zzz : description
/// Return original former after subformer for `vec_1` is done.
#[ allow( non_camel_case_types ) ]
pub struct Struct1FormerVec_1End;
#[ automatically_derived ]
impl< Definition > former::FormingEnd
<
former::VectorDefinition< String, Struct1Former< Definition >, Struct1Former< Definition >, former::NoEnd >,
>
for Struct1FormerVec_1End
where
Definition : former::FormerDefinition,
Definition::Types : former::FormerDefinitionTypes
<
Storage = Struct1FormerStorage
>,
{
#[ inline( always ) ]
fn call
(
&self, storage : Vec< String >,
super_former : Option< Struct1Former< Definition > >,
)
-> Struct1Former< Definition >
{
let mut super_former = super_former.unwrap();
if let Some( ref mut field ) = super_former.storage.vec_1
{
former::ContainerAssign::assign( field, storage );
}
else
{
super_former.storage.vec_1 = Some( storage );
}
super_former
}
}

};

// tree_print!( r.as_ref().unwrap() );
Ok( r )
}

///
/// Generate a single setter for the 'field_ident' with the 'setter_name' name.
///
/// Used as a helper function for field_setter_map(), which generates all alias setters
///
/// # Example of output
/// # Example of generated code
/// ```ignore
/// #[ doc = "Setter for the 'int_1' field." ]
/// #[ inline ]
Expand Down Expand Up @@ -910,15 +1020,25 @@ pub fn former( input : proc_macro::TokenStream ) -> Result< TokenStream >

let former_fields : Vec< _ > = process_results( former_fields, | iter | iter.collect() )?;

let ( fields_none, fields_optional, fields_form, fields_names, fields_setter )
: ( Vec< _ >, Vec< _ >, Vec< _ >, Vec< _ >, Vec< _ > )
let
(
fields_none,
fields_optional,
fields_form,
fields_names,
fields_setter,
fields_setter_callback_descriptor,
)
:
( Vec< _ >, Vec< _ >, Vec< _ >, Vec< _ >, Vec< _ >, Vec< _ > )
= former_fields.iter().map( | former_field |
{(
field_none_map( former_field ),
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 ),
)}).multiunzip();

let ( _doc_former_mod, doc_former_struct ) = doc_generate( struct_name );
Expand All @@ -938,13 +1058,6 @@ pub fn former( input : proc_macro::TokenStream ) -> Result< TokenStream >
/// Make former, variation of builder pattern to form structure defining values of fields step by step.
///
// #[ inline( always ) ]
// // pub fn former() -> #former < #generics_params (), former::ReturnPreformed >
// pub fn former() -> #former < #generics_params >
// {
// #former :: new()
// }

#[ inline( always ) ]
pub fn former() -> #former < #generics_params >
{
Expand Down

0 comments on commit 999db8f

Please sign in to comment.