diff options
Diffstat (limited to 'src/nvim/debugger.c')
| -rw-r--r-- | src/nvim/debugger.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/nvim/debugger.c b/src/nvim/debugger.c index a343c1ad6b..7d87b61ce5 100644 --- a/src/nvim/debugger.c +++ b/src/nvim/debugger.c @@ -8,31 +8,37 @@ #include <string.h> #include "nvim/ascii_defs.h" +#include "nvim/buffer_defs.h" #include "nvim/charset.h" #include "nvim/cmdexpand_defs.h" #include "nvim/debugger.h" #include "nvim/drawscreen.h" #include "nvim/eval.h" #include "nvim/eval/typval.h" +#include "nvim/eval/typval_defs.h" #include "nvim/ex_cmds_defs.h" #include "nvim/ex_docmd.h" #include "nvim/ex_getln.h" #include "nvim/fileio.h" -#include "nvim/func_attr.h" #include "nvim/garray.h" +#include "nvim/garray_defs.h" #include "nvim/getchar.h" -#include "nvim/gettext.h" +#include "nvim/getchar_defs.h" +#include "nvim/gettext_defs.h" #include "nvim/globals.h" #include "nvim/keycodes.h" #include "nvim/macros_defs.h" #include "nvim/memory.h" #include "nvim/message.h" #include "nvim/os/os.h" +#include "nvim/os/os_defs.h" #include "nvim/path.h" #include "nvim/pos_defs.h" #include "nvim/regexp.h" #include "nvim/runtime.h" +#include "nvim/runtime_defs.h" #include "nvim/state_defs.h" +#include "nvim/types_defs.h" #include "nvim/vim_defs.h" /// batch mode debugging: don't save and restore typeahead. @@ -284,7 +290,7 @@ void do_debug(char *cmd) // don't debug this command n = debug_break_level; debug_break_level = -1; - (void)do_cmdline(cmdline, getexline, NULL, DOCMD_VERBOSE|DOCMD_EXCRESET); + do_cmdline(cmdline, getexline, NULL, DOCMD_VERBOSE|DOCMD_EXCRESET); debug_break_level = n; } lines_left = Rows - 1; @@ -407,7 +413,7 @@ static linenr_T debug_breakpoint_lnum; /// debug_skipped_name is then set to the source name in the breakpoint case. If /// a skipped command decides itself that a debug prompt should be displayed, it /// can do so by calling dbg_check_skipped(). -static int debug_skipped; +static bool debug_skipped; static char *debug_skipped_name; /// Go to debug mode when a breakpoint was encountered or "ex_nesting_level" is @@ -462,7 +468,7 @@ bool dbg_check_skipped(exarg_T *eap) // Save the value of got_int and reset it. We don't want a previous // interruption cause flushing the input buffer. - int prev_got_int = got_int; + bool prev_got_int = got_int; got_int = false; debug_breakpoint_name = debug_skipped_name; // eap->skip is true @@ -787,7 +793,6 @@ static linenr_T debuggy_find(bool file, char *fname, linenr_T after, garray_T *g struct debuggy *bp; linenr_T lnum = 0; char *name = fname; - int prev_got_int; // Return quickly when there are no breakpoints. if (GA_EMPTY(gap)) { @@ -812,7 +817,7 @@ static linenr_T debuggy_find(bool file, char *fname, linenr_T after, garray_T *g // Save the value of got_int and reset it. We don't want a // previous interruption cancel matching, only hitting CTRL-C // while matching should abort it. - prev_got_int = got_int; + bool prev_got_int = got_int; got_int = false; if (vim_regexec_prog(&bp->dbg_prog, false, name, 0)) { lnum = bp->dbg_lnum; |