From 6c061d1f3c634f269f6aebcfe763dc39cfd5e6b7 Mon Sep 17 00:00:00 2001
From: ilor <kailoran@gmail.com>
Date: Sun, 29 May 2011 19:06:05 +0200
Subject: [PATCH] Fix wccl swig wrappers not being in sync with corpus2 changes

---
 swig/annotationmatch.i   | 2 +-
 swig/expression.i        | 2 +-
 swig/match.i             | 2 +-
 swig/matchdata.i         | 2 +-
 swig/matchrule.i         | 2 +-
 swig/matchrulesequence.i | 2 +-
 swig/matchvector.i       | 2 +-
 swig/parser.i            | 2 +-
 swig/sentencecontext.i   | 6 +++---
 swig/tagrule.i           | 2 +-
 swig/tagrulesequence.i   | 2 +-
 swig/tokenmatch.i        | 2 +-
 swig/tset.i              | 4 ++--
 swig/value.i             | 2 +-
 swig/wcclfile.i          | 2 +-
 15 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/swig/annotationmatch.i b/swig/annotationmatch.i
index 1edda40..d0225ad 100644
--- a/swig/annotationmatch.i
+++ b/swig/annotationmatch.i
@@ -7,7 +7,7 @@
 %}
 
 %include "matchdata.i"
-%include "libcorpus2/libcorpusannotatedsentence.i"
+%include "libcorpus2/annotatedsentence.i"
 
 %include "std_string.i"
 
diff --git a/swig/expression.i b/swig/expression.i
index 0d10cb4..b15393c 100644
--- a/swig/expression.i
+++ b/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 {
diff --git a/swig/match.i b/swig/match.i
index 0c817a1..f296bb3 100644
--- a/swig/match.i
+++ b/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>
diff --git a/swig/matchdata.i b/swig/matchdata.i
index e750141..57d7afa 100644
--- a/swig/matchdata.i
+++ b/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>
diff --git a/swig/matchrule.i b/swig/matchrule.i
index 887e81e..41002c6 100644
--- a/swig/matchrule.i
+++ b/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>
diff --git a/swig/matchrulesequence.i b/swig/matchrulesequence.i
index 0f975e8..73c27e8 100644
--- a/swig/matchrulesequence.i
+++ b/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"
diff --git a/swig/matchvector.i b/swig/matchvector.i
index 8df311a..955b9c4 100644
--- a/swig/matchvector.i
+++ b/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>
diff --git a/swig/parser.i b/swig/parser.i
index e8a0c9b..6ec1d5d 100644
--- a/swig/parser.i
+++ b/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"
diff --git a/swig/sentencecontext.i b/swig/sentencecontext.i
index 87c69b9..10fa25f 100644
--- a/swig/sentencecontext.i
+++ b/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"
 
diff --git a/swig/tagrule.i b/swig/tagrule.i
index ad8c502..b8029fc 100644
--- a/swig/tagrule.i
+++ b/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>
diff --git a/swig/tagrulesequence.i b/swig/tagrulesequence.i
index 55f0fba..31b0bfd 100644
--- a/swig/tagrulesequence.i
+++ b/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"
diff --git a/swig/tokenmatch.i b/swig/tokenmatch.i
index 5ace238..d556cf7 100644
--- a/swig/tokenmatch.i
+++ b/swig/tokenmatch.i
@@ -7,7 +7,7 @@
 %}
 
 %include "matchdata.i"
-%include "libcorpus2/libcorpusannotatedsentence.i"
+%include "libcorpus2/annotatedsentence.i"
 
 %nodefaultctor Wccl::TokenMatch;
 
diff --git a/swig/tset.i b/swig/tset.i
index 4afc4c5..54a7880 100644
--- a/swig/tset.i
+++ b/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;
 
diff --git a/swig/value.i b/swig/value.i
index 2bec671..30f8eef 100644
--- a/swig/value.i
+++ b/swig/value.i
@@ -7,7 +7,7 @@
 %}
 
 %include "std_string.i"
-%include "libcorpus2/libcorpustagset.i"
+%include "libcorpus2/tagset.i"
 
 %nodefaultctor Wccl::Value;
 
diff --git a/swig/wcclfile.i b/swig/wcclfile.i
index 76922e3..8e0fe41 100644
--- a/swig/wcclfile.i
+++ b/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"
-- 
GitLab