From 1f557d6841d2218ad0b3a1bf68ab4a6427250faf Mon Sep 17 00:00:00 2001
From: Adam Wardynski <award@.(B-4.4.46a)>
Date: Mon, 7 Mar 2011 13:30:49 +0100
Subject: [PATCH] Rename Action to TagAction, part two, renaming files
---
libwccl/CMakeLists.txt | 2 +-
libwccl/ops/actions/unify.h | 4 ++--
libwccl/ops/{action.cpp => tagaction.cpp} | 0
libwccl/ops/{action.h => tagaction.h} | 0
libwccl/ops/tagrule.h | 2 +-
5 files changed, 4 insertions(+), 4 deletions(-)
rename libwccl/ops/{action.cpp => tagaction.cpp} (100%)
rename libwccl/ops/{action.h => tagaction.h} (100%)
diff --git a/libwccl/CMakeLists.txt b/libwccl/CMakeLists.txt
index 74be551..5f1f429 100644
--- a/libwccl/CMakeLists.txt
+++ b/libwccl/CMakeLists.txt
@@ -27,7 +27,6 @@ endif(WIN32)
SET(libwccl_STAT_SRC
exception.cpp
- ops/action.cpp
ops/actions/delete.cpp
ops/actions/relabel.cpp
ops/actions/select.cpp
@@ -60,6 +59,7 @@ SET(libwccl_STAT_SRC
ops/functions/tset/getsymbols.cpp
ops/functions/tset/getsymbolsinrange.cpp
ops/rulesequence.cpp
+ ops/tagaction.cpp
ops/tagrule.cpp
parser/grammar.g
parser/Parser.cpp
diff --git a/libwccl/ops/actions/unify.h b/libwccl/ops/actions/unify.h
index 0acd890..29f3849 100644
--- a/libwccl/ops/actions/unify.h
+++ b/libwccl/ops/actions/unify.h
@@ -1,7 +1,7 @@
#ifndef LIBWCCL_OPS_ACTIONS_UNIFY_H
#define LIBWCCL_OPS_ACTIONS_UNIFY_H
-#include <libwccl/ops/action.h>
+#include <libwccl/ops/tagaction.h>
#include <libwccl/values/position.h>
#include <libwccl/values/bool.h>
#include <libwccl/ops/function.h>
@@ -12,7 +12,7 @@ namespace Wccl {
* Action to unify tokens on an agreement, removing lexemes
* that violate the agreement.
*/
-class Unify : public Action
+class Unify : public TagAction
{
public:
typedef boost::shared_ptr<Function<Position> > PosFunctionPtr;
diff --git a/libwccl/ops/action.cpp b/libwccl/ops/tagaction.cpp
similarity index 100%
rename from libwccl/ops/action.cpp
rename to libwccl/ops/tagaction.cpp
diff --git a/libwccl/ops/action.h b/libwccl/ops/tagaction.h
similarity index 100%
rename from libwccl/ops/action.h
rename to libwccl/ops/tagaction.h
diff --git a/libwccl/ops/tagrule.h b/libwccl/ops/tagrule.h
index 44813c4..daee750 100644
--- a/libwccl/ops/tagrule.h
+++ b/libwccl/ops/tagrule.h
@@ -221,7 +221,7 @@ TagRule& TagRule::operator=(const TagRule& other) {
inline
TagRule::TagRule()
: ParsedExpression((Variables())),
- actions_(boost::make_shared<std::vector<boost::shared_ptr<Action> > >()),
+ actions_(boost::make_shared<std::vector<boost::shared_ptr<TagAction> > >()),
condition_(detail::DefaultFunction<Bool>()),
name_()
--
GitLab