Added a new way of removing logging bits in the config file (#740)

core/LoggingBits.cc

@@ -32,6 +32,16 @@ void Logging_Bits::merge( const Logging_Bits & other )
   }
 }
 
+void Logging_Bits::remove_bits( const Logging_Bits & other )
+{
+  for( size_t i = 0; i < TTCN_Logger::NUMBER_OF_LOGSEVERITIES; ++i )
+  {
+    if (other.bits[i]) {
+      bits[i] = FALSE;
+    }
+  }
+}
+
 void Logging_Bits::add_sev( TTCN_Logger::Severity sev )
 {
   assert(sev >= 0);

core/LoggingBits.hh

@@ -79,6 +79,12 @@ struct Logging_Bits
   */
   void merge   ( const Logging_Bits & other );
 
+  /** @brief Substitute given Logging_Bits from this one
+
+  @param other Logging_Bits
+  */
+  void remove_bits   ( const Logging_Bits & other );
+
   /** @brief Return a string corresponding to the bits set in this object.
 
   @return an \c expstring_t containing a textual description.

core/config_process.y

@@ -1840,6 +1840,11 @@ LoggingBitmask:
 {
 	$$ = $1;
 	$$.merge($3);
+}
+	| LoggingBitmask '|' '!' LoggingBitOrCollection
+{
+	$$ = $1;
+	$$.remove_bits($4);
 }
 ;
 

mctr2/cli/config_read.y

@@ -684,6 +684,7 @@ ListOp:
 
 LoggingBitorCollection:
 	LoggingBit
+	| '!' LoggingBit
 	| LoggingBitCollection
 ;