get ready for another bug fix release

Author: Ko van der Sloot

NEWS

@@ -1,8 +1,17 @@
-0.18.4 - 2019-09-16
+0.18.6 - 2019-09-17
+[Ko vd Sloot]
+Bug fix release.
+* should really fix: https://github.com/proycon/tscan/issues/13
+
+0.18.5 - 2019-09-16
 [Ko vd Sloot]
 Bug fix release.
 * Fixes: https://github.com/proycon/tscan/issues/13
 
+0.18.4 - 2019-09-16
+[Ko vd Sloot]
+discarded
+
 0.18.3 - 2019-07-22
 [Ko vd Sloot]
 Bug fix release:

codemeta.json

@@ -13,7 +13,7 @@
     "@type": "SoftwareSourceCode",
     "identifier": "frog",
     "name": "Frog",
-    "version": "0.18.4",
+    "version": "0.18.6",
     "description": "Frog is an integration of memory-based natural language processing (NLP) modules developed for Dutch. It performs automatic linguistic enrichment such as part of speech tagging, lemmatisation, named entity recognition, shallow parsing, dependency parsing and morphological analysis. All NLP modules are based on TiMBL.",
     "license": "https://spdx.org/licenses/GPL-3.0",
 	"url": "https://languagemachines.github.io/frog",

configure.ac

@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.59)
 #also adapt version number in codemeta.json
-AC_INIT([frog], [0.18.4], [lamasoftware@science.ru.nl]) #adapt version number in codemeta.json as well
+AC_INIT([frog], [0.18.6], [lamasoftware@science.ru.nl]) #adapt version number in codemeta.json as well
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])

src/FrogAPI.cxx

@@ -1786,11 +1786,11 @@ vector<string> get_compound_analysis( folia::Word* word ){
       layer->select<folia::Morpheme>( Mbma::mbma_tagset, false );
     if ( m.size() == 1 ) {
       // check for top layer compound
-      try {
-	folia::PosAnnotation *tag = m[0]->annotation<folia::PosAnnotation>( Mbma::clex_tagset );
+      folia::PosAnnotation *tag = m[0]->annotation<folia::PosAnnotation>( Mbma::clex_tagset );
+      if ( tag ){
 	result.push_back( tag->feat( "compound" ) ); // might be empty
       }
-      catch (...){
+      else {
 	result.push_back( "" ); // pad with empty strings
       }
     }