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/search.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/search.h')
-rw-r--r-- | src/search.h | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/src/search.h b/src/search.h new file mode 100644 index 0000000000..b24d2aa69a --- /dev/null +++ b/src/search.h @@ -0,0 +1,52 @@ +#ifndef NEOVIM_SEARCH_H +#define NEOVIM_SEARCH_H +/* search.c */ +int search_regcomp __ARGS((char_u *pat, int pat_save, int pat_use, int options, + regmmatch_T *regmatch)); +char_u *get_search_pat __ARGS((void)); +char_u *reverse_text __ARGS((char_u *s)); +void save_search_patterns __ARGS((void)); +void restore_search_patterns __ARGS((void)); +void free_search_patterns __ARGS((void)); +int ignorecase __ARGS((char_u *pat)); +int pat_has_uppercase __ARGS((char_u *pat)); +char_u *last_search_pat __ARGS((void)); +void reset_search_dir __ARGS((void)); +void set_last_search_pat __ARGS((char_u *s, int idx, int magic, int setlast)); +void last_pat_prog __ARGS((regmmatch_T *regmatch)); +int searchit __ARGS((win_T *win, buf_T *buf, pos_T *pos, int dir, char_u *pat, + long count, int options, int pat_use, linenr_T stop_lnum, + proftime_T *tm)); +void set_search_direction __ARGS((int cdir)); +int do_search __ARGS((oparg_T *oap, int dirc, char_u *pat, long count, + int options, + proftime_T *tm)); +int search_for_exact_line __ARGS((buf_T *buf, pos_T *pos, int dir, char_u *pat)); +int searchc __ARGS((cmdarg_T *cap, int t_cmd)); +pos_T *findmatch __ARGS((oparg_T *oap, int initc)); +pos_T *findmatchlimit __ARGS((oparg_T *oap, int initc, int flags, int maxtravel)); +void showmatch __ARGS((int c)); +int findsent __ARGS((int dir, long count)); +int findpar __ARGS((int *pincl, int dir, long count, int what, int both)); +int startPS __ARGS((linenr_T lnum, int para, int both)); +int fwd_word __ARGS((long count, int bigword, int eol)); +int bck_word __ARGS((long count, int bigword, int stop)); +int end_word __ARGS((long count, int bigword, int stop, int empty)); +int bckend_word __ARGS((long count, int bigword, int eol)); +int current_word __ARGS((oparg_T *oap, long count, int include, int bigword)); +int current_sent __ARGS((oparg_T *oap, long count, int include)); +int current_block __ARGS((oparg_T *oap, long count, int include, int what, + int other)); +int current_tagblock __ARGS((oparg_T *oap, long count_arg, int include)); +int current_par __ARGS((oparg_T *oap, long count, int include, int type)); +int current_quote __ARGS((oparg_T *oap, long count, int include, int quotechar)); +int current_search __ARGS((long count, int forward)); +int linewhite __ARGS((linenr_T lnum)); +void find_pattern_in_path __ARGS((char_u *ptr, int dir, int len, int whole, + int skip_comments, int type, long count, + int action, linenr_T start_lnum, + linenr_T end_lnum)); +int read_viminfo_search_pattern __ARGS((vir_T *virp, int force)); +void write_viminfo_search_pattern __ARGS((FILE *fp)); +/* vim: set ft=c : */ +#endif /* NEOVIM_SEARCH_H */ |