diff --git a/libwccl/CMakeLists.txt b/libwccl/CMakeLists.txt index ecf74dfecea0e4b2e8b7e4c79f1c6168f231efe3..99b3765484a77babedc3b204598ff76b1b8757cf 100644 --- a/libwccl/CMakeLists.txt +++ b/libwccl/CMakeLists.txt @@ -71,7 +71,6 @@ SET(libwccl_STAT_SRC ops/match/conditions/repeatedmatch.cpp ops/match/conditions/tokencondition.cpp ops/matchrule.cpp - ops/rulesequence.cpp ops/tagaction.cpp ops/tagactions/delete.cpp ops/tagactions/mark.cpp @@ -80,6 +79,7 @@ SET(libwccl_STAT_SRC ops/tagactions/unify.cpp ops/tagactions/unmark.cpp ops/tagrule.cpp + ops/tagrulesequence.cpp parser/grammar.g parser/Parser.cpp parser/ParserException.cpp diff --git a/libwccl/ops/rulesequence.cpp b/libwccl/ops/tagrulesequence.cpp similarity index 95% rename from libwccl/ops/rulesequence.cpp rename to libwccl/ops/tagrulesequence.cpp index e82a8133058961c4cc33b164cf7fd92454d1b320..ea2c3abf3dacfe345f6e5cdee46e8a1370564945 100644 --- a/libwccl/ops/rulesequence.cpp +++ b/libwccl/ops/tagrulesequence.cpp @@ -1,4 +1,4 @@ -#include <libwccl/ops/rulesequence.h> +#include <libwccl/ops/tagrulesequence.h> #include <libpwrutils/foreach.h> diff --git a/libwccl/ops/rulesequence.h b/libwccl/ops/tagrulesequence.h similarity index 96% rename from libwccl/ops/rulesequence.h rename to libwccl/ops/tagrulesequence.h index 671271e7359b01703bd9059978de07ae54730168..e415098d38adda9992a660f8ba315b607ff69a62 100644 --- a/libwccl/ops/rulesequence.h +++ b/libwccl/ops/tagrulesequence.h @@ -1,5 +1,5 @@ -#ifndef LIBWCCL_OPS_RULESEQUENCE_H -#define LIBWCCL_OPS_RULESEQUENCE_H +#ifndef LIBWCCL_OPS_TAGRULESEQUENCE_H +#define LIBWCCL_OPS_TAGRULESEQUENCE_H #include <libwccl/ops/tagrule.h> @@ -89,4 +89,4 @@ Bool TagRuleSequence::operator()(const boost::shared_ptr<Corpus2::Sentence>& sen } /* end ns Wccl */ -#endif // LIBWCCL_OPS_RULESEQUENCE_H +#endif // LIBWCCL_OPS_TAGRULESEQUENCE_H diff --git a/libwccl/parser/Parser.h b/libwccl/parser/Parser.h index 0f619e7229f0fa4c965ee9b0f0506d6f453e782f..cc362727e4b08a2727817753532896555edd4756 100644 --- a/libwccl/parser/Parser.h +++ b/libwccl/parser/Parser.h @@ -15,7 +15,7 @@ #include <libwccl/ops/operator.h> // rules -#include <libwccl/ops/rulesequence.h> +#include <libwccl/ops/tagrulesequence.h> // match actions #include <libwccl/ops/matchrule.h> diff --git a/libwccl/parser/grammar.g b/libwccl/parser/grammar.g index 00324e02fbc6e5beb39420e9bb636f2f1914e846..5bf339ef5e3b7883668579c8cb7ee9fe1072b1ff 100644 --- a/libwccl/parser/grammar.g +++ b/libwccl/parser/grammar.g @@ -68,7 +68,7 @@ header { // Rules, actions #include <libwccl/ops/tagrule.h> #include <libwccl/ops/matchrule.h> - #include <libwccl/ops/rulesequence.h> + #include <libwccl/ops/tagrulesequence.h> // #include <libwccl/ops/tagactions/unify.h> #include <libwccl/ops/tagactions/delete.h> diff --git a/wccl-apps/wccl-rules.cpp b/wccl-apps/wccl-rules.cpp index 9a8c15a36893cf711da8f9e85134af95727e3e66..220567c6b6ee4427f67c31aa9ae49da978d4bc3e 100644 --- a/wccl-apps/wccl-rules.cpp +++ b/wccl-apps/wccl-rules.cpp @@ -5,7 +5,7 @@ #include <libwccl/values/strset.h> #include <libwccl/parser/Parser.h> -#include <libwccl/ops/rulesequence.h> +#include <libwccl/ops/tagrulesequence.h> #include <libcorpus2/tagsetmanager.h> #include <libcorpus2/util/tokentimer.h>