imports fixed

swig/libcclexpression.i

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

swig/libcclmatch.i

@@ -7,12 +7,18 @@
   #include <libwccl/values/match.h>
 %}
 
-%include "libcclvalue.i"
 %include "std_string.i"
+%include "libcclvalue.i"
+%include "libcclposition.i"
+// %include "libcclmatchdata.i"
+// %include "libccltokenmatch.i"
+%include "libcorpus/libcorpusannotatedsentence.i"
 
 %feature("notabstract") Wccl::Match;
 
 namespace Wccl {
+  // class MatchData;
+
   class Match : public Value {
   public:
     const char* get_type_name() const { return type_name; }
@@ -22,12 +28,27 @@ namespace Wccl {
     }
 
     Match();
+    // Match(const boost::shared_ptr<MatchData>& data);
+    // Match(const boost::shared_ptr<TokenMatch>& data);
+    // Match(const boost::shared_ptr<AnnotationMatch>& data);
+    // Match(const boost::shared_ptr<MatchVector>& data);
+
+    // Match(const MatchData& data);
+    // Match(const Match& match);
+
+    // %rename(MatchEq) operator=(const Match& match);
+    // Match& operator=(const Match& match);
+
+    // const MatchData& get_value() const;
+    // MatchData& get_value();
+
+    // void set_value(const MatchData& m);
+    // bool empty() const;
 
-    // TODO
     // virtual Position first_token(const boost::shared_ptr<Corpus2::AnnotatedSentence>&) const;
     // virtual Position last_token(const boost::shared_ptr<Corpus2::AnnotatedSentence>&) const;
 
-    std::string to_raw_string() const;
+    // std::string to_raw_string() const;
   };
 }
 

swig/libcclmatchdata.i

@@ -11,7 +11,7 @@
 %include "libcclposition.i"
 %include "libcorpus/libcorpusannotatedsentence.i"
 
-// %template(MatchDataPtr) boost::shared_ptr<Wccl::MatchData>;
+%template(MatchDataPtr) boost::shared_ptr<Wccl::MatchData>;
 
 namespace Wccl {
   class MatchData {

swig/libcclparser.i

@@ -6,10 +6,13 @@
   #include <libwccl/parser/Parser.h>
 %}
 
-%include "libcorpustagsetmanager.i"
+%include "libcclbool.i"
+%include "libccloperator.i"
+%include "libcorpus/libcorpustagsetmanager.i"
 
 %include "std_string.i"
 %include "std_vector.i"
+%include "boost_shared_ptr.i"
 
 namespace Wccl {
   class Parser {
@@ -17,10 +20,13 @@ namespace Wccl {
     Parser(const Corpus2::Tagset&);
     ~TagsetManager();
 
-    /* --------------------------------------------------------------------- */
+
+    // %rename (SharedPtrBoolOperator) boost::shared_ptr<Operator<Bool> >;
+    shared_ptr<Operator<Bool> > parseBoolOperator(const std::string&) const;
   };
 }
 
+using namespace boost;
 using namespace std;
 using namespace Corpus2;
 

swig/libcclsentencecontext.i

@@ -6,9 +6,9 @@
   #include <libwccl/sentencecontext.h>
 %}
 
-%include "libcorpustoken.i"
-%include "libcorpuslexeme.i"
-%include "libcorpussentence.i"
+%include "libcorpus/libcorpustoken.i"
+%include "libcorpus/libcorpuslexeme.i"
+%include "libcorpus/libcorpussentence.i"
 
 %include "libcclposition.i"