Move actions/ to tagactions/ part 2.

libwccl/CMakeLists.txt

@@ -27,10 +27,6 @@ endif(WIN32)
 
 SET(libwccl_STAT_SRC
 	exception.cpp
-	ops/actions/delete.cpp
-	ops/actions/relabel.cpp
-	ops/actions/select.cpp
-	ops/actions/unify.cpp
 	ops/formatters.cpp
 	ops/functions/bool/iteration.cpp
 	ops/functions/bool/iterations/atleast.cpp
@@ -60,6 +56,10 @@ SET(libwccl_STAT_SRC
 	ops/functions/tset/getsymbolsinrange.cpp
 	ops/rulesequence.cpp
 	ops/tagaction.cpp
+	ops/tagactions/delete.cpp
+	ops/tagactions/relabel.cpp
+	ops/tagactions/select.cpp
+	ops/tagactions/unify.cpp
 	ops/tagrule.cpp
 	parser/grammar.g
 	parser/Parser.cpp

libwccl/ops/tagactions/delete.cpp

-#include <libwccl/ops/actions/delete.h>
+#include <libwccl/ops/tagactions/delete.h>
 #include <libpwrutils/foreach.h>
 #include <sstream>
 

libwccl/ops/tagactions/delete.h

-#ifndef LIBWCCL_OPS_ACTIONS_DELETE_H
-#define LIBWCCL_OPS_ACTIONS_DELETE_H
+#ifndef LIBWCCL_OPS_TAGACTIONS_DELETE_H
+#define LIBWCCL_OPS_TAGACTIONS_DELETE_H
 
 #include <libwccl/ops/tagaction.h>
 #include <libwccl/values/position.h>
@@ -66,4 +66,4 @@ private:
 
 } /* end ns Wccl */
 
-#endif // LIBWCCL_OPS_ACTIONS_DELETE_H
+#endif // LIBWCCL_OPS_TAGACTIONS_DELETE_H

libwccl/ops/tagactions/relabel.cpp

-#include <libwccl/ops/actions/relabel.h>
+#include <libwccl/ops/tagactions/relabel.h>
 #include <libpwrutils/foreach.h>
 #include <sstream>
 

libwccl/ops/tagactions/relabel.h

-#ifndef LIBWCCL_OPS_ACTIONS_RELABEL_H
-#define LIBWCCL_OPS_ACTIONS_RELABEL_H
+#ifndef LIBWCCL_OPS_TAGACTIONS_RELABEL_H
+#define LIBWCCL_OPS_TAGACTIONS_RELABEL_H
 
 #include <libwccl/ops/tagaction.h>
 #include <libwccl/values/position.h>
@@ -69,4 +69,4 @@ private:
 
 } /* end ns Wccl */
 
-#endif // LIBWCCL_OPS_ACTIONS_RELABEL_H
+#endif // LIBWCCL_OPS_TAGACTIONS_RELABEL_H

libwccl/ops/tagactions/select.cpp

-#include <libwccl/ops/actions/select.h>
+#include <libwccl/ops/tagactions/select.h>
 #include <libpwrutils/foreach.h>
 #include <sstream>
 

libwccl/ops/tagactions/select.h

-#ifndef LIBWCCL_OPS_ACTIONS_SELECT_H
-#define LIBWCCL_OPS_ACTIONS_SELECT_H
+#ifndef LIBWCCL_OPS_TAGACTIONS_SELECT_H
+#define LIBWCCL_OPS_TAGACTIONS_SELECT_H
 
 #include <libwccl/ops/tagaction.h>
 #include <libwccl/values/position.h>
@@ -66,4 +66,4 @@ private:
 
 } /* end ns Wccl */
 
-#endif // LIBWCCL_OPS_ACTIONS_SELECT_H
+#endif // LIBWCCL_OPS_TAGACTIONS_SELECT_H

libwccl/ops/tagactions/unify.cpp

-#include <libwccl/ops/actions/unify.h>
+#include <libwccl/ops/tagactions/unify.h>
 #include <libpwrutils/foreach.h>
 #include <sstream>
 

libwccl/ops/tagactions/unify.h

-#ifndef LIBWCCL_OPS_ACTIONS_UNIFY_H
-#define LIBWCCL_OPS_ACTIONS_UNIFY_H
+#ifndef LIBWCCL_OPS_TAGACTIONS_UNIFY_H
+#define LIBWCCL_OPS_TAGACTIONS_UNIFY_H
 
 #include <libwccl/ops/tagaction.h>
 #include <libwccl/values/position.h>
@@ -69,4 +69,4 @@ private:
 
 } /* end ns Wccl */
 
-#endif // LIBWCCL_OPS_ACTIONS_UNIFY_H
+#endif // LIBWCCL_OPS_TAGACTIONS_UNIFY_H

libwccl/parser/grammar.g

@@ -62,10 +62,10 @@ header {
 	#include <libwccl/ops/tagrule.h>
 	#include <libwccl/ops/rulesequence.h>
 	//
-	#include <libwccl/ops/actions/unify.h>
-	#include <libwccl/ops/actions/delete.h>
-	#include <libwccl/ops/actions/select.h>
-	#include <libwccl/ops/actions/relabel.h>
+	#include <libwccl/ops/tagactions/unify.h>
+	#include <libwccl/ops/tagactions/delete.h>
+	#include <libwccl/ops/tagactions/select.h>
+	#include <libwccl/ops/tagactions/relabel.h>
 
 
 	// Unicode String