Merge pull request #1336 from Wandalen/program_tools_v1

Program tools v1
Wandalen · May 14, 2024 · b0c751c · b0c751c
2 parents 7c05536 + 91e8ea0
commit b0c751c
Show file tree

Hide file tree

Showing 18 changed files with 208 additions and 88 deletions.
diff --git a/module/core/former/tests/inc/former_tests/name_collision_context.rs b/module/core/former/tests/inc/former_tests/name_collision_context.rs
@@ -3,13 +3,17 @@
 #[ allow( unused_imports ) ]
 use super::*;
 
+
+pub mod core {}
+pub mod std {}
+pub mod marker {}
 pub trait CloneAny{}
-pub trait End{}
+// pub trait Context{}
 pub trait Formed{}
 pub trait OnEnd{}
 
 #[ derive( Clone, the_module::Former ) ]
 pub struct Context
 {
-  inner : std::sync::Arc< core::cell::RefCell< dyn CloneAny > >
+  inner : ::std::sync::Arc< ::core::cell::RefCell< dyn CloneAny > >
 }
diff --git a/module/core/former/tests/inc/former_tests/name_collision_core.rs b/module/core/former/tests/inc/former_tests/name_collision_core.rs
@@ -0,0 +1,19 @@
+#![ allow( dead_code ) ]
+#![ allow( non_camel_case_types ) ]
+
+#[ allow( unused_imports ) ]
+use super::*;
+
+// pub mod core {}
+pub mod std {}
+pub mod marker {}
+pub trait CloneAny{}
+pub trait Context{}
+pub trait Formed{}
+pub trait OnEnd{}
+
+#[ derive( Clone, the_module::Former ) ]
+pub struct core
+{
+  inner : ::std::sync::Arc< ::core::cell::RefCell< dyn CloneAny > >
+}
diff --git a/module/core/former/tests/inc/former_tests/name_collision_end.rs b/module/core/former/tests/inc/former_tests/name_collision_end.rs
@@ -3,6 +3,9 @@
 #[ allow( unused_imports ) ]
 use super::*;
 
+pub mod core {}
+pub mod std {}
+pub mod marker {}
 pub trait CloneAny{}
 pub trait Context{}
 pub trait Formed{}
@@ -13,7 +16,7 @@ pub trait OnEnd{}
 // #[ derive( Clone ) ]
 pub struct End
 {
-  inner : std::sync::Arc< core::cell::RefCell< dyn CloneAny > >
+  inner : ::std::sync::Arc< ::core::cell::RefCell< dyn CloneAny > >
 }
 
 // = begin_coercing of generated

diff --git a/module/core/former/tests/inc/former_tests/name_collision_former_hashmap_without_parameter.rs b/module/core/former/tests/inc/former_tests/name_collision_former_hashmap_without_parameter.rs
@@ -1,6 +1,14 @@
 use super::*;
 use the_module::Former;
 
+pub mod core {}
+pub mod std {}
+pub mod marker {}
+pub trait CloneAny{}
+pub trait Context{}
+pub trait Formed{}
+pub trait OnEnd{}
+
 #[ derive( Debug, PartialEq ) ]
 struct HashMap< T >
 {

diff --git a/module/core/former/tests/inc/former_tests/name_collision_former_vector_without_parameter.rs b/module/core/former/tests/inc/former_tests/name_collision_former_vector_without_parameter.rs
@@ -1,6 +1,14 @@
 use super::*;
 use the_module::Former;
 
+pub mod core {}
+pub mod std {}
+pub mod marker {}
+pub trait CloneAny{}
+pub trait Context{}
+pub trait Formed{}
+pub trait OnEnd{}
+
 #[ derive( Debug, PartialEq ) ]
 struct Vec
 {

diff --git a/module/core/former/tests/inc/former_tests/name_collision_on_end.rs b/module/core/former/tests/inc/former_tests/name_collision_on_end.rs
@@ -3,12 +3,16 @@
 #[ allow( unused_imports ) ]
 use super::*;
 
+pub mod core {}
+pub mod std {}
+pub mod marker {}
 pub trait CloneAny{}
 pub trait Context{}
-pub trait End{}
+pub trait Formed{}
+// pub trait OnEnd{}
 
 #[ derive( Clone, the_module::Former ) ]
 pub struct OnEnd
 {
-  inner : std::sync::Arc< core::cell::RefCell< dyn CloneAny > >
+  inner : ::std::sync::Arc< ::core::cell::RefCell< dyn CloneAny > >
 }
diff --git a/module/core/former/tests/inc/former_tests/name_collisions.rs b/module/core/former/tests/inc/former_tests/name_collisions.rs
@@ -1,6 +1,13 @@
 #[ allow( unused_imports ) ]
 use super::*;
 
+pub mod core {}
+pub mod std {}
+pub trait CloneAny{}
+pub trait Context{}
+pub trait Formed{}
+pub trait OnEnd{}
+
 #[ allow( dead_code ) ]
 type Option = ();
 #[ allow( dead_code ) ]
@@ -28,8 +35,8 @@ type HashMap = ();
 pub struct Struct1
 {
   vec_1 : Vec< String >,
-  hashmap_1 : std::collections::HashMap< String, String >,
-  hashset_1 : std::collections::HashSet< String >,
+  hashmap_1 : ::std::collections::HashMap< String, String >,
+  hashset_1 : ::std::collections::HashSet< String >,
 }
 
 //

diff --git a/module/core/former/tests/inc/former_tests/only_test/basic.rs b/module/core/former/tests/inc/former_tests/only_test/basic.rs
@@ -16,9 +16,9 @@ tests_impls!
     a_id!( former.context, None );
     a_id!( print!( "{:?}", former.on_end ), print!( "{:?}", Some( the_module::ReturnPreformed ) ) );
     let former2 = Struct1Former::< Struct1FormerDefinition< (), Struct1, former::ReturnPreformed > >::new_coercing( former::ReturnPreformed );
-    a_id!( std::mem::size_of_val( &former ), std::mem::size_of_val( &former2 ) );
+    a_id!( ::std::mem::size_of_val( &former ), ::std::mem::size_of_val( &former2 ) );
     let former2 = Struct1Former::< Struct1FormerDefinition< (), Struct1, former::ReturnPreformed > >::new( former::ReturnPreformed );
-    a_id!( std::mem::size_of_val( &former ), std::mem::size_of_val( &former2 ) );
+    a_id!( ::std::mem::size_of_val( &former ), ::std::mem::size_of_val( &former2 ) );
 
     let command = Struct1::former().form();
     a_id!( command.int_1, 0 );
@@ -255,7 +255,7 @@ tests_impls!
     // basic case
     let former = Struct1::former();
     let former2 = Struct1Former::< Struct1FormerDefinition< (), Struct1, former::ReturnPreformed > >::new( former::ReturnPreformed );
-    a_id!( std::mem::size_of_val( &former ), std::mem::size_of_val( &former2 ) );
+    a_id!( ::std::mem::size_of_val( &former ), ::std::mem::size_of_val( &former2 ) );
     let exp = former.form();
     let got = former2.form();
     a_id!( got, exp );
@@ -324,7 +324,7 @@ tests_impls!
     // basic case
     let former = Struct1::former();
     let former2 = Struct1Former::< Struct1FormerDefinition< (), Struct1, former::ReturnPreformed > >::new( former::ReturnPreformed );
-    a_id!( std::mem::size_of_val( &former ), std::mem::size_of_val( &former2 ) );
+    a_id!( ::std::mem::size_of_val( &former ), ::std::mem::size_of_val( &former2 ) );
     let exp = former.form();
     let got = former2.form();
     a_id!( got, exp );

diff --git a/module/core/former/tests/inc/former_tests/only_test/collections_with_subformer.rs b/module/core/former/tests/inc/former_tests/only_test/collections_with_subformer.rs
@@ -51,12 +51,12 @@ tests_impls!
     let former = Struct1::former();
     a_id!( print!( "{:?}", former.on_end ), print!( "{:?}", Some( the_module::ReturnPreformed ) ) );
     let former2 = Struct1Former::< Struct1FormerDefinition >::new_coercing( former::ReturnPreformed );
-    a_id!( std::mem::size_of_val( &former ), std::mem::size_of_val( &former2 ) );
+    a_id!( ::std::mem::size_of_val( &former ), ::std::mem::size_of_val( &former2 ) );
 
     // default parameters
     let former = Struct1::former();
     let former2 : Struct1Former = Struct1Former::new_coercing( former::ReturnPreformed );
-    a_id!( std::mem::size_of_val( &former ), std::mem::size_of_val( &former2 ) );
+    a_id!( ::std::mem::size_of_val( &former ), ::std::mem::size_of_val( &former2 ) );
 
     // closure without helper
     let got : Struct1 = Struct1Former

diff --git a/module/core/former/tests/inc/former_tests/only_test/collections_without_subformer.rs b/module/core/former/tests/inc/former_tests/only_test/collections_without_subformer.rs
@@ -20,7 +20,7 @@ tests_impls!
     a_id!( former.context, None );
     a_id!( print!( "{:?}", former.on_end ), print!( "{:?}", Some( the_module::ReturnPreformed ) ) );
     let former2 = Struct1Former::< Struct1FormerDefinition >::new_coercing( the_module::ReturnPreformed );
-    a_id!( std::mem::size_of_val( &former ), std::mem::size_of_val( &former2 ) );
+    a_id!( ::std::mem::size_of_val( &former ), ::std::mem::size_of_val( &former2 ) );
 
     let command = Struct1::former().form();
     a_id!( command.vec_1, Vec::< String >::new() );

diff --git a/module/core/former/tests/inc/former_tests/only_test/subform_basic.rs b/module/core/former/tests/inc/former_tests/only_test/subform_basic.rs
@@ -13,7 +13,7 @@
 // ;
 // ca.execute( input ).unwrap();
 
-// qqq : for Antont : zzz : here and in all similar tests remove `#[ cfg( not( feature = "use_alloc" ) ) ]`
+// qqq : for Anton : zzz : here and in all similar tests remove `#[ cfg( not( feature = "use_alloc" ) ) ]`
 #[ cfg( not( feature = "use_alloc" ) ) ]
 #[ test ]
 fn command_with_closure()

diff --git a/module/core/former/tests/inc/mod.rs b/module/core/former/tests/inc/mod.rs
@@ -42,6 +42,7 @@ mod former_tests
   mod name_collision_context;
   mod name_collision_end;
   mod name_collision_on_end;
+  mod name_collision_core;
 
   // = parametrization
 

diff --git a/module/core/former_meta/src/derive_former.rs b/module/core/former_meta/src/derive_former.rs
@@ -400,7 +400,7 @@ specific needs of the broader forming context. It mandates the implementation of
     where
       #former_definition_types_generics_where
     {
-      // _phantom : core::marker::PhantomData< ( __Context, __Formed ) >,
+      // _phantom : ::core::marker::PhantomData< ( __Context, __Formed ) >,
       _phantom : #former_definition_types_phantom,
     }
 
@@ -413,7 +413,7 @@ specific needs of the broader forming context. It mandates the implementation of
       {
         Self
         {
-          _phantom : core::marker::PhantomData,
+          _phantom : ::core::marker::PhantomData,
         }
       }
     }
@@ -436,7 +436,7 @@ specific needs of the broader forming context. It mandates the implementation of
     where
       #former_definition_generics_where
     {
-      // _phantom : core::marker::PhantomData< ( __Context, __Formed, __End ) >,
+      // _phantom : ::core::marker::PhantomData< ( __Context, __Formed, __End ) >,
       _phantom : #former_definition_phantom,
     }
 
@@ -449,7 +449,7 @@ specific needs of the broader forming context. It mandates the implementation of
       {
         Self
         {
-          _phantom : core::marker::PhantomData,
+          _phantom : ::core::marker::PhantomData,
         }
       }
     }
@@ -544,10 +544,10 @@ specific needs of the broader forming context. It mandates the implementation of
       pub storage : Definition::Storage,
       /// An optional context providing additional data or state necessary for custom
       ///   formation logic or to facilitate this former's role as a subformer within another former.
-      pub context : core::option::Option< Definition::Context >,
+      pub context : ::core::option::Option< Definition::Context >,
       /// An optional closure or handler that is invoked to transform the accumulated
       ///   temporary storage into the final object structure once formation is complete.
-      pub on_end : core::option::Option< Definition::End >,
+      pub on_end : ::core::option::Option< Definition::End >,
     }
 
     #[ automatically_derived ]
@@ -587,8 +587,8 @@ specific needs of the broader forming context. It mandates the implementation of
       #[ inline( always ) ]
       pub fn begin
       (
-        mut storage : core::option::Option< Definition::Storage >,
-        context : core::option::Option< Definition::Context >,
+        mut storage : ::core::option::Option< Definition::Storage >,
+        context : ::core::option::Option< Definition::Context >,
         on_end : < Definition as former::FormerDefinition >::End,
       )
       -> Self
@@ -611,8 +611,8 @@ specific needs of the broader forming context. It mandates the implementation of
       #[ inline( always ) ]
       pub fn begin_coercing< IntoEnd >
       (
-        mut storage : core::option::Option< Definition::Storage >,
-        context : core::option::Option< Definition::Context >,
+        mut storage : ::core::option::Option< Definition::Storage >,
+        context : ::core::option::Option< Definition::Context >,
         on_end : IntoEnd,
       ) -> Self
       where
@@ -714,8 +714,8 @@ specific needs of the broader forming context. It mandates the implementation of
       #[ inline( always ) ]
       fn former_begin
       (
-        storage : core::option::Option< Definition::Storage >,
-        context : core::option::Option< Definition::Context >,
+        storage : ::core::option::Option< Definition::Storage >,
+        context : ::core::option::Option< Definition::Context >,
         on_end : Definition::End,
       )
       -> Self

diff --git a/module/core/macro_tools/src/phantom.rs b/module/core/macro_tools/src/phantom.rs
@@ -116,7 +116,7 @@ pub( crate ) mod private
   /// let generics: Punctuated< GenericParam, Comma > = parse_quote! { 'a, T, const N : usize };
   /// let phantom_type = tuple( &generics );
   /// println!( "{}", quote::quote! { #phantom_type } );
-  /// // Output: core::marker::PhantomData< ( &'a (), *const T, N ) >
+  /// // Output : ::core::marker::PhantomData< ( &'a (), *const T, N ) >
   /// ```
   ///
   pub fn tuple( input : &syn::punctuated::Punctuated< syn::GenericParam, syn::token::Comma > ) -> syn::Type
@@ -165,7 +165,7 @@ pub( crate ) mod private
 
     let result : syn::Type = syn::parse_quote!
     {
-      core::marker::PhantomData< #generics_tuple_type >
+      ::core::marker::PhantomData< #generics_tuple_type >
     };
 
     result