Merge remote-tracking branch 'origin/wca_re_work_help_generation' int…

…o wca_re_work_help_generation

module/move/wca/Readme.md

@@ -27,10 +27,6 @@ The tool to make CLI ( commands user interface ). It is able to aggregate extern
         .property( "property" ).hint( "simple property" ).kind( Type::String ).optional( true ).end()
         .routine( | args : Args, props | { println!( "= Args\n{args:?}\n\n= Properties\n{props:?}\n" ) } )
         .end()
-      .command( "inc" )
-        .hint( "This command increments a state number each time it is called consecutively. (E.g. `.inc .inc`)" )
-        .routine( | ctx : Context | { let i : &mut i32 = ctx.get_or_default(); println!( "i = {i}" ); *i += 1; } )
-        .end()
       .command( "error" )
         .hint( "prints all subjects and properties" )
         .subject().hint( "Error message" ).kind( Type::String ).optional( true ).end()
@@ -63,4 +59,3 @@ cd wTools
 cd examples/wca_trivial
 cargo run
 ```
-

module/move/wca/examples/wca_fluent.rs

@@ -8,6 +8,7 @@
 
 
 use wca::{ Args, Context, Type };
+use std::sync::{ Arc, Mutex };
 
 fn main()
 {
@@ -21,7 +22,13 @@ fn main()
     .end()
   .command( "inc" )
     .hint( "This command increments a state number each time it is called consecutively. (E.g. `.inc .inc`)" )
-    .routine( | ctx : Context | { let i : &mut i32 = ctx.get_or_default(); println!( "i = {i}" ); *i += 1; } )
+    .routine( | ctx : Context |
+    {
+      let i : Arc< Mutex< i32 > > = ctx.get_or_default();
+      let mut i = i.lock().unwrap();
+      println!( "i = {}", i );
+      *i += 1;
+    } )
     .end()
   .command( "error" )
     .hint( "prints all subjects and properties" )

module/move/wca/src/ca/aggregator.rs

@@ -108,11 +108,12 @@ pub( crate ) mod private
     #[ default( Executor::former().form() ) ]
     executor : Executor,
 
-    help_generator : HelpGeneratorFn,
+    help_generator : Option< HelpGeneratorFn >,
     #[ default( HashSet::from([ HelpVariants::All ]) ) ]
     help_variants : HashSet< HelpVariants >,
-    // qqq : for Bohdan : should not have fields help_generator and help_variants
+    // aaa : for Bohdan : should not have fields help_generator and help_variants
     // help_generator generateds VerifiedCommand(s) and stop to exist
+    // aaa : Defaults after formation
 
     // #[ default( Verifier::former().form() ) ]
     #[ default( Verifier ) ]
@@ -239,19 +240,22 @@ pub( crate ) mod private
     {
       let mut ca = self;
 
-      if ca.help_variants.contains( &HelpVariants::All )
+      let help_generator = std::mem::take( &mut ca.help_generator ).unwrap_or_default();
+      let help_variants = std::mem::take( &mut ca.help_variants );
+
+      if help_variants.contains( &HelpVariants::All )
       {
-        HelpVariants::All.generate( &ca.help_generator, &mut ca.dictionary );
+        HelpVariants::All.generate( &help_generator, &mut ca.dictionary );
       }
       else
       {
-        for help in ca.help_variants.iter().sorted()
+        for help in help_variants.iter().sorted()
         {
-          help.generate( &ca.help_generator, &mut ca.dictionary );
+          help.generate( &help_generator, &mut ca.dictionary );
         }
       }
 
-      dot_command( &mut ca.dictionary );
+      dot_command( &help_generator, &mut ca.dictionary );
 
       ca
     }

module/move/wca/src/ca/executor/context.rs

@@ -50,11 +50,10 @@ pub( crate ) mod private
     /// Initialize Context with some value
     pub fn with< T : CloneAny >( mut self, value : T ) -> Self
     {
-      if self.storage.inner.is_none()
-      {
-        self.storage.inner = Some( Arc::new( RefCell::new( Map::< dyn CloneAny >::new() ) ) );
-      }
-      self.storage.inner.as_ref().map( | inner | inner.borrow_mut().insert( value ) );
+      let inner = self.storage.inner.unwrap_or_else( || Context::default().inner );
+      inner.borrow_mut().insert( value );
+
+      self.storage.inner = Some( inner );
       self
     }
   }
@@ -81,46 +80,39 @@ pub( crate ) mod private
        self.inner.borrow_mut().remove::< T >()
      }
 
-    // qqq : Bohdan : why unsafe?
-    /// Return immutable reference on interior object. ! Unsafe !
-    pub fn get_ref< T : CloneAny >( &self ) -> Option< &T >
-    {
-      unsafe{ self.inner.as_ptr().as_ref()?.get() }
-    }
+    // aaa : Bohdan : why unsafe?
+    // aaa : re-worked.
 
-    /// Return mutable reference on interior object. ! Unsafe !
-    pub fn get_mut< T : CloneAny >( &self ) -> Option< &mut T >
+    /// Return immutable reference on interior object.
+    pub fn get< T : CloneAny + Clone >( &self ) -> Option< T >
     {
-      unsafe { self.inner.as_ptr().as_mut()?.get_mut() }
+      self.inner.borrow().get().cloned()
     }
 
     /// Insert the value if it doesn't exists, or take an existing value and return mutable reference to it
-    pub fn get_or_insert< T : CloneAny >( &self, value : T ) -> &mut T
+    pub fn get_or_insert< T : CloneAny + Clone >( &self, value : T ) -> T
     {
-      if let Some( value ) = self.get_mut()
+      if let Some( value ) = self.get()
       {
         value
       }
       else
       {
         self.insert( value );
-        self.get_mut().unwrap()
+        self.get().unwrap()
       }
     }
 
     /// Insert default value if it doesn't exists, or take an existing value and return mutable reference to it
-    pub fn get_or_default< T : CloneAny + Default >( &self ) -> &mut T
+    pub fn get_or_default< T : CloneAny + Default + Clone >( &self ) -> T
     {
       self.get_or_insert( T::default() )
     }
 
-    /// Make a deep clone of the context
-    // qqq : for Bohdan : why is it deep? how is it deep?
-    // qqq : how is it useful? Is it? Examples?
-    pub( crate ) fn deep_clone( &self ) -> Self
-    {
-      Self { inner : Arc::new( RefCell::new( ( *self.inner ).borrow_mut().clone() ) ) }
-    }
+    // aaa : for Bohdan : why is it deep? how is it deep?
+    // aaa : how is it useful? Is it? Examples?
+    //
+    // aaa : removed
   }
 }
 

module/move/wca/src/ca/executor/executor.rs

@@ -4,6 +4,8 @@ pub( crate ) mod private
 
   use ca::executor::runtime::_exec_command;
   use wtools::error::Result;
+  use std::sync::Arc;
+  use std::sync::atomic::Ordering;
 
   // aaa : for Bohdan : how is it useful? where is it used?
   // aaa : `ExecutorType` has been removed
@@ -55,10 +57,10 @@ pub( crate ) mod private
     {
       while !runtime.is_finished()
       {
-        let state = runtime.context.get_or_default::< RuntimeState >();
-        state.pos = runtime.pos + 1;
+        let state = runtime.context.get_or_default::< Arc< RuntimeState > >();
+        state.pos.store( runtime.pos + 1, Ordering::Release );
         runtime.r#do( &dictionary )?;
-        runtime.pos = runtime.context.get_ref::< RuntimeState >().unwrap().pos;
+        runtime.pos = runtime.context.get::< Arc< RuntimeState > >().unwrap().pos.load( Ordering::Relaxed );
       }
 
       Ok( () )

module/move/wca/src/ca/executor/runtime.rs

@@ -2,6 +2,8 @@ pub( crate ) mod private
 {
   use crate::*;
   use wtools::{ error::Result, err };
+  use std::sync::Arc;
+  use std::sync::atomic::AtomicUsize;
 
   /// State of a program runtime
   ///
@@ -24,7 +26,7 @@ pub( crate ) mod private
   pub struct RuntimeState
   {
     /// current execution position that can be changed by user
-    pub pos : usize,
+    pub pos : Arc< AtomicUsize >,
   }
   // qqq : for Bohdan : why? how is it useful? is it?