diff options
| author | ZyX <kp-pav@yandex.ru> | 2016-02-03 18:50:19 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2016-04-18 02:45:49 +0300 |
| commit | 41b44d114c030e01a7e15084d0510555ec363605 (patch) | |
| tree | bd26689febd21e38739fdb625a9042c664e09f8a | |
| parent | 704accfbfae881f60c77bf9d6147a4431f0ed5da (diff) | |
| download | rneovim-41b44d114c030e01a7e15084d0510555ec363605.tar.gz rneovim-41b44d114c030e01a7e15084d0510555ec363605.tar.bz2 rneovim-41b44d114c030e01a7e15084d0510555ec363605.zip | |
eval: Move encode.c to eval/encode.c
| -rw-r--r-- | src/nvim/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/nvim/eval.c | 2 | ||||
| -rw-r--r-- | src/nvim/eval/encode.c (renamed from src/nvim/encode.c) | 6 | ||||
| -rw-r--r-- | src/nvim/eval/encode.h (renamed from src/nvim/encode.h) | 8 | ||||
| -rw-r--r-- | src/nvim/shada.c | 2 |
5 files changed, 9 insertions, 10 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index c53a308618..7be06a99cb 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -52,6 +52,7 @@ foreach(subdir msgpack_rpc tui event + eval ) file(MAKE_DIRECTORY ${GENERATED_DIR}/${subdir}) file(MAKE_DIRECTORY ${GENERATED_INCLUDES_DIR}/${subdir}) diff --git a/src/nvim/eval.c b/src/nvim/eval.c index cfbbb6f93f..f13be7954b 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -73,7 +73,7 @@ #include "nvim/undo.h" #include "nvim/version.h" #include "nvim/window.h" -#include "nvim/encode.h" +#include "nvim/eval/encode.h" #include "nvim/os/os.h" #include "nvim/event/libuv_process.h" #include "nvim/event/pty_process.h" diff --git a/src/nvim/encode.c b/src/nvim/eval/encode.c index 57163253c3..e23e68dc62 100644 --- a/src/nvim/encode.c +++ b/src/nvim/eval/encode.c @@ -4,13 +4,11 @@ /// /// Split out from eval.c. -// TODO(ZyX-I): Move this to src/nvim/viml or src/nvim/eval - #include <msgpack.h> #include <inttypes.h> #include <assert.h> -#include "nvim/encode.h" +#include "nvim/eval/encode.h" #include "nvim/buffer_defs.h" // vimconv_T #include "nvim/eval.h" #include "nvim/eval_defs.h" @@ -63,7 +61,7 @@ const char *const encode_special_var_names[] = { }; #ifdef INCLUDE_GENERATED_DECLARATIONS -# include "encode.c.generated.h" +# include "eval/encode.c.generated.h" #endif /// Msgpack callback for writing to readfile()-style list diff --git a/src/nvim/encode.h b/src/nvim/eval/encode.h index 5b81ed84dc..0e60c96155 100644 --- a/src/nvim/encode.h +++ b/src/nvim/eval/encode.h @@ -1,5 +1,5 @@ -#ifndef NVIM_ENCODE_H -#define NVIM_ENCODE_H +#ifndef NVIM_EVAL_ENCODE_H +#define NVIM_EVAL_ENCODE_H #include <stddef.h> @@ -55,6 +55,6 @@ static inline ListReaderState encode_init_lrstate(const list_T *const list) extern const char *const encode_special_var_names[]; #ifdef INCLUDE_GENERATED_DECLARATIONS -# include "encode.h.generated.h" +# include "eval/encode.h.generated.h" #endif -#endif // NVIM_ENCODE_H +#endif // NVIM_EVAL_ENCODE_H diff --git a/src/nvim/shada.c b/src/nvim/shada.c index 22767dbe35..f402b75ad6 100644 --- a/src/nvim/shada.c +++ b/src/nvim/shada.c @@ -39,7 +39,7 @@ #include "nvim/fileio.h" #include "nvim/strings.h" #include "nvim/quickfix.h" -#include "nvim/encode.h" +#include "nvim/eval/encode.h" #include "nvim/lib/khash.h" #include "nvim/lib/kvec.h" |