former : experimenting

module/core/former/examples/former_custom_subformer.rs

@@ -96,3 +96,6 @@ fn main()
   // >     },
   // > }
 }
+
+// xxx2 : finish example former_custom_subformer
+

module/core/former/tests/inc/former_tests/only_test/subformer_container_children2.rs

@@ -0,0 +1,21 @@
+
+#[ test ]
+fn container()
+{
+
+  let got = Parent::former()
+  .children2()
+    .add( Child::former().name( "a" ).form() )
+    .add( Child::former().name( "b" ).form() )
+    .end()
+  .form();
+
+  let children = vec!
+  [
+    Child { name : "a".to_string(), is_mandatory : false },
+    Child { name : "b".to_string(), is_mandatory : false },
+  ];
+  let exp = Parent { children };
+  a_id!( got, exp );
+
+}

module/core/former/tests/inc/former_tests/only_test/subformer_scalar_children.rs

@@ -0,0 +1,23 @@
+
+#[ test ]
+fn scalar()
+{
+
+  let children = vec!
+  [
+    Child { name : "a".to_string(), is_mandatory : false },
+    Child { name : "b".to_string(), is_mandatory : false },
+  ];
+  let got = Parent::former()
+  .children( children )
+  .form();
+
+  let children = vec!
+  [
+    Child { name : "a".to_string(), is_mandatory : false },
+    Child { name : "b".to_string(), is_mandatory : false },
+  ];
+  let exp = Parent { children };
+  a_id!( got, exp );
+
+}

module/core/former/tests/inc/former_tests/only_test/subformer_subform_children2.rs

@@ -0,0 +1,19 @@
+
+#[ test ]
+fn subform()
+{
+
+  let got = Parent::former()
+  .children2( "a" ).end()
+  .children2( "b" ).end()
+  .form();
+
+  let children = vec!
+  [
+    Child { name : "a".to_string(), is_mandatory : false },
+    Child { name : "b".to_string(), is_mandatory : false },
+  ];
+  let exp = Parent { children };
+  a_id!( got, exp );
+
+}

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

@@ -49,23 +49,4 @@ where
 
 }
 
-#[ test ]
-fn container()
-{
-
-  let got = Parent::former()
-  .children2()
-    .add( Child::former().name( "a" ).form() )
-    .add( Child::former().name( "b" ).form() )
-    .end()
-  .form();
-
-  let children = vec!
-  [
-    Child { name : "a".to_string(), is_mandatory : false },
-    Child { name : "b".to_string(), is_mandatory : false },
-  ];
-  let exp = Parent { children };
-  a_id!( got, exp );
-
-}
+include!( "./only_test/subformer_container_children2.rs" );

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

@@ -41,46 +41,5 @@ where
 
 }
 
-#[ test ]
-fn scalar()
-{
-
-  let children = vec!
-  [
-    Child { name : "a".to_string(), is_mandatory : false },
-    Child { name : "b".to_string(), is_mandatory : false },
-  ];
-  let got = Parent::former()
-  .children( children )
-  .form();
-
-  let children = vec!
-  [
-    Child { name : "a".to_string(), is_mandatory : false },
-    Child { name : "b".to_string(), is_mandatory : false },
-  ];
-  let exp = Parent { children };
-  a_id!( got, exp );
-
-}
-
-#[ test ]
-fn container()
-{
-
-  let got = Parent::former()
-  .children2()
-    .add( Child::former().name( "a" ).form() )
-    .add( Child::former().name( "b" ).form() )
-    .end()
-  .form();
-
-  let children = vec!
-  [
-    Child { name : "a".to_string(), is_mandatory : false },
-    Child { name : "b".to_string(), is_mandatory : false },
-  ];
-  let exp = Parent { children };
-  a_id!( got, exp );
-
-}
+include!( "./only_test/subformer_scalar_children.rs" );
+include!( "./only_test/subformer_container_children2.rs" );

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

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

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

@@ -18,7 +18,7 @@ pub struct Parent
 {
   // #[ subform ]
   #[ subform( name = _child ) ]
-  #[ container( former::VectorDefinition ) ]
+  #[ container( definition = former::VectorDefinition ) ]
   // #[ scalar_setter( false ) ]
   children : Vec< Child >,
 }
@@ -44,5 +44,5 @@ where
 
 // == end of generated
 
-include!( "./only_test/subformer_subform.rs" );
+include!( "./only_test/subformer_subform_child.rs" );
 include!( "./only_test/subformer_container.rs" );

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

@@ -47,5 +47,5 @@ pub struct Child< 'child, T >
 
 // == end of generated
 
-// include!( "./only_test/subformer_subform.rs" );
+// include!( "./only_test/subformer_subform_child.rs" );
 // include!( "./only_test/subformer_container.rs" );

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

@@ -55,3 +55,5 @@ fn basic()
   a_id!( got.command.len(), 2 );
 
 }
+
+// xxx2 : finish example former_custom_subformer

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

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

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

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

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

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

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

@@ -49,21 +49,4 @@ where
 
 }
 
-#[ test ]
-fn subform()
-{
-
-  let got = Parent::former()
-  .children2( "a" ).end()
-  .children2( "b" ).end()
-  .form();
-
-  let children = vec!
-  [
-    Child { name : "a".to_string(), is_mandatory : false },
-    Child { name : "b".to_string(), is_mandatory : false },
-  ];
-  let exp = Parent { children };
-  a_id!( got, exp );
-
-}
+include!( "./only_test/subformer_subform_children2.rs" );

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

@@ -40,44 +40,5 @@ where
 
 }
 
-#[ test ]
-fn scalar()
-{
-
-  let children = vec!
-  [
-    Child { name : "a".to_string(), is_mandatory : false },
-    Child { name : "b".to_string(), is_mandatory : false },
-  ];
-  let got = Parent::former()
-  .children( children )
-  .form();
-
-  let children = vec!
-  [
-    Child { name : "a".to_string(), is_mandatory : false },
-    Child { name : "b".to_string(), is_mandatory : false },
-  ];
-  let exp = Parent { children };
-  a_id!( got, exp );
-
-}
-
-#[ test ]
-fn subform()
-{
-
-  let got = Parent::former()
-  .children2( "a" ).end()
-  .children2( "b" ).end()
-  .form();
-
-  let children = vec!
-  [
-    Child { name : "a".to_string(), is_mandatory : false },
-    Child { name : "b".to_string(), is_mandatory : false },
-  ];
-  let exp = Parent { children };
-  a_id!( got, exp );
-
-}
+include!( "./only_test/subformer_scalar_children.rs" );
+include!( "./only_test/subformer_subform_children2.rs" );

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

@@ -83,12 +83,12 @@ mod former_tests
   #[ cfg( any( not( feature = "no_std" ) ) ) ]
   mod subformer_subform_setter_on;
 
-//   #[ cfg( any( not( feature = "no_std" ) ) ) ]
-//   mod subformer_subform_hashmap;
-//   #[ cfg( any( not( feature = "no_std" ) ) ) ]
-//   mod subformer_subform_hashmap_explicit;
-  // #[ cfg( any( not( feature = "no_std" ) ) ) ]
-  // mod subformer_subform_and_container;
+  #[ cfg( any( not( feature = "no_std" ) ) ) ]
+  mod subformer_subform_hashmap;
+  #[ cfg( any( not( feature = "no_std" ) ) ) ]
+  mod subformer_subform_hashmap_explicit;
+  #[ cfg( any( not( feature = "no_std" ) ) ) ]
+  mod subformer_subform_and_container;
   // #[ cfg( any( not( feature = "no_std" ) ) ) ]
   // mod subformer_subform_and_container_parametrized;