From 9914b43df6f8a665a96e926dde05895eaa6efcff Mon Sep 17 00:00:00 2001
From: ilor <kailoran@gmail.com>
Date: Thu, 26 May 2011 13:01:56 +0200
Subject: [PATCH] remove redundant and wrong 'libccl' prefixes from swig .i
 files

---
 ...ctionexeccontext.i => actionexeccontext.i} |  4 +-
 ...cclannotationmatch.i => annotationmatch.i} |  2 +-
 swig/{libcclbool.i => bool.i}                 |  2 +-
 swig/{libcclexpression.i => expression.i}     |  0
 ...ctionaloperator.i => functionaloperator.i} |  8 +--
 ...nalopsequence.i => functionalopsequence.i} |  6 +-
 swig/{libccllexicon.i => lexicon.i}           |  2 +-
 swig/{libccllexicons.i => lexicons.i}         |  2 +-
 swig/{libcclmatch.i => match.i}               | 10 ++--
 swig/{libcclmatchdata.i => matchdata.i}       |  2 +-
 swig/{libcclmatchrule.i => matchrule.i}       |  4 +-
 ...atchrulesequence.i => matchrulesequence.i} |  4 +-
 swig/{libcclmatchvector.i => matchvector.i}   |  8 +--
 swig/{libccloperator.i => operator.i}         | 10 ++--
 ...lparsedexpression.i => parsedexpression.i} | 14 ++---
 swig/{libcclparser.i => parser.i}             | 10 ++--
 swig/{libcclposition.i => position.i}         |  2 +-
 ...cclsentencecontext.i => sentencecontext.i} |  2 +-
 swig/{libcclstrset.i => strset.i}             |  2 +-
 swig/{libccltagaction.i => tagaction.i}       |  6 +-
 swig/{libccltagrule.i => tagrule.i}           | 10 ++--
 ...ccltagrulesequence.i => tagrulesequence.i} |  6 +-
 swig/{libccltokenmatch.i => tokenmatch.i}     |  2 +-
 swig/{libccltset.i => tset.i}                 |  2 +-
 swig/{libcclvalue.i => value.i}               |  0
 swig/{libcclvariables.i => variables.i}       | 12 ++--
 swig/wccl.i                                   | 56 +++++++++----------
 swig/{libcclwcclfile.i => wcclfile.i}         | 24 ++++----
 ...lfileopsections.i => wcclfileopsections.i} | 14 ++---
 29 files changed, 113 insertions(+), 113 deletions(-)
 rename swig/{libcclactionexeccontext.i => actionexeccontext.i} (91%)
 rename swig/{libcclannotationmatch.i => annotationmatch.i} (97%)
 rename swig/{libcclbool.i => bool.i} (96%)
 rename swig/{libcclexpression.i => expression.i} (100%)
 rename swig/{libcclfunctionaloperator.i => functionaloperator.i} (88%)
 rename swig/{libcclfunctionalopsequence.i => functionalopsequence.i} (98%)
 rename swig/{libccllexicon.i => lexicon.i} (98%)
 rename swig/{libccllexicons.i => lexicons.i} (98%)
 rename swig/{libcclmatch.i => match.i} (93%)
 rename swig/{libcclmatchdata.i => matchdata.i} (98%)
 rename swig/{libcclmatchrule.i => matchrule.i} (95%)
 rename swig/{libcclmatchrulesequence.i => matchrulesequence.i} (95%)
 rename swig/{libcclmatchvector.i => matchvector.i} (93%)
 rename swig/{libccloperator.i => operator.i} (93%)
 rename swig/{libcclparsedexpression.i => parsedexpression.i} (91%)
 rename swig/{libcclparser.i => parser.i} (95%)
 rename swig/{libcclposition.i => position.i} (97%)
 rename swig/{libcclsentencecontext.i => sentencecontext.i} (98%)
 rename swig/{libcclstrset.i => strset.i} (98%)
 rename swig/{libccltagaction.i => tagaction.i} (83%)
 rename swig/{libccltagrule.i => tagrule.i} (92%)
 rename swig/{libccltagrulesequence.i => tagrulesequence.i} (94%)
 rename swig/{libccltokenmatch.i => tokenmatch.i} (96%)
 rename swig/{libccltset.i => tset.i} (98%)
 rename swig/{libcclvalue.i => value.i} (100%)
 rename swig/{libcclvariables.i => variables.i} (97%)
 rename swig/{libcclwcclfile.i => wcclfile.i} (97%)
 rename swig/{libcclwcclfileopsections.i => wcclfileopsections.i} (94%)

diff --git a/swig/libcclactionexeccontext.i b/swig/actionexeccontext.i
similarity index 91%
rename from swig/libcclactionexeccontext.i
rename to swig/actionexeccontext.i
index 528164b..61084ad 100644
--- a/swig/libcclactionexeccontext.i
+++ b/swig/actionexeccontext.i
@@ -6,8 +6,8 @@
   #include <libwccl/ops/tagaction.h>
 %}
 
-%include "libcclvariables.i"
-%include "libcclsentencecontext.i"
+%include "variables.i"
+%include "sentencecontext.i"
 
 namespace Wccl {
   class ActionExecContext {
diff --git a/swig/libcclannotationmatch.i b/swig/annotationmatch.i
similarity index 97%
rename from swig/libcclannotationmatch.i
rename to swig/annotationmatch.i
index ac1d4cb..1edda40 100644
--- a/swig/libcclannotationmatch.i
+++ b/swig/annotationmatch.i
@@ -6,7 +6,7 @@
   #include <libwccl/values/annotationmatch.h>
 %}
 
-%include "libcclmatchdata.i"
+%include "matchdata.i"
 %include "libcorpus2/libcorpusannotatedsentence.i"
 
 %include "std_string.i"
diff --git a/swig/libcclbool.i b/swig/bool.i
similarity index 96%
rename from swig/libcclbool.i
rename to swig/bool.i
index d19104d..7f4ff3a 100644
--- a/swig/libcclbool.i
+++ b/swig/bool.i
@@ -7,7 +7,7 @@
   #include <libwccl/values/bool.h>
 %}
 
-%include "libcclvalue.i"
+%include "value.i"
 %include "std_string.i"
 
 %feature("notabstract") Wccl::Bool;
diff --git a/swig/libcclexpression.i b/swig/expression.i
similarity index 100%
rename from swig/libcclexpression.i
rename to swig/expression.i
diff --git a/swig/libcclfunctionaloperator.i b/swig/functionaloperator.i
similarity index 88%
rename from swig/libcclfunctionaloperator.i
rename to swig/functionaloperator.i
index c4ccc8a..9ae78cf 100644
--- a/swig/libcclfunctionaloperator.i
+++ b/swig/functionaloperator.i
@@ -6,10 +6,10 @@
   #include <libwccl/ops/operator.h>
 %}
 
-%include "libcclvalue.i"
-%include "libcclvariables.i"
-%include "libcclsentencecontext.i"
-%include "libcclparsedexpression.i"
+%include "value.i"
+%include "variables.i"
+%include "sentencecontext.i"
+%include "parsedexpression.i"
 
 %include "std_string.i"
 %include <libcorpus2/boost_shared_ptr.i>
diff --git a/swig/libcclfunctionalopsequence.i b/swig/functionalopsequence.i
similarity index 98%
rename from swig/libcclfunctionalopsequence.i
rename to swig/functionalopsequence.i
index b66e4e4..4d1aeff 100644
--- a/swig/libcclfunctionalopsequence.i
+++ b/swig/functionalopsequence.i
@@ -6,9 +6,9 @@
   #include <libwccl/ops/opsequence.h>
 %}
 
-%include "libccloperator.i"
-%include "libcclexpression.i"
-%include "libcclfunctionaloperator.i"
+%include "operator.i"
+%include "expression.i"
+%include "functionaloperator.i"
 
 %include "std_pair.i"
 %include "std_string.i"
diff --git a/swig/libccllexicon.i b/swig/lexicon.i
similarity index 98%
rename from swig/libccllexicon.i
rename to swig/lexicon.i
index 1a3f136..b9004e4 100644
--- a/swig/libccllexicon.i
+++ b/swig/lexicon.i
@@ -9,7 +9,7 @@
   #include <boost/unordered_map.hpp>
 %}
 
-%include "libcclstrset.i"
+%include "strset.i"
 
 %include "std_string.i"
 %include <libcorpus2/boost_shared_ptr.i>
diff --git a/swig/libccllexicons.i b/swig/lexicons.i
similarity index 98%
rename from swig/libccllexicons.i
rename to swig/lexicons.i
index b565386..a1b1c70 100644
--- a/swig/libccllexicons.i
+++ b/swig/lexicons.i
@@ -6,7 +6,7 @@
   #include <libwccl/lexicon/lexicons.h>
 %}
 
-%include "libccllexicon.i"
+%include "lexicon.i"
 
 %include "std_string.i"
 %include <libcorpus2/boost_shared_ptr.i>
diff --git a/swig/libcclmatch.i b/swig/match.i
similarity index 93%
rename from swig/libcclmatch.i
rename to swig/match.i
index 321d130..0c817a1 100644
--- a/swig/libcclmatch.i
+++ b/swig/match.i
@@ -6,11 +6,11 @@
   #include <libwccl/values/match.h>
 %}
 
-%include "libcclvalue.i"
-%include "libcclmatchdata.i"
-%include "libccltokenmatch.i"
-%include "libcclannotationmatch.i"
-%include "libcclmatchvector.i"
+%include "value.i"
+%include "matchdata.i"
+%include "tokenmatch.i"
+%include "annotationmatch.i"
+%include "matchvector.i"
 %include "libcorpus2/libcorpusannotatedsentence.i"
 
 %include "std_string.i"
diff --git a/swig/libcclmatchdata.i b/swig/matchdata.i
similarity index 98%
rename from swig/libcclmatchdata.i
rename to swig/matchdata.i
index c92eae2..e750141 100644
--- a/swig/libcclmatchdata.i
+++ b/swig/matchdata.i
@@ -6,7 +6,7 @@
   #include <libwccl/values/matchdata.h>
 %}
 
-%include "libcclmatch.i"
+%include "match.i"
 %include "libcorpus2/libcorpusannotatedsentence.i"
 
 %include "std_string.i"
diff --git a/swig/libcclmatchrule.i b/swig/matchrule.i
similarity index 95%
rename from swig/libcclmatchrule.i
rename to swig/matchrule.i
index b80319e..887e81e 100644
--- a/swig/libcclmatchrule.i
+++ b/swig/matchrule.i
@@ -6,8 +6,8 @@
   #include <libwccl/ops/matchrule.h>
 %}
 
-%include "libcclvariables.i"
-%include "libcclparsedexpression.i"
+%include "variables.i"
+%include "parsedexpression.i"
 %include "libcorpus2/libcorpusannotatedsentence.i"
 
 %include "std_string.i"
diff --git a/swig/libcclmatchrulesequence.i b/swig/matchrulesequence.i
similarity index 95%
rename from swig/libcclmatchrulesequence.i
rename to swig/matchrulesequence.i
index d68f5fd..0f975e8 100644
--- a/swig/libcclmatchrulesequence.i
+++ b/swig/matchrulesequence.i
@@ -6,8 +6,8 @@
   #include <libwccl/ops/matchrulesequence.h>
 %}
 
-%include "libcclmatchrule.i"
-%include "libcclexpression.i"
+%include "matchrule.i"
+%include "expression.i"
 %include "libcorpus2/libcorpusannotatedsentence.i"
 
 %include "std_string.i"
diff --git a/swig/libcclmatchvector.i b/swig/matchvector.i
similarity index 93%
rename from swig/libcclmatchvector.i
rename to swig/matchvector.i
index d96af40..8df311a 100644
--- a/swig/libcclmatchvector.i
+++ b/swig/matchvector.i
@@ -6,10 +6,10 @@
   #include <libwccl/values/matchvector.h>
 %}
 
-%include "libcclmatch.i"
-%include "libcclmatchdata.i"
-%include "libccltokenmatch.i"
-%include "libcclannotationmatch.i"
+%include "match.i"
+%include "matchdata.i"
+%include "tokenmatch.i"
+%include "annotationmatch.i"
 %include "libcorpus2/libcorpusannotatedsentence.i"
 
 %include "std_string.i"
diff --git a/swig/libccloperator.i b/swig/operator.i
similarity index 93%
rename from swig/libccloperator.i
rename to swig/operator.i
index 450d555..fa7c5c9 100644
--- a/swig/libccloperator.i
+++ b/swig/operator.i
@@ -7,13 +7,13 @@
 %}
 
 
-%include "libcclvalue.i"
-%include "libcclsentencecontext.i"
-%include "libcclfunctionaloperator.i"
+%include "value.i"
+%include "sentencecontext.i"
+%include "functionaloperator.i"
 
 /*
-%include "libcclvariables.i"
-%include "libcclparsedexpression.i"
+%include "variables.i"
+%include "parsedexpression.i"
 */
 
 %include "std_string.i"
diff --git a/swig/libcclparsedexpression.i b/swig/parsedexpression.i
similarity index 91%
rename from swig/libcclparsedexpression.i
rename to swig/parsedexpression.i
index 8c9e2b3..6fcffb0 100644
--- a/swig/libcclparsedexpression.i
+++ b/swig/parsedexpression.i
@@ -6,14 +6,14 @@
   #include <libwccl/ops/parsedexpression.h>
 %}
 
-%include "libcclvalue.i"
+%include "value.i"
 
-%include "libcclmatch.i"
-%include "libcclbool.i"
-%include "libccltset.i"
-%include "libcclstrset.i"
-%include "libcclposition.i"
-%include "libcclexpression.i"
+%include "match.i"
+%include "bool.i"
+%include "tset.i"
+%include "strset.i"
+%include "position.i"
+%include "expression.i"
 
 %include "std_string.i"
 %include <libcorpus2/boost_shared_ptr.i>
diff --git a/swig/libcclparser.i b/swig/parser.i
similarity index 95%
rename from swig/libcclparser.i
rename to swig/parser.i
index 950f5a3..2da5c3a 100644
--- a/swig/libcclparser.i
+++ b/swig/parser.i
@@ -6,11 +6,11 @@
   #include <libwccl/parser/Parser.h>
 %}
 
-%include "libccltagrule.i"
-%include "libccltagrulesequence.i"
-%include "libcclmatchrule.i"
-%include "libcclwcclfile.i"
-%include "libcclfunctionaloperator.i"
+%include "tagrule.i"
+%include "tagrulesequence.i"
+%include "matchrule.i"
+%include "wcclfile.i"
+%include "functionaloperator.i"
 
 %include "libcorpus2/libcorpustagset.i"
 
diff --git a/swig/libcclposition.i b/swig/position.i
similarity index 97%
rename from swig/libcclposition.i
rename to swig/position.i
index b0ce83f..c5d1698 100644
--- a/swig/libcclposition.i
+++ b/swig/position.i
@@ -8,7 +8,7 @@
   #include <boost/integer_traits.hpp>
 %}
 
-%include "libcclvalue.i"
+%include "value.i"
 %include "std_string.i"
 
 %feature("notabstract") Wccl::Position;
diff --git a/swig/libcclsentencecontext.i b/swig/sentencecontext.i
similarity index 98%
rename from swig/libcclsentencecontext.i
rename to swig/sentencecontext.i
index 4626626..87c69b9 100644
--- a/swig/libcclsentencecontext.i
+++ b/swig/sentencecontext.i
@@ -10,7 +10,7 @@
 %include "libcorpus2/libcorpuslexeme.i"
 %include "libcorpus2/libcorpussentence.i"
 
-%include "libcclposition.i"
+%include "position.i"
 
 %include "std_string.i"
 %include <libcorpus2/boost_shared_ptr.i>
diff --git a/swig/libcclstrset.i b/swig/strset.i
similarity index 98%
rename from swig/libcclstrset.i
rename to swig/strset.i
index fc2f444..4591c0e 100644
--- a/swig/libcclstrset.i
+++ b/swig/strset.i
@@ -9,7 +9,7 @@
   #include <libcorpus2/lexeme.h>
 %}
 
-%include "libcclvalue.i"
+%include "value.i"
 %include "std_string.i"
 
 %feature("notabstract") Wccl::StrSet;
diff --git a/swig/libccltagaction.i b/swig/tagaction.i
similarity index 83%
rename from swig/libccltagaction.i
rename to swig/tagaction.i
index 7d0e477..3067137 100644
--- a/swig/libccltagaction.i
+++ b/swig/tagaction.i
@@ -6,9 +6,9 @@
   #include <libwccl/ops/tagaction.h>
 %}
 
-%include "libcclbool.i"
-%include "libcclexpression.i"
-%include "libcclactionexeccontext.i"
+%include "bool.i"
+%include "expression.i"
+%include "actionexeccontext.i"
 
 %include "std_string.i"
 
diff --git a/swig/libccltagrule.i b/swig/tagrule.i
similarity index 92%
rename from swig/libccltagrule.i
rename to swig/tagrule.i
index b6f2f81..ad8c502 100644
--- a/swig/libccltagrule.i
+++ b/swig/tagrule.i
@@ -6,11 +6,11 @@
   #include <libwccl/ops/tagrule.h>
 %}
 
-%include "libcclbool.i"
-%include "libccltagaction.i"
-%include "libcclvariables.i"
-%include "libcclsentencecontext.i"
-%include "libcclparsedexpression.i"
+%include "bool.i"
+%include "tagaction.i"
+%include "variables.i"
+%include "sentencecontext.i"
+%include "parsedexpression.i"
 
 %include "libcorpus2/libcorpustagset.i"
 
diff --git a/swig/libccltagrulesequence.i b/swig/tagrulesequence.i
similarity index 94%
rename from swig/libccltagrulesequence.i
rename to swig/tagrulesequence.i
index 0f7f224..55f0fba 100644
--- a/swig/libccltagrulesequence.i
+++ b/swig/tagrulesequence.i
@@ -6,9 +6,9 @@
   #include <libwccl/ops/tagrulesequence.h>
 %}
 
-%include "libcclbool.i"
-%include "libccltagrule.i"
-%include "libcclexpression.i"
+%include "bool.i"
+%include "tagrule.i"
+%include "expression.i"
 %include "libcorpus2/libcorpussentence.i"
 
 %include "std_string.i"
diff --git a/swig/libccltokenmatch.i b/swig/tokenmatch.i
similarity index 96%
rename from swig/libccltokenmatch.i
rename to swig/tokenmatch.i
index 6483412..5ace238 100644
--- a/swig/libccltokenmatch.i
+++ b/swig/tokenmatch.i
@@ -6,7 +6,7 @@
   #include <libwccl/values/tokenmatch.h>
 %}
 
-%include "libcclmatchdata.i"
+%include "matchdata.i"
 %include "libcorpus2/libcorpusannotatedsentence.i"
 
 %nodefaultctor Wccl::TokenMatch;
diff --git a/swig/libccltset.i b/swig/tset.i
similarity index 98%
rename from swig/libccltset.i
rename to swig/tset.i
index 79b792f..4afc4c5 100644
--- a/swig/libccltset.i
+++ b/swig/tset.i
@@ -9,7 +9,7 @@
 
 /* Include required headers */
 %include "std_string.i"
-%include "libcclvalue.i"
+%include "value.i"
 %include "libcorpus2/libcorpustag.i"
 %include "libcorpus2/libcorpustagset.i"
 
diff --git a/swig/libcclvalue.i b/swig/value.i
similarity index 100%
rename from swig/libcclvalue.i
rename to swig/value.i
diff --git a/swig/libcclvariables.i b/swig/variables.i
similarity index 97%
rename from swig/libcclvariables.i
rename to swig/variables.i
index 98bd25f..00eb421 100644
--- a/swig/libcclvariables.i
+++ b/swig/variables.i
@@ -6,12 +6,12 @@
   #include <libwccl/variables.h>
 %}
 
-%include "libcclvalue.i"
-%include "libcclmatch.i"
-%include "libcclbool.i"
-%include "libcclposition.i"
-%include "libcclstrset.i"
-%include "libccltset.i"
+%include "value.i"
+%include "match.i"
+%include "bool.i"
+%include "position.i"
+%include "strset.i"
+%include "tset.i"
 
 %include "std_string.i"
 %include <libcorpus2/boost_shared_ptr.i>
diff --git a/swig/wccl.i b/swig/wccl.i
index c97e40f..6d85be8 100644
--- a/swig/wccl.i
+++ b/swig/wccl.i
@@ -6,33 +6,33 @@
   //
 %}
 %include <libcorpus2/unicodestring.i>
-%include "libcclactionexeccontext.i"
-%include "libcclannotationmatch.i"
-%include "libcclbool.i"
-%include "libcclexpression.i"
-%include "libcclfunctionaloperator.i"
-%include "libcclmatchdata.i"
-%include "libcclmatch.i"
-%include "libcclmatchrule.i"
-%include "libcclmatchvector.i"
-%include "libccloperator.i"
-%include "libcclparsedexpression.i"
-%include "libcclparser.i"
-%include "libcclposition.i"
-%include "libcclsentencecontext.i"
-%include "libcclstrset.i"
-%include "libccltagaction.i"
-%include "libccltagrule.i"
-%include "libccltagrulesequence.i"
-%include "libccltokenmatch.i"
-%include "libccltset.i"
-%include "libcclvalue.i"
-%include "libcclvariables.i"
-%include "libcclfunctionalopsequence.i"
-%include "libcclwcclfileopsections.i"
-%include "libcclmatchrulesequence.i"
-%include "libccllexicon.i"
-%include "libccllexicons.i"
-%include "libcclwcclfile.i"
+%include "actionexeccontext.i"
+%include "annotationmatch.i"
+%include "bool.i"
+%include "expression.i"
+%include "functionaloperator.i"
+%include "matchdata.i"
+%include "match.i"
+%include "matchrule.i"
+%include "matchvector.i"
+%include "operator.i"
+%include "parsedexpression.i"
+%include "parser.i"
+%include "position.i"
+%include "sentencecontext.i"
+%include "strset.i"
+%include "tagaction.i"
+%include "tagrule.i"
+%include "tagrulesequence.i"
+%include "tokenmatch.i"
+%include "tset.i"
+%include "value.i"
+%include "variables.i"
+%include "functionalopsequence.i"
+%include "wcclfileopsections.i"
+%include "matchrulesequence.i"
+%include "lexicon.i"
+%include "lexicons.i"
+%include "wcclfile.i"
 
 #endif /* SWIG_LIBWCCL_I */
diff --git a/swig/libcclwcclfile.i b/swig/wcclfile.i
similarity index 97%
rename from swig/libcclwcclfile.i
rename to swig/wcclfile.i
index 7752e6a..76922e3 100644
--- a/swig/libcclwcclfile.i
+++ b/swig/wcclfile.i
@@ -6,18 +6,18 @@
   #include <libwccl/wcclfile.h>
 %}
 
-%include "libcclbool.i"
-%include "libccltset.i"
-%include "libcclmatch.i"
-%include "libcclstrset.i"
-%include "libcclposition.i"
-%include "libccllexicon.i"
-%include "libccllexicons.i"
-%include "libccltagrulesequence.i"
-%include "libcclmatchrulesequence.i"
-%include "libcclfunctionaloperator.i"
-%include "libcclwcclfileopsections.i"
-%include "libcclfunctionalopsequence.i"
+%include "bool.i"
+%include "tset.i"
+%include "match.i"
+%include "strset.i"
+%include "position.i"
+%include "lexicon.i"
+%include "lexicons.i"
+%include "tagrulesequence.i"
+%include "matchrulesequence.i"
+%include "functionaloperator.i"
+%include "wcclfileopsections.i"
+%include "functionalopsequence.i"
 
 %include "libcorpus2/libcorpustagset.i"
 
diff --git a/swig/libcclwcclfileopsections.i b/swig/wcclfileopsections.i
similarity index 94%
rename from swig/libcclwcclfileopsections.i
rename to swig/wcclfileopsections.i
index a8ee450..8b22240 100644
--- a/swig/libcclwcclfileopsections.i
+++ b/swig/wcclfileopsections.i
@@ -6,13 +6,13 @@
   #include <libwccl/wcclfileopsections.h>
 %}
 
-%include "libcclbool.i"
-%include "libcclmatch.i"
-%include "libcclposition.i"
-%include "libcclstrset.i"
-%include "libccltset.i"
-%include "libcclvalue.i"
-%include "libcclfunctionalopsequence.i"
+%include "bool.i"
+%include "match.i"
+%include "position.i"
+%include "strset.i"
+%include "tset.i"
+%include "value.i"
+%include "functionalopsequence.i"
 
 %include "std_string.i"
 %include "std_vector.i"
-- 
GitLab