From dea716fee8db0927e693f7ae330d37d572f62c26 Mon Sep 17 00:00:00 2001
From: ilor <kailoran@gmail.com>
Date: Tue, 24 May 2011 12:38:54 +0200
Subject: [PATCH] sync swig wrappers with corpus2 wrapper changes

---
 swig/boost_shared_ptr.i           | 25 -------------------------
 swig/libcclannotationmatch.i      |  2 +-
 swig/libcclexpression.i           |  2 +-
 swig/libcclfunctionaloperator.i   |  2 +-
 swig/libcclfunctionalopsequence.i |  2 +-
 swig/libccllexicon.i              |  2 +-
 swig/libccllexicons.i             |  2 +-
 swig/libcclmatch.i                |  4 ++--
 swig/libcclmatchdata.i            |  4 ++--
 swig/libcclmatchrule.i            |  4 ++--
 swig/libcclmatchrulesequence.i    |  4 ++--
 swig/libcclmatchvector.i          |  4 ++--
 swig/libccloperator.i             |  2 +-
 swig/libcclparsedexpression.i     |  2 +-
 swig/libcclparser.i               |  4 ++--
 swig/libcclsentencecontext.i      |  8 ++++----
 swig/libccltagrule.i              |  4 ++--
 swig/libccltagrulesequence.i      |  4 ++--
 swig/libccltokenmatch.i           |  2 +-
 swig/libccltset.i                 |  4 ++--
 swig/libcclvalue.i                |  2 +-
 swig/libcclvariables.i            |  2 +-
 swig/libcclwcclfile.i             |  4 ++--
 swig/libcclwcclfileopsections.i   |  2 +-
 swig/wccl.i                       |  2 +-
 25 files changed, 37 insertions(+), 62 deletions(-)
 delete mode 100644 swig/boost_shared_ptr.i

diff --git a/swig/boost_shared_ptr.i b/swig/boost_shared_ptr.i
deleted file mode 100644
index 7803b22..0000000
--- a/swig/boost_shared_ptr.i
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Wrapper for boost shared_ptr
- */
-#ifndef SWIG_BOOST_SHAREDPTR
-#define SWIG_BOOST_SHAREDPTR
-
-%module boost_shared_ptr
-%{
-%}
-
-namespace boost {
-  template<class T> class shared_ptr {
-  public:
-    shared_ptr();
-    shared_ptr(T * p);
-    T* operator->();
-  private:
-    T * px;
-    int pn;
-  };
-}
-
-using namespace boost;
-
-#endif /* SWIG_BOOST_SHAREDPTR */
diff --git a/swig/libcclannotationmatch.i b/swig/libcclannotationmatch.i
index 7a2c917..ac1d4cb 100644
--- a/swig/libcclannotationmatch.i
+++ b/swig/libcclannotationmatch.i
@@ -7,7 +7,7 @@
 %}
 
 %include "libcclmatchdata.i"
-%include "libcorpus/libcorpusannotatedsentence.i"
+%include "libcorpus2/libcorpusannotatedsentence.i"
 
 %include "std_string.i"
 
diff --git a/swig/libcclexpression.i b/swig/libcclexpression.i
index 84816e4..0d10cb4 100644
--- a/swig/libcclexpression.i
+++ b/swig/libcclexpression.i
@@ -7,7 +7,7 @@
   #include <boost/noncopyable.hpp>
 %}
 
-%include "libcorpus/libcorpustagset.i"
+%include "libcorpus2/libcorpustagset.i"
 %include "std_string.i"
 
 namespace Wccl {
diff --git a/swig/libcclfunctionaloperator.i b/swig/libcclfunctionaloperator.i
index a8a9b8d..c4ccc8a 100644
--- a/swig/libcclfunctionaloperator.i
+++ b/swig/libcclfunctionaloperator.i
@@ -12,7 +12,7 @@
 %include "libcclparsedexpression.i"
 
 %include "std_string.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 // %template(ValuePtr) boost::shared_ptr<Wccl::Value>;
 %template(FunctionalOperatorPtr) boost::shared_ptr<Wccl::FunctionalOperator>;
diff --git a/swig/libcclfunctionalopsequence.i b/swig/libcclfunctionalopsequence.i
index d88f920..b66e4e4 100644
--- a/swig/libcclfunctionalopsequence.i
+++ b/swig/libcclfunctionalopsequence.i
@@ -14,7 +14,7 @@
 %include "std_string.i"
 %include "std_vector.i"
 
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 %nodefaultctor Wccl::FunctionalOpSequence;
 
diff --git a/swig/libccllexicon.i b/swig/libccllexicon.i
index c49dd79..1a3f136 100644
--- a/swig/libccllexicon.i
+++ b/swig/libccllexicon.i
@@ -12,7 +12,7 @@
 %include "libcclstrset.i"
 
 %include "std_string.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 %rename(map_t) boost::unordered_map<UnicodeString, UnicodeString>;
 
diff --git a/swig/libccllexicons.i b/swig/libccllexicons.i
index 476a790..b565386 100644
--- a/swig/libccllexicons.i
+++ b/swig/libccllexicons.i
@@ -9,7 +9,7 @@
 %include "libccllexicon.i"
 
 %include "std_string.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 %rename(map_t) boost::unordered_map<std::string, boost::shared_ptr<Lexicon> >;
 
diff --git a/swig/libcclmatch.i b/swig/libcclmatch.i
index f64cefe..321d130 100644
--- a/swig/libcclmatch.i
+++ b/swig/libcclmatch.i
@@ -11,10 +11,10 @@
 %include "libccltokenmatch.i"
 %include "libcclannotationmatch.i"
 %include "libcclmatchvector.i"
-%include "libcorpus/libcorpusannotatedsentence.i"
+%include "libcorpus2/libcorpusannotatedsentence.i"
 
 %include "std_string.i"
-// %include "boost_shared_ptr.i"
+// %include <libcorpus2/boost_shared_ptr.i>
 
 %feature("notabstract") Wccl::Match;
 
diff --git a/swig/libcclmatchdata.i b/swig/libcclmatchdata.i
index f25d53a..c92eae2 100644
--- a/swig/libcclmatchdata.i
+++ b/swig/libcclmatchdata.i
@@ -7,10 +7,10 @@
 %}
 
 %include "libcclmatch.i"
-%include "libcorpus/libcorpusannotatedsentence.i"
+%include "libcorpus2/libcorpusannotatedsentence.i"
 
 %include "std_string.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 %nodefaultctor Wccl::MatchData;
 
diff --git a/swig/libcclmatchrule.i b/swig/libcclmatchrule.i
index f2ca44c..b80319e 100644
--- a/swig/libcclmatchrule.i
+++ b/swig/libcclmatchrule.i
@@ -8,10 +8,10 @@
 
 %include "libcclvariables.i"
 %include "libcclparsedexpression.i"
-%include "libcorpus/libcorpusannotatedsentence.i"
+%include "libcorpus2/libcorpusannotatedsentence.i"
 
 %include "std_string.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 namespace Wccl {
   class MatchRule : public ParsedExpression {
diff --git a/swig/libcclmatchrulesequence.i b/swig/libcclmatchrulesequence.i
index eca44e3..d68f5fd 100644
--- a/swig/libcclmatchrulesequence.i
+++ b/swig/libcclmatchrulesequence.i
@@ -8,11 +8,11 @@
 
 %include "libcclmatchrule.i"
 %include "libcclexpression.i"
-%include "libcorpus/libcorpusannotatedsentence.i"
+%include "libcorpus2/libcorpusannotatedsentence.i"
 
 %include "std_string.i"
 %include "std_vector.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 %template(MatchRuleVector) std::vector<Wccl::MatchRule>;
 %template(MatchRuleSequencePtr) boost::shared_ptr<Wccl::MatchRule>;
diff --git a/swig/libcclmatchvector.i b/swig/libcclmatchvector.i
index f5fa3bb..d96af40 100644
--- a/swig/libcclmatchvector.i
+++ b/swig/libcclmatchvector.i
@@ -10,10 +10,10 @@
 %include "libcclmatchdata.i"
 %include "libccltokenmatch.i"
 %include "libcclannotationmatch.i"
-%include "libcorpus/libcorpusannotatedsentence.i"
+%include "libcorpus2/libcorpusannotatedsentence.i"
 
 %include "std_string.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 %template(MatchVectorPtr) boost::shared_ptr<Wccl::MatchVector>;
 
diff --git a/swig/libccloperator.i b/swig/libccloperator.i
index 6f32a56..450d555 100644
--- a/swig/libccloperator.i
+++ b/swig/libccloperator.i
@@ -17,7 +17,7 @@
 */
 
 %include "std_string.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 %feature("notabstract") Wccl::Operator;
 
diff --git a/swig/libcclparsedexpression.i b/swig/libcclparsedexpression.i
index f6a4e87..8c9e2b3 100644
--- a/swig/libcclparsedexpression.i
+++ b/swig/libcclparsedexpression.i
@@ -16,7 +16,7 @@
 %include "libcclexpression.i"
 
 %include "std_string.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 %template (ParsedExpressionPtr) boost::shared_ptr<Wccl::ParsedExpression>;
 
diff --git a/swig/libcclparser.i b/swig/libcclparser.i
index 658d57a..950f5a3 100644
--- a/swig/libcclparser.i
+++ b/swig/libcclparser.i
@@ -12,11 +12,11 @@
 %include "libcclwcclfile.i"
 %include "libcclfunctionaloperator.i"
 
-%include "libcorpus/libcorpustagset.i"
+%include "libcorpus2/libcorpustagset.i"
 
 %include "std_string.i"
 %include "std_vector.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 namespace Wccl {
   class Parser {
diff --git a/swig/libcclsentencecontext.i b/swig/libcclsentencecontext.i
index e3202d8..4626626 100644
--- a/swig/libcclsentencecontext.i
+++ b/swig/libcclsentencecontext.i
@@ -6,14 +6,14 @@
   #include <libwccl/sentencecontext.h>
 %}
 
-%include "libcorpus/libcorpustoken.i"
-%include "libcorpus/libcorpuslexeme.i"
-%include "libcorpus/libcorpussentence.i"
+%include "libcorpus2/libcorpustoken.i"
+%include "libcorpus2/libcorpuslexeme.i"
+%include "libcorpus2/libcorpussentence.i"
 
 %include "libcclposition.i"
 
 %include "std_string.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 // %feature("notabstract") Wccl::SentenceContext;
 
diff --git a/swig/libccltagrule.i b/swig/libccltagrule.i
index b694be1..b6f2f81 100644
--- a/swig/libccltagrule.i
+++ b/swig/libccltagrule.i
@@ -12,10 +12,10 @@
 %include "libcclsentencecontext.i"
 %include "libcclparsedexpression.i"
 
-%include "libcorpus/libcorpustagset.i"
+%include "libcorpus2/libcorpustagset.i"
 
 %include "std_string.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 %template(TagRulePtr) boost::shared_ptr<Wccl::TagRule>;
 
diff --git a/swig/libccltagrulesequence.i b/swig/libccltagrulesequence.i
index 75aa8d8..0f7f224 100644
--- a/swig/libccltagrulesequence.i
+++ b/swig/libccltagrulesequence.i
@@ -9,11 +9,11 @@
 %include "libcclbool.i"
 %include "libccltagrule.i"
 %include "libcclexpression.i"
-%include "libcorpus/libcorpussentence.i"
+%include "libcorpus2/libcorpussentence.i"
 
 %include "std_string.i"
 %include "std_vector.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 %template(StdVectorTagRule) std::vector<TagRule>;
 %template(TagRuleSequencPtr) boost::shared_ptr<Wccl::TagRuleSequence>;
diff --git a/swig/libccltokenmatch.i b/swig/libccltokenmatch.i
index a4045e9..6483412 100644
--- a/swig/libccltokenmatch.i
+++ b/swig/libccltokenmatch.i
@@ -7,7 +7,7 @@
 %}
 
 %include "libcclmatchdata.i"
-%include "libcorpus/libcorpusannotatedsentence.i"
+%include "libcorpus2/libcorpusannotatedsentence.i"
 
 %nodefaultctor Wccl::TokenMatch;
 
diff --git a/swig/libccltset.i b/swig/libccltset.i
index d9f5363..79b792f 100644
--- a/swig/libccltset.i
+++ b/swig/libccltset.i
@@ -10,8 +10,8 @@
 /* Include required headers */
 %include "std_string.i"
 %include "libcclvalue.i"
-%include "libcorpus/libcorpustag.i"
-%include "libcorpus/libcorpustagset.i"
+%include "libcorpus2/libcorpustag.i"
+%include "libcorpus2/libcorpustagset.i"
 
 %feature("notabstract") Wccl::TSet;
 
diff --git a/swig/libcclvalue.i b/swig/libcclvalue.i
index 4a62b21..2bec671 100644
--- a/swig/libcclvalue.i
+++ b/swig/libcclvalue.i
@@ -7,7 +7,7 @@
 %}
 
 %include "std_string.i"
-%include "libcorpus/libcorpustagset.i"
+%include "libcorpus2/libcorpustagset.i"
 
 %nodefaultctor Wccl::Value;
 
diff --git a/swig/libcclvariables.i b/swig/libcclvariables.i
index 3048feb..98bd25f 100644
--- a/swig/libcclvariables.i
+++ b/swig/libcclvariables.i
@@ -14,7 +14,7 @@
 %include "libccltset.i"
 
 %include "std_string.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 %template(ValuePtr) boost::shared_ptr<Wccl::Value>;
 %template(BoolPtr) boost::shared_ptr<Wccl::Bool>;
diff --git a/swig/libcclwcclfile.i b/swig/libcclwcclfile.i
index a51db9c..7752e6a 100644
--- a/swig/libcclwcclfile.i
+++ b/swig/libcclwcclfile.i
@@ -19,11 +19,11 @@
 %include "libcclwcclfileopsections.i"
 %include "libcclfunctionalopsequence.i"
 
-%include "libcorpus/libcorpustagset.i"
+%include "libcorpus2/libcorpustagset.i"
 
 %include "std_string.i"
 %include "std_vector.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 %template(UntypedOpSequencePtrVector) std::vector<boost::shared_ptr<Wccl::UntypedOpSequence> >;
 %template(BoolOpSequencePtrVector) std::vector<boost::shared_ptr<Wccl::OpSequence<Wccl::Bool> > >;
diff --git a/swig/libcclwcclfileopsections.i b/swig/libcclwcclfileopsections.i
index 8e8ee40..a8ee450 100644
--- a/swig/libcclwcclfileopsections.i
+++ b/swig/libcclwcclfileopsections.i
@@ -16,7 +16,7 @@
 
 %include "std_string.i"
 %include "std_vector.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 namespace Wccl {
   template<class T> class WcclFileOpSections {
diff --git a/swig/wccl.i b/swig/wccl.i
index 9eadbc0..c97e40f 100644
--- a/swig/wccl.i
+++ b/swig/wccl.i
@@ -5,7 +5,7 @@
 %{
   //
 %}
-
+%include <libcorpus2/unicodestring.i>
 %include "libcclactionexeccontext.i"
 %include "libcclannotationmatch.i"
 %include "libcclbool.i"
-- 
GitLab