From cfbbd4e4700c484b9945dd16fa7789b319388cca Mon Sep 17 00:00:00 2001 From: Adam Wardynski <award@.(win7-laptop)> Date: Tue, 26 Apr 2011 12:20:23 +0200 Subject: [PATCH] Follow-up files' renaming to tagrulesequence.(h|cpp) --- libwccl/CMakeLists.txt | 2 +- libwccl/ops/{rulesequence.cpp => tagrulesequence.cpp} | 2 +- libwccl/ops/{rulesequence.h => tagrulesequence.h} | 6 +++--- libwccl/parser/Parser.h | 2 +- libwccl/parser/grammar.g | 2 +- wccl-apps/wccl-rules.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename libwccl/ops/{rulesequence.cpp => tagrulesequence.cpp} (95%) rename libwccl/ops/{rulesequence.h => tagrulesequence.h} (96%) diff --git a/libwccl/CMakeLists.txt b/libwccl/CMakeLists.txt index ecf74df..99b3765 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 e82a813..ea2c3ab 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 671271e..e415098 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 0f619e7..cc36272 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 00324e0..5bf339e 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 9a8c15a..220567c 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> -- GitLab