Squashed commit of the following:

    modernizing, updated to latest ticcutils

Author: kosloot

.github/workflows/mbt.yml

@@ -5,7 +5,9 @@ on:
   schedule:
     - cron: "0 19 3 * 5"  # run test once a month
   push:
-    branches: [master]
+    branches:
+      - master
+      - develop
     paths:
       - configure.ac
       - 'src/**'
@@ -45,10 +47,12 @@ jobs:
 
       - uses: LanguageMachines/ticcactions/cpp-submodule-build@v1
         with:
+          branch: ${{ github.ref_name }}
           module: ticcutils
 
       - uses: LanguageMachines/ticcactions/cpp-submodule-build@v1
         with:
+          branch: ${{ github.ref_name }}
           module: timbl
 
       - uses: LanguageMachines/ticcactions/setup-cppcheck@v1

configure.ac

@@ -60,7 +60,7 @@ PKG_CHECK_MODULES([timbl], [timbl >= 6.8] )
 CXXFLAGS="$CXXFLAGS $timbl_CFLAGS"
 LIBS="$LIBS $timbl_LIBS"
 
-PKG_CHECK_MODULES([ticcutils], [ticcutils >= 0.34] )
+PKG_CHECK_MODULES([ticcutils], [ticcutils >= 0.36] )
 CXXFLAGS="$CXXFLAGS $ticcutils_CFLAGS"
 LIBS="$LIBS $ticcutils_LIBS"
 

src/GenerateTagger.cxx

@@ -80,8 +80,8 @@ namespace Tagger {
 
   template <typename T1, typename T2>
   struct more_second {
-    using type = pair<T1, T2>;
-    bool operator ()(type const& a, type const& b) const {
+    using c_type = pair<T1, T2>;
+    bool operator ()(c_type const& a, c_type const& b) const {
       return a.second > b.second;
     }
   };
@@ -531,24 +531,24 @@ namespace Tagger {
     }
     if ( opts.extract( 'D', value ) ){
       if ( value == "LogSilent" ){
-	cur_log->setlevel( LogSilent );
-	default_cout.setlevel( LogSilent );
+	cur_log->set_level( LogSilent );
+	default_cout.set_level( LogSilent );
       }
       else if ( value == "LogNormal" ){
-	cur_log->setlevel( LogNormal );
-	default_cout.setlevel( LogNormal );
+	cur_log->set_level( LogNormal );
+	default_cout.set_level( LogNormal );
       }
       else if ( value == "LogDebug" ){
-	cur_log->setlevel( LogDebug );
-	default_cout.setlevel( LogDebug );
+	cur_log->set_level( LogDebug );
+	default_cout.set_level( LogDebug );
       }
       else if ( value == "LogHeavy" ){
-	cur_log->setlevel( LogHeavy );
-	default_cout.setlevel( LogHeavy );
+	cur_log->set_level( LogHeavy );
+	default_cout.set_level( LogHeavy );
       }
       else if ( value == "LogExtreme" ){
-	cur_log->setlevel( LogExtreme );
-	default_cout.setlevel( LogExtreme );
+	cur_log->set_level( LogExtreme );
+	default_cout.set_level( LogExtreme );
       }
       else {
 	cerr << "Unknown Debug mode! (-D " << value << ")" << endl;

src/MbtAPI.cxx

@@ -139,7 +139,7 @@ bool MbtAPI::GenerateTagger(int argc, char *argv[]) {
   // generate a tagger using argv.
   // Independent, static function so, don't use the internal _tagger here
   //
-  cur_log->setlevel( Tagger_Log_Level );
+  cur_log->set_level( Tagger_Log_Level );
   time_t timebefore, timeafter, timediff;
   time(&timebefore);
   int nw = TaggerClass::CreateTagger( argc, argv );
@@ -164,7 +164,7 @@ bool MbtAPI::GenerateTagger( const std::string& arg ) {
   // generate a tagger using a string.
   // Independent, static function so, don't use the internal _tagger here
   //
-  cur_log->setlevel( Tagger_Log_Level );
+  cur_log->set_level( Tagger_Log_Level );
   time_t timebefore, timeafter, timediff;
   time(&timebefore);
   int nw = TaggerClass::CreateTagger( arg );

src/RunTagger.cxx

@@ -1170,19 +1170,19 @@ namespace Tagger {
     }
     if ( Opts.extract( 'D', value ) ){
       if ( value == "LogSilent" ) {
-	cur_log->setlevel( LogSilent );
+	cur_log->set_level( LogSilent );
       }
       else if ( value == "LogNormal" ){
-	cur_log->setlevel( LogNormal );
+	cur_log->set_level( LogNormal );
       }
       else if ( value == "LogDebug" ){
-	cur_log->setlevel( LogDebug );
+	cur_log->set_level( LogDebug );
       }
       else if ( value == "LogHeavy" ){
-	cur_log->setlevel( LogHeavy );
+	cur_log->set_level( LogHeavy );
       }
       else if ( value == "LogExtreme" ){
-	cur_log->setlevel( LogExtreme );
+	cur_log->set_level( LogExtreme );
       }
       else {
 	cerr << "Unknown Debug mode! (-D " << value << ")" << endl;

src/Tagger.cxx

@@ -55,8 +55,8 @@ using namespace std;
 using namespace icu;
 
 LogStream default_log( cerr );
-LogStream default_cout( cout, "", NoStamp);
 LogStream *cur_log = &default_log;  // fill the externals
+LogStream default_cout( cout );
 
 LogLevel internal_default_level = LogNormal;
 LogLevel Tagger_Log_Level       = internal_default_level;
@@ -78,9 +78,9 @@ namespace Tagger {
   TaggerClass::TaggerClass():
     cur_log(new LogStream( cerr ))
   {
-    cur_log->setlevel( LogNormal );
-    cur_log->setstamp( StampMessage );
-    default_cout.setstamp( NoStamp );
+    cur_log->set_level( LogNormal );
+    cur_log->set_stamp( StampMessage );
+    default_cout.set_stamp( NoStamp );
     KnownTree = NULL;
     unKnownTree = NULL;
     TimblOptStr = "+vS -FColumns K: -a IGTREE +D U: -a IB1 ";
@@ -186,7 +186,8 @@ namespace Tagger {
     if ( !cloned ){
       delete cur_log;
     }
-    cur_log = new LogStream( os, "mbt-" );
+    cur_log = new LogStream( &os );
+    cur_log->add_message( "mbt-" );
     return true;
   }
 

src/convert.cxx

@@ -42,7 +42,7 @@ using std::ws;
 using std::map;
 using std::string;
 
-using string_map = map<string, string>;
+typedef  map<string, string> string_map;
 
 void fill_map( istream& in, string_map& map ){
   string tag, word;