Changeset 945

Timestamp:

05/17/10 17:54:44 (15 years ago)

Author:

mido

Message:

patch of UI and log_levels to obtain nicer and mainly compilable source code.)

Location:

library/bdm

Files:

• base/bdmbase.h (modified) (4 diffs)
• base/user_info.h (modified) (1 diff)
• bdmroot.h (modified) (1 diff)

library/bdm/base/bdmbase.h

@@ -406 +406 @@
 //! This class stores a details that will be logged to a logger
 template<class T> class log_level_template : public log_level_base<T> {
-public:
+protected:
+        //! boolean flags related indicating which details will be logged to a logger
+        bitset<32> values;
+
+public:
+
+        //! read only operator for testing individual fields of log_level
+        //!
+        //! it is necessary to acces it with a proper enumeration type, thus this approach is type-safe
+        bool operator [] (const enum T::log_level_enums &log_level_enum ) const
+        {
+                return values[log_level_enum];
+        }
+
+        //! operator for setting an individual field of log_level 
+        //!
+        //! it is necessary to acces it with a proper enumeration type, thus this approach is type-safe
+        bitset<32>::reference operator [] (const enum T::log_level_enums &log_level_enum )
+        {
+                return values[log_level_enum];
+        }
+
+        //! Set log_levels according to the Setting element
+        void from_setting ( const Setting &element )
+        {
+                string raw_log_level;
+                UI::get( raw_log_level, element );
+                Array<string> loaded_log_level = string2Array( raw_log_level );
+        
+                values.reset();
+
+                for( int i = 0; i < loaded_log_level.length(); i++ )
+                        for( int j = 0; j < names().length(); j++ ){
+                                if( loaded_log_level(i) == names()(j)  ) 
+                                {
+                                        values[j] = true;
+                                        break;
+                                } 
+                        }
+        }
+
+        //! Store log_levels into the Setting element
+        void to_setting ( Setting &element ) const 
+        {
+                // HERE WE WANT NOT TO DELETE PREVIOUS DATA STORED BY OTHER LOG_LEVELS, SEE SPECIAL IMPLEMENTATION OF UI::GET(...) FOR THIS CLASS
+                string string_to_write =  ( const char* ) element;
+
+                for( unsigned int i = 0; i < values.size(); i++ )
+                        if( values[i] ) 
+                        {
+                                if( string_to_write.length() > 0 )
+                                        string_to_write = string_to_write + ',';
+                                string_to_write = string_to_write + names()(i);
+                        }
+                        
+                element = string_to_write;
+        }
+
         //! This method stores a vector to the proper place in registered logger 
         //!
@@ -430 +487 @@
         //!
         //! parameter \c enum_subindex identifies the precise position of setting in the case there is more settings registered to with this enum
-        //!
-        //! If this method was not templated, we could store whole body of this class in cpp file without explicitly touching registered_logger->log_setting(...) here.
-        //! (it would not be straightforward, though, still there are some enums which had to be converted into integers but it could be done without loosing type control)
-        //! This way, it would not be necessary to declare log_level_base<T> class and we could declare log_level_template<T>
-        //! before the logger class itself with a mere foroward declaration of logger. In our case, however, touching of registered_logger->log_setting
-        //! implies that forward declaration is not enough and we are lost in a circle. And just by cutting this circle we obtains log_level_base<T> class. 
         template<class U> void store( const enum T::log_level_enums log_level_enum, const U data, int enum_subindex = 0 ) const
         {                       
@@ -443 +494 @@
         }
 };
+//UIREGISTER IS FORBIDDEN FOR THIS CLASS,  AS IT SHOULD BE LOADED ONLY THROUGH THE SPECIALIZED UI::GET(...) METHOD
+
 
 /*!
@@ -459 +512 @@
   \ref ui
 */
-#define LOG_LEVEL(classname,...) public: enum log_level_enums { __VA_ARGS__ }; log_level_template<classname> log_level; private: friend class log_level_template<classname>; friend class log_level_base<classname>; static const Array<string> &log_level_names() { static const Array<string> log_level_names = log_level_base<classname>::string2Array( #__VA_ARGS__ ); return log_level_names; }
+#define LOG_LEVEL(classname,...) public: enum log_level_enums { __VA_ARGS__ }; log_level_template<classname> log_level; private: friend class log_level_base<classname>; static const Array<string> &log_level_names() { static const Array<string> log_level_names = log_level_template<classname>::string2Array( #__VA_ARGS__ ); return log_level_names; }
 
 

library/bdm/base/user_info.h

@@ -229 +229 @@
 
 
-//! This class stores the details which will be logged to a logger
-//!
-//! This is only the first part of the whole declaration, which has to be however separated into
-//! two different classes for allowing the compilation of source code. For more details
-//! see logger::add_setting(...) method and mainly log_level_template<T>::template<class U> void store( const enum T::log_level_enums log_level_enum, const U data ) const
-//! method. For the reason the second one is templated, it was necessary to declare this whole class. 
-template<class T> class log_level_base : public root {
-private:
-        //! this is necessary to allow logger to set ids vector appropriately and also to set registered_logger
-        friend class logger; 
-
-protected:
-        //! boolean flags related indicating which details will be logged to a logger
-        bitset<32> values;
-        
-        //! vector of vectors of log IDs - one element for each entry and multiple entries can be stored on the position of one enum
-        Vec<ivec> ids;
-
-        //! internal pointer to the logger to which this log_level is registered
-        //! 
-        //! it is set to NULL at the beginning
-        logger * registered_logger;
-
-public:
-
-        //! default constructor
-        log_level_base( ) {
-                registered_logger = NULL;
-                int len = names().length();
-                ids.set_size( len );
-                for( int i = 0; i<len; i++ )
-                {
-                        ids(i).set_size ( 1 );
-                        ids(i) = -1;
-                }
-        }
-
-        //! a general utility transforming a comma-separated sequence of strings into an instance of Array<strings>
-        static Array<string> string2Array( const string &input )
-        {
-                string result = input;
-                string::size_type loc;
-                while( loc = result.find( ',' ), loc != string::npos )
-                        result[loc] = ' ';
-                return Array<string>("{ " + result + " }" );
-        }
-
-
-
-        //! Set log_levels according to the Setting element
-        void from_setting ( const Setting &element )
-        {
-                string raw_log_level;
-                UI::get( raw_log_level, element );
-                Array<string> loaded_log_level = log_level_base::string2Array( raw_log_level );
-        
-                values.reset();
-
-                for( int i = 0; i < loaded_log_level.length(); i++ )
-                        for( int j = 0; j < names().length(); j++ ){
-                                if( loaded_log_level(i) == names()(j)  ) 
-                                {
-                                        values[j] = true;
-                                        break;
-                                } 
-                        }
-        }
-
-        //! Store log_levels into the Setting element
-        void to_setting ( Setting &element ) const 
-        {
-                // HERE WE WANT NOT TO DELETE PREVIOUS DATA STORED BY OTHER LOG_LEVELS, SEE SPECIAL IMPLEMENTATION OF UI::GET(...) FOR THIS CLASS
-                string string_to_write =  ( const char* ) element;
-
-                for( unsigned int i = 0; i < values.size(); i++ )
-                        if( values[i] ) 
-                        {
-                                if( string_to_write.length() > 0 )
-                                        string_to_write = string_to_write + ',';
-                                string_to_write = string_to_write + names()(i);
-                        }
-                        
-                element = string_to_write;
-        }
-
-        //! this method adds new id to its proper position and return the name of this position
-        string store_id_and_give_name( enum T::log_level_enums const log_level_enum,  int enum_subindex, int id ) {
-                if( ids(log_level_enum).length() <= enum_subindex )
-                        ids(log_level_enum).set_size( enum_subindex+1, true );
-                ids(log_level_enum)(enum_subindex) = id; 
-
-                // here we remove a "log" prefix from name, i.e., for instance it transforms "logevidence" to "evidence"
-                ostringstream stream;
-                string name_with_prefix = names()(log_level_enum);
-                string possible_log_prefix = name_with_prefix.substr(0,3);
-                if( possible_log_prefix == "log" )
-                        stream << name_with_prefix.substr(3,name_with_prefix.length()-3);
-                else 
-                        stream << name_with_prefix;
-
-                // add number to name only in the case there are more registered vectors with the same log_level_enum
-                if( ids(log_level_enum).length() > 1 )
-                        stream << "*" << enum_subindex;
-                
-                return stream.str();
-        }
-
-        //! string equivalents of the used enumerations which are filled with a help of #LOG_LEVEL macro within class T
-        const Array<string> &names() const
-        {
-                return T::log_level_names();
-        }
-
-        //! read only operator for testing individual fields of log_level
-        //!
-        //! it is necessary to acces it with a proper enumeration type, thus this approach is type-safe
-        bool operator [] (const enum T::log_level_enums &log_level_enum ) const
-        {
-                return values[log_level_enum];
-        }
-
-        //! operator for setting an individual field of log_level 
-        //!
-        //! it is necessary to acces it with a proper enumeration type, thus this approach is type-safe
-        bitset<32>::reference operator [] (const enum T::log_level_enums &log_level_enum )
-        {
-                return values[log_level_enum];
-        }
-};
-//UIREGISTER IS FORBIDDEN FOR THIS CLASS,  AS IT SHOULD BE LOADED ONLY THROUGH THE SPECIALIZED UI::GET(...) METHOD
 
 /*!

library/bdm/bdmroot.h

@@ -194 +194 @@
 };
 
+//! This class stores the details which will be logged to a logger
+//!
+//! This is only the first part of the whole declaration, which has to be however separated into
+//! two different classes for allowing the compilation of source code. For more details
+//! see logger::add_setting(...) method and mainly log_level_template<T>::template<class U> void store( const enum T::log_level_enums log_level_enum, const U data ) const
+//! method. For the reason the second one is templated, it was necessary to declare this whole class. 
+template<class T> class log_level_base : public root {
+private:
+        //! this is necessary to allow logger to set ids vector appropriately and also to set registered_logger
+        friend class logger; 
+
+
+        //! this method adds new id to its proper position and return the name of this position
+        string store_id_and_give_name( enum T::log_level_enums const log_level_enum,  int enum_subindex, int id ) {
+                if( ids(log_level_enum).length() <= enum_subindex )
+                        ids(log_level_enum).set_size( enum_subindex+1, true );
+                ids(log_level_enum)(enum_subindex) = id; 
+
+                // here we remove a "log" prefix from name, i.e., for instance it transforms "logevidence" to "evidence"
+                ostringstream stream;
+                string name_with_prefix = names()(log_level_enum);
+                string possible_log_prefix = name_with_prefix.substr(0,3);
+                if( possible_log_prefix == "log" )
+                        stream << name_with_prefix.substr(3,name_with_prefix.length()-3);
+                else 
+                        stream << name_with_prefix;
+
+                // add number to name only in the case there are more registered vectors with the same log_level_enum
+                if( ids(log_level_enum).length() > 1 )
+                        stream << "*" << enum_subindex;
+                
+                return stream.str();
+        }
+
+protected:
+        //! internal pointer to the logger to which this log_level is registered
+        //! 
+        //! it is set to NULL at the beginning
+        logger * registered_logger;
+                
+        //! vector of vectors of log IDs - one element for each entry and multiple entries can be stored on the position of one enum
+        Vec<ivec> ids;
+
+        //! string equivalents of the used enumerations which are filled with a help of #LOG_LEVEL macro within class T
+        const Array<string> &names() const
+        {
+                return T::log_level_names();
+        }
+
+        //! default constructor�which is intentionaly declared as protected
+        log_level_base( ) {
+                registered_logger = NULL;
+                int len = names().length();
+                ids.set_size( len );
+                for( int i = 0; i<len; i++ )
+                {
+                        ids(i).set_size ( 1 );
+                        ids(i) = -1;
+                }
+        }
+        
+public: 
+        //! a general utility transforming a comma-separated sequence of strings into an instance of Array<strings>
+        static Array<string> string2Array( const string &input )
+        {
+                string result = input;
+                string::size_type loc;
+                while( loc = result.find( ',' ), loc != string::npos )
+                        result[loc] = ' ';
+                return Array<string>("{ " + result + " }" );
+        }
+};
+//UIREGISTER IS FORBIDDEN FOR THIS CLASS,  AS IT SHOULD BE LOADED ONLY THROUGH THE SPECIALIZED UI::GET(...) METHOD
+
 }; //namespace
 #endif // root_H