(swig) Some fixes

swig/libccllexicon.i

@@ -60,6 +60,9 @@ namespace Wccl {
 
     const map_t& map() const;
   };
+
+  %template(LexiconPtr) boost::shared_ptr<Wccl::Lexicon>;
+  %template(ConstLexiconPtr) boost::shared_ptr<const Wccl::Lexicon>;
 }
 
 using namespace boost;

swig/libccllexicons.i

@@ -39,6 +39,9 @@ namespace Wccl {
 
     const map_t& get_lexicons() const;
   };
+
+  %template(LexiconsPtr) boost::shared_ptr<Wccl::Lexicons>;
+  %template(ConstLexiconsPtr) boost::shared_ptr<const Wccl::Lexicons>;
 }
 
 using namespace boost;

swig/libcclmatchrulesequence.i

@@ -14,7 +14,9 @@
 %include "std_vector.i"
 %include "boost_shared_ptr.i"
 
-%template(MatchRuleVector) std::vector<MatchRule>;
+%template(MatchRuleVector) std::vector<Wccl::MatchRule>;
+%template(MatchRuleSequencePtr) boost::shared_ptr<Wccl::MatchRule>;
+%template(ConstMatchRuleSequencePtr) boost::shared_ptr<const Wccl::MatchRule>;
 
 namespace Wccl {
   class MatchRuleSequence : public std::vector<MatchRule>, public Expression {

swig/libccltagrulesequence.i

@@ -17,6 +17,7 @@
 
 %template(StdVectorTagRule) std::vector<TagRule>;
 %template(TagRuleSequencPtr) boost::shared_ptr<Wccl::TagRuleSequence>;
+%template(ConstTagRuleSequencPtr) boost::shared_ptr<const Wccl::TagRuleSequence>;
 
 namespace Wccl {
   class TagRuleSequence : public std::vector<TagRule>, public Expression {

swig/libcclwcclfile.i

@@ -34,7 +34,7 @@
 
 %nodefaultctor Wccl::WcclFile;
 
-%template(OpSequenceStrSet) Wccl::WcclFileOpSections<Wccl::OpSequence<Wccl::StrSet> >;
+%template(WcclFilePtr) boost::shared_ptr<Wccl::WcclFile>;
 
 namespace Wccl {
   class WcclFile 
@@ -147,8 +147,8 @@ namespace Wccl {
 
     /* --------------------------------------------------------------------- */
 
+    // UntypedOpSequence::name_op_v_c_t gen_name_untyped_op_pairs() const;
     UntypedOpSequence::name_op_v_t gen_name_untyped_op_pairs();
-    UntypedOpSequence::name_op_v_c_t gen_name_untyped_op_pairs() const;
 
     /* --------------------------------------------------------------------- */
 
@@ -240,9 +240,7 @@ namespace Wccl {
     %template(add_section_position) add_section<Position>;
     %template(add_section_match) add_section<Match>;
 
-    /*
-    void import_lexicon(const boost::shared_ptr<Lexicon>& lexicon);
-    */
+    void import_lexicon(const shared_ptr<Lexicon>& lexicon);
 
     /*
     void set_tag_rules(const shared_ptr<TagRuleSequence>& tag_rules);

swig/libcclwcclfileopsections.i

@@ -80,6 +80,8 @@ namespace Wccl {
   %template(BoolOpSequence) WcclFileOpSections<OpSequence<Bool> >;
   %template(PositionOpSequence) WcclFileOpSections<OpSequence<Position> >;
   %template(MatchOpSequence) WcclFileOpSections<OpSequence<Match> >;
+
+  %template(OpSequenceStrSet) Wccl::WcclFileOpSections<Wccl::OpSequence<Wccl::StrSet> >;
 }
 
 using namespace std;