diff options
author | scott-linder <scott.b.linder@wmich.edu> | 2014-02-25 15:41:16 -0500 |
---|---|---|
committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-02-26 04:17:27 -0300 |
commit | 0ef90c13b72b74928bfb3c183c7a5bd7240b51ad (patch) | |
tree | b342ba525a153962f928e01fde7518398a4859c3 /src/main.h | |
parent | 82e0636e788f131d46451805f6c46e2d4f8496a9 (diff) | |
download | rneovim-0ef90c13b72b74928bfb3c183c7a5bd7240b51ad.tar.gz rneovim-0ef90c13b72b74928bfb3c183c7a5bd7240b51ad.tar.bz2 rneovim-0ef90c13b72b74928bfb3c183c7a5bd7240b51ad.zip |
Removes 'proto' dir
See #137 for the issue.
Every header in the proto directory was:
* Given include guards in the form
#ifndef NEOVIM_FILENAME_H
#define NEOVIM_FILENAME_H
...
#endif /* NEOVIM_FILENAM_H */
* Renamed from *.pro -> *.h
* Moved from src/proto/ to src/
This would have caused conficts with some existing headers in src/;
rather than merge these conflicts now (which is a whole other can of
worms involving multiple and conditional inclusion), any header in src/
with a conflicting name was renamed from *.h -> *_defs.h (which may or
may not actually describe its purpose, the change is purely a
namespacing issue).
Once all of these changes were made a script was developed to determine
what #includes needed to be added to each source file to describe its
dependencies and allow it to compile; because the script is so short
and I'll just list it here:
#! /bin/bash
cd $(dirname $0)
# Scrapes `make` output for provided error messages and outputs #includes
# needed to resolve them.
# $1 : part of the clang error message between filename and identifier
list_missing_includes() {
for file_missing_pair in $(CC=clang make 2>&1 >/dev/null | sed -n "s/\/\(.*\.[hc]\).*$1.*'\(.*\)'.*/\1:\2/p"); do
fields=(${file_missing_pair//:/ })
source_file=${fields[0]}
missing_func=${fields[1]}
# Try to find the declaration of the missing function.
echo $(basename $source_file) \
\#include \"$(grep -r "\b$missing_func __ARGS" | sed -n "s/.*\/\(.*\)\:.*/\1/p")\"
# Remove duplicates
done | sort | uniq
}
echo "Finding missing function prototypes..."
list_missing_includes "implicit declaration of function"
echo "Finding missing identifier declarations..."
list_missing_includes "use of undeclared identifier"
Each list of required headers was added by hand in the following format:
#include "vim.h"
#include "*_defs.h"
#include "filename.h"
/* All other includes in same module here, in alphabetical order. */
/* All includes from other modules (e.g. "os/*.h") here in alphabetical
* order. */
Diffstat (limited to 'src/main.h')
-rw-r--r-- | src/main.h | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/src/main.h b/src/main.h new file mode 100644 index 0000000000..1e407ae154 --- /dev/null +++ b/src/main.h @@ -0,0 +1,30 @@ +#ifndef NEOVIM_MAIN_H +#define NEOVIM_MAIN_H +/* main.c */ +void main_loop __ARGS((int cmdwin, int noexmode)); +void getout_preserve_modified __ARGS((int exitval)); +void getout __ARGS((int exitval)); +int process_env __ARGS((char_u *env, int is_viminit)); +void mainerr_arg_missing __ARGS((char_u *str)); +void time_push __ARGS((void *tv_rel, void *tv_start)); +void time_pop __ARGS((void *tp)); +void time_msg __ARGS((char *mesg, void *tv_start)); +void server_to_input_buf __ARGS((char_u *str)); +char_u *eval_client_expr_to_string __ARGS((char_u *expr)); +char_u *serverConvert __ARGS((char_u *client_enc, char_u *data, char_u **tofree)); +int toF_TyA __ARGS((int c)); +int fkmap __ARGS((int c)); +void conv_to_pvim __ARGS((void)); +void conv_to_pstd __ARGS((void)); +char_u *lrswap __ARGS((char_u *ibuf)); +char_u *lrFswap __ARGS((char_u *cmdbuf, int len)); +char_u *lrF_sub __ARGS((char_u *ibuf)); +int cmdl_fkmap __ARGS((int c)); +int F_isalpha __ARGS((int c)); +int F_isdigit __ARGS((int c)); +int F_ischar __ARGS((int c)); +void farsi_fkey __ARGS((cmdarg_T *cap)); +int arabic_shape __ARGS((int c, int *ccp, int *c1p, int prev_c, int prev_c1, + int next_c)); +/* vim: set ft=c : */ +#endif /* NEOVIM_MAIN_H */ |