From f83992c96d778b1c92a9cefde037538511b8784f Mon Sep 17 00:00:00 2001 From: ilor <kailoran@gmail.com> Date: Wed, 3 Nov 2010 11:15:13 +0100 Subject: [PATCH] move Value and Value subclasses to values subdir --- libwccl/CMakeLists.txt | 6 +++--- libwccl/{ => values}/bool.cpp | 2 +- libwccl/{ => values}/bool.h | 8 ++++---- libwccl/{ => values}/position.cpp | 2 +- libwccl/{ => values}/position.h | 6 +++--- libwccl/{ => values}/value.cpp | 2 +- libwccl/{ => values}/value.h | 4 ++-- libwccl/variables.h | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) rename libwccl/{ => values}/bool.cpp (70%) rename libwccl/{ => values}/bool.h (73%) rename libwccl/{ => values}/position.cpp (85%) rename libwccl/{ => values}/position.h (78%) rename libwccl/{ => values}/value.cpp (70%) rename libwccl/{ => values}/value.h (93%) diff --git a/libwccl/CMakeLists.txt b/libwccl/CMakeLists.txt index b022c58..8bbf146 100644 --- a/libwccl/CMakeLists.txt +++ b/libwccl/CMakeLists.txt @@ -11,12 +11,12 @@ link_directories(${Boost_LIBRARY_DIRS}) set(LIBS ${LIBS} ${Boost_LIBRARIES}) SET(libwccl_STAT_SRC - bool.cpp exception.cpp main.cpp - position.cpp sentencecontext.cpp - value.cpp + values/bool.cpp + values/position.cpp + values/value.cpp variables.cpp ) diff --git a/libwccl/bool.cpp b/libwccl/values/bool.cpp similarity index 70% rename from libwccl/bool.cpp rename to libwccl/values/bool.cpp index ab84cd3..eb8e2a8 100644 --- a/libwccl/bool.cpp +++ b/libwccl/values/bool.cpp @@ -1,4 +1,4 @@ -#include <libwccl/bool.h> +#include <libwccl/values/bool.h> namespace Wccl { diff --git a/libwccl/bool.h b/libwccl/values/bool.h similarity index 73% rename from libwccl/bool.h rename to libwccl/values/bool.h index d1b75b5..a668b7d 100644 --- a/libwccl/bool.h +++ b/libwccl/values/bool.h @@ -1,7 +1,7 @@ -#ifndef LIBWCCL_BOOL_H -#define LIBWCCL_BOOL_H +#ifndef LIBWCCL_VALUES_BOOL_H +#define LIBWCCL_VALUES_BOOL_H -#include <libwccl/value.h> +#include <libwccl/values/value.h> namespace Wccl { @@ -34,4 +34,4 @@ private: } /* end ns Wccl */ -#endif // LIBWCCL_BOOL_H +#endif // LIBWCCL_VALUES_BOOL_H diff --git a/libwccl/position.cpp b/libwccl/values/position.cpp similarity index 85% rename from libwccl/position.cpp rename to libwccl/values/position.cpp index f2acf82..d422ccb 100644 --- a/libwccl/position.cpp +++ b/libwccl/values/position.cpp @@ -1,4 +1,4 @@ -#include <libwccl/position.h> +#include <libwccl/values/position.h> #include <boost/lexical_cast.hpp> namespace Wccl { diff --git a/libwccl/position.h b/libwccl/values/position.h similarity index 78% rename from libwccl/position.h rename to libwccl/values/position.h index ea0b06a..ee7b059 100644 --- a/libwccl/position.h +++ b/libwccl/values/position.h @@ -1,7 +1,7 @@ -#ifndef LIBWCCL_POSITION_H -#define LIBWCCL_POSITION_H +#ifndef LIBWCCL_VALUES_POSITION_H +#define LIBWCCL_VALUES_POSITION_H -#include <libwccl/value.h> +#include <libwccl/values/value.h> #include <cstdlib> namespace Wccl { diff --git a/libwccl/value.cpp b/libwccl/values/value.cpp similarity index 70% rename from libwccl/value.cpp rename to libwccl/values/value.cpp index 89c49ac..138b4c3 100644 --- a/libwccl/value.cpp +++ b/libwccl/values/value.cpp @@ -1,4 +1,4 @@ -#include <libwccl/value.h> +#include <libwccl/values/value.h> namespace Wccl { diff --git a/libwccl/value.h b/libwccl/values/value.h similarity index 93% rename from libwccl/value.h rename to libwccl/values/value.h index 4e9e54a..c645651 100644 --- a/libwccl/value.h +++ b/libwccl/values/value.h @@ -1,5 +1,5 @@ -#ifndef LIBWCCL_VALUE_H -#define LIBWCCL_VALUE_H +#ifndef LIBWCCL_VALUES_VALUE_H +#define LIBWCCL_VALUES_VALUE_H #include <libcorpus2/tagset.h> diff --git a/libwccl/variables.h b/libwccl/variables.h index bf2259e..8cc2127 100644 --- a/libwccl/variables.h +++ b/libwccl/variables.h @@ -1,9 +1,9 @@ #ifndef LIBWCCL_VARIABLES_H #define LIBWCCL_VARIABLES_H -#include <libwccl/bool.h> +#include <libwccl/values/bool.h> #include <libwccl/exception.h> -#include <libwccl/position.h> +#include <libwccl/values/position.h> #include <iostream> #include <map> #include <string> -- GitLab