Merge branch 'generic'

Author: Ko van der Sloot

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([frog], [0.13.1], [lamasoftware@science.ru.nl])
+AC_INIT([frog], [0.13.3], [lamasoftware@science.ru.nl])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])
@@ -131,15 +131,15 @@ AC_ARG_WITH(folia,
        [PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"],
        [PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"])
 AC_MSG_NOTICE( [pkg-config search path: $PKG_CONFIG_PATH] )
-PKG_CHECK_MODULES([folia],[folia >= 0.13])
+PKG_CHECK_MODULES([folia],[folia >= 1.0])
 CXXFLAGS="$CXXFLAGS $folia_CFLAGS"
 LIBS="$folia_LIBS $LIBS"
 
 AC_ARG_WITH(ucto,
        [  --with-ucto=DIR       use ucto installed in <DIR>],
        [PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$withval/lib/pkgconfig"],
        [PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$prefix/lib/pkgconfig"])
-PKG_CHECK_MODULES([ucto], [ucto >= 0.8.1] )
+PKG_CHECK_MODULES([ucto], [ucto >= 0.8.4] )
 CXXFLAGS="$CXXFLAGS $ucto_CFLAGS"
 LIBS="$ucto_LIBS $LIBS"
 

include/frog/Frog.h

@@ -38,9 +38,7 @@
 #include "ticcutils/Timer.h"
 #include "ticcutils/PrettyPrint.h"
 #include "ticcutils/StringOps.h"
-#include "libfolia/foliautils.h"
 #include "libfolia/folia.h"
-#include "libfolia/document.h"
 
 
 //declared here and defined in Frog-util.cxx (bit messy)

include/frog/ucto_tokenizer_mod.h

@@ -33,7 +33,7 @@
 class UctoTokenizer {
  public:
   UctoTokenizer(TiCC::LogStream *);
-  ~UctoTokenizer() { delete tokenizer; delete uctoLog; };
+  ~UctoTokenizer() { delete tokenizer; };
   bool init( const TiCC::Configuration& );
   void setUttMarker( const std::string& );
   void setPassThru( bool );
@@ -44,8 +44,8 @@ class UctoTokenizer {
   void setInputXml( bool );
   void setTextClass( const std::string& );
   void setDocID( const std::string& );
-  folia::Document tokenizestring( const std::string& );
-  folia::Document tokenize( std::istream& );
+  folia::Document *tokenizestring( const std::string& );
+  folia::Document *tokenize( std::istream& );
   bool tokenize( folia::Document& );
   std::vector<std::string> tokenize( const std::string&  );
   std::string tokenizeStream( std::istream& );

src/Frog.cxx

@@ -159,9 +159,9 @@ bool parse_args( TiCC::CL_Options& Opts, FrogOptions& options,
     value = TiCC::lowercase( value );
     vector<string> vec;
     TiCC::split_at( value, vec, "," );
-    for ( size_t i=0; i < vec.size(); ++i ){
-      char mod = vec[i][0];
-      string value = vec[i].substr(1);
+    for ( const auto& val : vec ){
+      char mod = val[0];
+      string value = val.substr(1);
       int dbval = 0;
       if ( !stringTo<int>( value, dbval ) ){
 	cerr << "expected integer value for --debug=" << mod << value << endl;
@@ -369,8 +369,8 @@ bool parse_args( TiCC::CL_Options& Opts, FrogOptions& options,
     }
     else {
       vector<string> mass = Opts.getMassOpts();
-      for (size_t i=0; i < mass.size(); ++i ){
-	fileNames.insert( mass[i] );
+      for ( const auto& name : mass ){
+	fileNames.insert( name );
       }
     }
   }
@@ -558,5 +558,6 @@ int main(int argc, char *argv[]) {
     *Log(theErrLog) << "fatal error: " << e.what() << endl;
     return EXIT_FAILURE;
   }
+  delete theErrLog;
   return EXIT_SUCCESS;
 }