former : introduce subform_scalar ready

module/core/derive_tools/src/lib.rs

@@ -2,13 +2,32 @@
 #![ doc( html_logo_url = "https://raw.githubusercontent.com/Wandalen/wTools/master/asset/img/logo_v3_trans_square.png" ) ]
 #![ doc( html_favicon_url = "https://raw.githubusercontent.com/Wandalen/wTools/alpha/asset/img/logo_v3_trans_square_icon_small_v2.ico" ) ]
 #![ doc( html_root_url = "https://docs.rs/derive_tools/latest/derive_tools/" ) ]
-
-//!
-//! Collection of derives which extend STD.
-//!
-
 #![ doc = include_str!( concat!( env!( "CARGO_MANIFEST_DIR" ), "/", "Readme.md" ) ) ]
 
+// // xxx : implement derive new
+//
+// #[ derive( Debug, PartialEq, Default ) ]
+// pub struct Property< Name >
+// {
+//   name : Name,
+//   description : String,
+//   code : isize,
+// }
+//
+// /// generated by new
+// impl< Name > Property< Name >
+// {
+//   #[ inline ]
+//   pub fn new< Description, Code >( name : Name, description : Description, code : Code ) -> Self
+//   where
+//     Name : core::convert::Into< Name >,
+//     Description : core::convert::Into< String >,
+//     Code : core::convert::Into< isize >,
+//   {
+//     Self { name : name.into(), description : description.into(), code : code.into() }
+//   }
+// }
+
 #[ cfg( feature = "enabled" ) ]
 pub mod wtools;
 
@@ -56,7 +75,7 @@ mod derive_more
 // #[ cfg( feature = "derive_reflect" ) ]
 // pub mod reflect;
 
-// use derive_tools_meta::Deref; 
+// use derive_tools_meta::Deref;
 // use derive_tools_meta::VariadicFrom;
 
 /// Namespace with dependencies.

module/core/former/tests/inc/former_tests/a_primitives_manual.rs

@@ -203,7 +203,6 @@ where
     return result;
   }
 
-  // xxx : update description
   #[ inline( always ) ]
   pub fn new( on_end : Definition::End ) -> Self
   {

module/core/former/tests/inc/former_tests/only_test/subformer_scalar_subform.rs → module/core/former/tests/inc/former_tests/only_test/subform_scalar.rs

@@ -1,6 +1,6 @@
 
 #[ test ]
-fn child()
+fn subforme_scalar()
 {
 
   let got = Parent::former()

module/core/former/tests/inc/former_tests/subform_all.rs

@@ -16,9 +16,9 @@ pub struct Child
 // #[ derive( Debug, Default, PartialEq ) ]
 pub struct Parent
 {
-  #[ subform_entry( name = _child ) ]
-  #[ subform_collection( name = children2 ) ]
   #[ scalar( name = children3 ) ]
+  #[ subform_collection( name = children2 ) ]
+  #[ subform_entry( name = _child ) ]
   children : Vec< Child >,
 }
 
@@ -51,6 +51,6 @@ where
 
 // == end of generated
 
-include!( "./only_test/subformer_subform_child.rs" );
-include!( "./only_test/subformer_collection_children2.rs" );
+include!( "./only_test/subform_entry_child.rs" );
+include!( "./only_test/subform_collection_children2.rs" );
 include!( "./only_test/scalar_children3.rs" );

module/core/former/tests/inc/former_tests/subform_all_parametrized.rs

@@ -20,9 +20,9 @@ where
 // #[ derive( Debug, Default, PartialEq ) ]
 pub struct Parent< 'child >
 {
-  #[ subform_entry( name = _child ) ]
-  #[ subform_collection( name = children2 ) ]
   #[ scalar( name = children3 ) ]
+  #[ subform_collection( name = children2 ) ]
+  #[ subform_entry( name = _child ) ]
   children : Vec< Child< 'child, str > >,
 }
 
@@ -129,6 +129,6 @@ fn scalar()
 
 }
 
-// include!( "./only_test/subformer_subform_child.rs" );
-// include!( "./only_test/subformer_collection_children2.rs" );
-// include!( "./only_test/subformer_scalar_children3.rs" );
+// include!( "./only_test/subform_entry_child.rs" );
+// include!( "./only_test/subform_collection_children2.rs" );
+// include!( "./only_test/subform_scalar_children3.rs" );

module/core/former/tests/inc/former_tests/subform_all_private.rs

@@ -16,9 +16,9 @@ struct Child
 // #[ derive( Debug, Default, PartialEq ) ]
 struct Parent
 {
-  #[ subform_entry( name = _child ) ]
-  #[ subform_collection( name = children2 ) ]
   #[ scalar( name = children3 ) ]
+  #[ subform_collection( name = children2 ) ]
+  #[ subform_entry( name = _child ) ]
   children : Vec< Child >,
 }
 
@@ -51,6 +51,6 @@ where
 
 // == end of generated
 
-include!( "./only_test/subformer_subform_child.rs" );
-include!( "./only_test/subformer_collection_children2.rs" );
+include!( "./only_test/subform_entry_child.rs" );
+include!( "./only_test/subform_collection_children2.rs" );
 include!( "./only_test/scalar_children3.rs" );

module/core/former/tests/inc/former_tests/subform_collection.rs

@@ -24,4 +24,4 @@ pub struct Parent
 
 // == end of generated
 
-include!( "./only_test/subformer_collection.rs" );
+include!( "./only_test/subform_collection.rs" );

module/core/former/tests/inc/former_tests/subform_collection_implicit.rs

@@ -26,4 +26,4 @@ pub struct Parent
 
 // == end of generated
 
-include!( "./only_test/subformer_collection.rs" );
+include!( "./only_test/subform_collection.rs" );

module/core/former/tests/inc/former_tests/subform_collection_manual.rs

@@ -106,4 +106,4 @@ where
 
 // == end of generated for Parent in context of attribute collection( former::VectorDefinition ) ]
 
-include!( "./only_test/subformer_collection.rs" );
+include!( "./only_test/subform_collection.rs" );

module/core/former/tests/inc/former_tests/subform_collection_named.rs

@@ -40,4 +40,4 @@ where
 
 // == end of generated
 
-include!( "./only_test/subformer_collection_children2.rs" );
+include!( "./only_test/subform_collection_children2.rs" );

module/core/former/tests/inc/former_tests/subform_collection_playground.rs

@@ -31,7 +31,7 @@ pub struct Property< Name >
   code : isize,
 }
 
-// xxx : implement derive new
+// zzz : implement derive new
 /// generated by new
 impl< Name > Property< Name >
 {
@@ -109,4 +109,4 @@ where
 
 // ==
 
-include!( "./only_test/subformer_basic.rs" );
+include!( "./only_test/subform_basic.rs" );

module/core/former/tests/inc/former_tests/subform_collection_setter_off.rs

@@ -48,4 +48,4 @@ where
 
 }
 
-include!( "./only_test/subformer_collection_children2.rs" );
+include!( "./only_test/subform_collection_children2.rs" );

module/core/former/tests/inc/former_tests/subform_collection_setter_on.rs

@@ -41,5 +41,5 @@ where
 
 }
 
-include!( "./only_test/subformer_scalar_children.rs" );
-include!( "./only_test/subformer_collection_children2.rs" );
+include!( "./only_test/subform_scalar_children.rs" );
+include!( "./only_test/subform_collection_children2.rs" );

module/core/former/tests/inc/former_tests/subform_entry.rs

@@ -46,4 +46,4 @@ where
 
 // == end of generated
 
-include!( "./only_test/subformer_subform_child.rs" );
+include!( "./only_test/subform_entry_child.rs" );

module/core/former/tests/inc/former_tests/subform_entry_manual.rs

@@ -118,7 +118,6 @@ where
   // Definition::Types : former::FormerDefinitionTypes< Storage = < Parent as former::EntityToStorage >::Storage >,
 {
 
-  // xxx : rename
   #[ inline( always ) ]
   pub fn _children_subform_entry< Former2, Definition2 >( self ) ->
   Former2
@@ -200,4 +199,4 @@ where
 
 // == end of generated for Parent in context of attribute subform
 
-include!( "./only_test/subformer_subform_child.rs" );
+include!( "./only_test/subform_entry_child.rs" );

module/core/former/tests/inc/former_tests/subform_entry_named.rs

@@ -59,4 +59,4 @@ where
 
 // == end of generated
 
-include!( "./only_test/subformer_subform_child.rs" );
+include!( "./only_test/subform_entry_child.rs" );

module/core/former/tests/inc/former_tests/subform_entry_named_manual.rs

@@ -69,4 +69,4 @@ where
 
 // == end of generated for Parent in context of attribute subform
 
-include!( "./only_test/subformer_subform_child.rs" );
+include!( "./only_test/subform_entry_child.rs" );

module/core/former/tests/inc/former_tests/subform_entry_setter_off.rs

@@ -46,4 +46,4 @@ where
 
 }
 
-include!( "./only_test/subformer_subform_children2.rs" );
+include!( "./only_test/subform_entry_children2.rs" );

module/core/former/tests/inc/former_tests/subform_entry_setter_on.rs

@@ -41,4 +41,4 @@ where
 }
 
 include!( "./only_test/scalar_children.rs" );
-include!( "./only_test/subformer_subform_children2.rs" );
+include!( "./only_test/subform_entry_children2.rs" );

module/core/former/tests/inc/former_tests/subform_scalar.rs

@@ -21,16 +21,8 @@ pub struct Parent
   child : Child,
 }
 
-impl< Definition > ParentFormer< Definition >
-where
-  Definition : former::FormerDefinition< Storage = < Parent as former::EntityToStorage >::Storage >,
-{
-
-}
-
 // == begin of generated
 
 // == end of generated
 
-include!( "./only_test/subformer_scalar_subform.rs" );
-// xxx : uncomment
+include!( "./only_test/subform_scalar.rs" );

module/core/former/tests/inc/former_tests/subform_scalar_manual.rs

@@ -28,7 +28,7 @@ where
 {
 
   #[ inline( always ) ]
-  pub fn _child_scalar_subformer< Former2, Definition2 >( self ) ->
+  pub fn _child_subform_scalar< Former2, Definition2 >( self ) ->
   Former2
   where
     Definition2 : former::FormerDefinition
@@ -60,7 +60,7 @@ where
   pub fn child( self ) ->
   ChildAsSubformer< Self, impl ChildAsSubformerEnd< Self > >
   {
-    self._child_scalar_subformer
+    self._child_subform_scalar
     ::< < Child as former::EntityToFormer< _ > >::Former, _, >()
   }
 
@@ -137,7 +137,4 @@ where
 
 // == end of generated
 
-include!( "./only_test/subformer_scalar_subform.rs" );
-// xxx : uncomment
-// xxx : write few more tests to cover name, setter
-// xxx : extend all test
+include!( "./only_test/subform_scalar.rs" );

module/core/former/tests/inc/former_tests/subform_scalar_name.rs

@@ -0,0 +1,73 @@
+#![ allow( dead_code ) ]
+
+use super::*;
+
+/// Child
+#[ derive( Debug, Default, PartialEq, the_module::Former ) ]
+pub struct Child
+{
+  name : String,
+  data : bool,
+}
+
+/// Parent
+
+#[ derive( Debug, Default, PartialEq, the_module::Former ) ]
+// #[ debug ]
+// #[ derive( Debug, Default, PartialEq ) ]
+pub struct Parent
+{
+  #[ subform_scalar( name = child2 ) ]
+  child : Child,
+}
+
+impl< Definition > ParentFormer< Definition >
+where
+  Definition : former::FormerDefinition< Storage = < Parent as former::EntityToStorage >::Storage >,
+{
+
+  pub fn child()
+  {
+  }
+
+  #[ inline( always ) ]
+  pub fn child3( self ) ->
+  ChildAsSubformer< Self, impl ChildAsSubformerEnd< Self > >
+  {
+    self._child_subform_scalar
+    ::< < Child as former::EntityToFormer< _ > >::Former, _, >()
+  }
+
+}
+
+// == begin of generated
+
+// == end of generated
+
+#[ test ]
+fn subforme_scalar_2()
+{
+
+  let got = Parent::former()
+  .child2().name( "a" ).data( true ).end()
+  .form();
+
+  let exp = Parent { child : Child { name : "a".to_string(), data : true } };
+  a_id!( got, exp );
+
+}
+
+#[ test ]
+fn subforme_scalar_3()
+{
+
+  let got = Parent::former()
+  .child3().name( "a" ).data( true ).end()
+  .form();
+
+  let exp = Parent { child : Child { name : "a".to_string(), data : true } };
+  a_id!( got, exp );
+
+}
+
+// qqq : write tests similar to `subform_all` which apply attributes `scalar`, `subform_entry` and `subform_scalar` on the same field and check all three attribtues don't interfere with each other

module/core/former/tests/inc/mod.rs

@@ -95,11 +95,12 @@ mod former_tests
 
   // = subform scalar
 
-  // xxx
+  #[ cfg( any( not( feature = "no_std" ) ) ) ]
+  mod subform_scalar_manual;
   #[ cfg( any( not( feature = "no_std" ) ) ) ]
   mod subform_scalar;
   #[ cfg( any( not( feature = "no_std" ) ) ) ]
-  mod subform_scalar_manual;
+  mod subform_scalar_name;
 
   // = subform entry