Organising source code in ops, part 1.: The Initial Move.

libwccl/CMakeLists.txt

@@ -27,17 +27,17 @@ endif(WIN32)
 
 SET(libwccl_STAT_SRC
 	exception.cpp
-	ops/and.cpp
-	ops/affix.cpp
 	ops/formatters.cpp
-	ops/logicalpredicate.cpp
-	ops/nor.cpp
-	ops/or.cpp
-	ops/predicate.cpp
-	ops/regex.cpp
-	ops/relativeposition.cpp
-	ops/tolower.cpp
-	ops/toupper.cpp
+	ops/functions/bool/predicate.cpp
+	ops/functions/bool/predicates/and.cpp
+	ops/functions/bool/predicates/logicalpredicate.cpp
+	ops/functions/bool/predicates/nor.cpp
+	ops/functions/bool/predicates/or.cpp
+	ops/functions/bool/predicates/regex.cpp
+	ops/functions/position/relativeposition.cpp
+	ops/functions/strset/affix.cpp
+	ops/functions/strset/tolower.cpp
+	ops/functions/strset/toupper.cpp
 	parser/grammar.g
 	parser/Parser.cpp
 	parser/ParserException.cpp

libwccl/ops/formatters.h

 #ifndef LIBWCCL_OPS_FORMATTERS_H
 #define LIBWCCL_OPS_FORMATTERS_H
 
-#include <libwccl/ops/functions.h>
+#include <libwccl/ops/function.h>
 
 namespace Wccl {