Fix wccl swig wrappers not being in sync with corpus2 changes

swig/annotationmatch.i

@@ -7,7 +7,7 @@
 %}
 
 %include "matchdata.i"
-%include "libcorpus2/libcorpusannotatedsentence.i"
+%include "libcorpus2/annotatedsentence.i"
 
 %include "std_string.i"
 

swig/expression.i

@@ -7,7 +7,7 @@
   #include <boost/noncopyable.hpp>
 %}
 
-%include "libcorpus2/libcorpustagset.i"
+%include "libcorpus2/tagset.i"
 %include "std_string.i"
 
 namespace Wccl {

swig/match.i

@@ -11,7 +11,7 @@
 %include "tokenmatch.i"
 %include "annotationmatch.i"
 %include "matchvector.i"
-%include "libcorpus2/libcorpusannotatedsentence.i"
+%include "libcorpus2/annotatedsentence.i"
 
 %include "std_string.i"
 // %include <libcorpus2/boost_shared_ptr.i>

swig/matchdata.i

@@ -7,7 +7,7 @@
 %}
 
 %include "match.i"
-%include "libcorpus2/libcorpusannotatedsentence.i"
+%include "libcorpus2/annotatedsentence.i"
 
 %include "std_string.i"
 %include <libcorpus2/boost_shared_ptr.i>

swig/matchrule.i

@@ -8,7 +8,7 @@
 
 %include "variables.i"
 %include "parsedexpression.i"
-%include "libcorpus2/libcorpusannotatedsentence.i"
+%include "libcorpus2/annotatedsentence.i"
 
 %include "std_string.i"
 %include <libcorpus2/boost_shared_ptr.i>

swig/matchrulesequence.i

@@ -8,7 +8,7 @@
 
 %include "matchrule.i"
 %include "expression.i"
-%include "libcorpus2/libcorpusannotatedsentence.i"
+%include "libcorpus2/annotatedsentence.i"
 
 %include "std_string.i"
 %include "std_vector.i"

swig/matchvector.i

@@ -10,7 +10,7 @@
 %include "matchdata.i"
 %include "tokenmatch.i"
 %include "annotationmatch.i"
-%include "libcorpus2/libcorpusannotatedsentence.i"
+%include "libcorpus2/annotatedsentence.i"
 
 %include "std_string.i"
 %include <libcorpus2/boost_shared_ptr.i>

swig/parser.i

@@ -12,7 +12,7 @@
 %include "wcclfile.i"
 %include "functionaloperator.i"
 
-%include "libcorpus2/libcorpustagset.i"
+%include "libcorpus2/tagset.i"
 
 %include "std_string.i"
 %include "std_vector.i"

swig/sentencecontext.i

@@ -6,9 +6,9 @@
   #include <libwccl/sentencecontext.h>
 %}
 
-%include "libcorpus2/libcorpustoken.i"
-%include "libcorpus2/libcorpuslexeme.i"
-%include "libcorpus2/libcorpussentence.i"
+%include "libcorpus2/token.i"
+%include "libcorpus2/lexeme.i"
+%include "libcorpus2/sentence.i"
 
 %include "position.i"
 

swig/tagrule.i

@@ -12,7 +12,7 @@
 %include "sentencecontext.i"
 %include "parsedexpression.i"
 
-%include "libcorpus2/libcorpustagset.i"
+%include "libcorpus2/tagset.i"
 
 %include "std_string.i"
 %include <libcorpus2/boost_shared_ptr.i>

swig/tagrulesequence.i

@@ -9,7 +9,7 @@
 %include "bool.i"
 %include "tagrule.i"
 %include "expression.i"
-%include "libcorpus2/libcorpussentence.i"
+%include "libcorpus2/sentence.i"
 
 %include "std_string.i"
 %include "std_vector.i"

swig/tokenmatch.i

@@ -7,7 +7,7 @@
 %}
 
 %include "matchdata.i"
-%include "libcorpus2/libcorpusannotatedsentence.i"
+%include "libcorpus2/annotatedsentence.i"
 
 %nodefaultctor Wccl::TokenMatch;
 

swig/tset.i

@@ -10,8 +10,8 @@
 /* Include required headers */
 %include "std_string.i"
 %include "value.i"
-%include "libcorpus2/libcorpustag.i"
-%include "libcorpus2/libcorpustagset.i"
+%include "libcorpus2/tag.i"
+%include "libcorpus2/tagset.i"
 
 %feature("notabstract") Wccl::TSet;
 

swig/value.i

@@ -7,7 +7,7 @@
 %}
 
 %include "std_string.i"
-%include "libcorpus2/libcorpustagset.i"
+%include "libcorpus2/tagset.i"
 
 %nodefaultctor Wccl::Value;
 

swig/wcclfile.i

@@ -19,7 +19,7 @@
 %include "wcclfileopsections.i"
 %include "functionalopsequence.i"
 
-%include "libcorpus2/libcorpustagset.i"
+%include "libcorpus2/tagset.i"
 
 %include "std_string.i"
 %include "std_vector.i"