some small fixes suggested by CppCheck

LanguageMachines · Jun 9, 2023 · c63ab45 · c63ab45
1 parent b9d9251
commit c63ab45
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/AlpinoParser.cxx b/src/AlpinoParser.cxx
@@ -391,6 +391,9 @@ dp_tree *parse_node( xmlNode *node ){
   if ( !dp->word.empty() ){
     dp->word_index = dp->end;
   }
+  else {
+    dp->word_index = 0;
+  }
   dp->link = 0;
   dp->next = 0;
   //  cerr << "created dp_tree: " << dp << endl;

diff --git a/src/ckyparser.cxx b/src/ckyparser.cxx
@@ -269,6 +269,11 @@ void CKYParser::parse(){
 	  bestI = r;
 	}
       }
+      if ( bestI < 0 ){
+	string msg = "bestI index out of bounds in: ";
+	msg += __FILE__ + string(":") + std::to_string(__LINE__);
+	throw logic_error( msg );
+      }
       DBG << "STEP 3 ADD: " << bestScore <<"-" << bestI << "-" << bestL << endl;
       chart[s][t].l_True = SubTree( bestScore, bestI, bestL );
       chart[s][t].l_True.satisfiedConstraints.insert( chart[s][bestI].l_True.satisfiedConstraints.begin(), chart[s][bestI].l_True.satisfiedConstraints.end() );
@@ -284,7 +289,11 @@ void CKYParser::parse(){
 	  bestI = r;
 	}
       }
-
+      if ( bestI < 0 ){
+	string msg = "bestI index out of bounds in: ";
+	msg += __FILE__ + string(":") + std::to_string(__LINE__);
+	throw logic_error( msg );
+      }
       DBG << "STEP 4 ADD: " << bestScore <<"-" << bestI << "-" << bestL << endl;
       chart[s][t].r_True = SubTree( bestScore, bestI, bestL );
       chart[s][t].r_True.satisfiedConstraints.insert( chart[s][bestI].r_False.satisfiedConstraints.begin(), chart[s][bestI].r_False.satisfiedConstraints.end() );

diff --git a/src/ner_tagger_mod.cxx b/src/ner_tagger_mod.cxx
@@ -267,7 +267,7 @@ vector<UnicodeString> NERTagger::create_ner_list( const vector<UnicodeString>& w
     size_t len = 1;
     for ( size_t i = 0; i < min( words.size() - j, (size_t)max_ner_size); ++i ){
       // start looking for sequences of length len
-      auto const& mp = ners[len++];
+      auto const mp = ners[len++];
       if ( mp.empty() ){
 	continue;
       }