adapting to newer libfolia

LanguageMachines · Dec 3, 2024 · 3f3d2f1 · 3f3d2f1
1 parent 9bb38f9
commit 3f3d2f1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/src/FoLiA-clean.cxx b/src/FoLiA-clean.cxx
@@ -85,7 +85,7 @@ void clean_text( FoliaElement *node,
   }
   for ( size_t i=0; i < node->size(); ++i ){
     FoliaElement *p = node->index(i);
-    if ( p->element_id() == TextContent_t ) {
+    if ( p->isinstance<TextContent>() ) {
       if ( !textclass.empty() ){
 	if ( debug ){
 #pragma omp critical( debugging )

diff --git a/src/FoLiA-correct.cxx b/src/FoLiA-correct.cxx
@@ -1271,6 +1271,15 @@ void correctNgrams( FoliaElement *root,
   }
 }
 
+template<typename T>
+vector<FoliaElement*> upcast( const vector<T*>& v ){
+  vector<FoliaElement*> result;
+  for( const auto& it : v ){
+    result.push_back(static_cast<FoliaElement*>(it));
+  }
+  return result;
+}
+
 bool correctDoc( Document *doc,
 		 const unordered_map<string,vector<word_conf> >& variants,
 		 const unordered_set<string>& unknowns,
@@ -1285,9 +1294,9 @@ bool correctDoc( Document *doc,
   doc->declare( folia::AnnotationType::CORRECTION, setname, args );
   vector<FoliaElement*> ev;
   if ( tag_list.empty() ){
-    vector<FoliaElement*> v1 = doc->doc()->select( Sentence_t );
+    vector<FoliaElement*> v1 = upcast(doc->doc()->select<Sentence>());
     if ( v1.empty() ){
-      v1 = doc->doc()->select( Paragraph_t );
+      v1 = upcast(doc->doc()->select<Paragraph>() );
     }
     ev = v1;
   }

diff --git a/src/FoLiA-merge.cxx b/src/FoLiA-merge.cxx
@@ -111,7 +111,7 @@ bool merge_values( Document *doc,
   args["processor"] = proc->id();
   doc->declare( folia::AnnotationType::LEMMA, lem_setname, args );
   doc->declare( folia::AnnotationType::POS, pos_setname, args );
-  vector<FoliaElement*> wv = doc->doc()->select( Word_t );
+  vector<Word*> wv = doc->doc()->select<Word>();
   for( const auto& word : wv ){
     try {
       add_lemma_pos( word, lexicon );

diff --git a/src/FoLiA-txt.cxx b/src/FoLiA-txt.cxx
@@ -81,7 +81,7 @@ void add_paragraph( folia::FoliaElement *par,
     // we don't want a terminating <br/> at the end of a paragraph.
     // 2 newlines ar already implicit for a paragraph
     if ( &it == &par_stack.back()
-	 && it->isSubClass( Linebreak_t ) ){
+	 && it->isSubClass<Linebreak>() ){
       break;
     }
     txt->append(it );