IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor: change FALSE/TRUE to false/true

Browse Source 
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
This commit is contained in:
Lewis Russell 2022-08-25 14:41:02 +01:00
parent 946c0aa66f
commit 2498e9feb0
38 changed files with 729 additions and 796 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/doc/api.txt
View File

@ -750,7 +750,7 @@ nvim_eval_statusline({str}, {*opts}) *nvim_eval_statusline()*
• highlights: (boolean) Return highlight information. • highlights: (boolean) Return highlight information.
• use_winbar: (boolean) Evaluate winbar instead of statusline. • use_winbar: (boolean) Evaluate winbar instead of statusline.
• use_tabline: (boolean) Evaluate tabline instead of • use_tabline: (boolean) Evaluate tabline instead of
statusline. When |TRUE|, {winid} is ignored. Mutually statusline. When true, {winid} is ignored. Mutually
exclusive with {use_winbar}. exclusive with {use_winbar}.
Return: ~ Return: ~
@ -759,7 +759,7 @@ nvim_eval_statusline({str}, {*opts}) *nvim_eval_statusline()*
• width: (number) Display width of the statusline. • width: (number) Display width of the statusline.
• highlights: Array containing highlight information of the • highlights: Array containing highlight information of the
statusline. Only included when the "highlights" key in {opts} is statusline. Only included when the "highlights" key in {opts} is
|TRUE|. Each element of the array is a |Dictionary| with these keys: true. Each element of the array is a |Dictionary| with these keys:
• start: (number) Byte index (0-based) of first character that uses • start: (number) Byte index (0-based) of first character that uses
the highlight. the highlight.
• group: (string) Name of highlight group. • group: (string) Name of highlight group.

4
src/nvim/api/vim.c
View File

@ -2092,7 +2092,7 @@ Array nvim_get_mark(String name, Dictionary opts, Error *err)
/// 'fillchars'). Treated as single-width even if it isn't. /// 'fillchars'). Treated as single-width even if it isn't.
/// - highlights: (boolean) Return highlight information. /// - highlights: (boolean) Return highlight information.
/// - use_winbar: (boolean) Evaluate winbar instead of statusline. /// - use_winbar: (boolean) Evaluate winbar instead of statusline.
/// - use_tabline: (boolean) Evaluate tabline instead of statusline. When |TRUE|, {winid} /// - use_tabline: (boolean) Evaluate tabline instead of statusline. When true, {winid}
/// is ignored. Mutually exclusive with {use_winbar}. /// is ignored. Mutually exclusive with {use_winbar}.
/// ///
/// @param[out] err Error details, if any. /// @param[out] err Error details, if any.
@ -2100,7 +2100,7 @@ Array nvim_get_mark(String name, Dictionary opts, Error *err)
/// - str: (string) Characters that will be displayed on the statusline. /// - str: (string) Characters that will be displayed on the statusline.
/// - width: (number) Display width of the statusline. /// - width: (number) Display width of the statusline.
/// - highlights: Array containing highlight information of the statusline. Only included when /// - highlights: Array containing highlight information of the statusline. Only included when
/// the "highlights" key in {opts} is |TRUE|. Each element of the array is a /// the "highlights" key in {opts} is true. Each element of the array is a
/// |Dictionary| with these keys: /// |Dictionary| with these keys:
/// - start: (number) Byte index (0-based) of first character that uses the highlight. /// - start: (number) Byte index (0-based) of first character that uses the highlight.
/// - group: (string) Name of highlight group. /// - group: (string) Name of highlight group.

18
src/nvim/buffer_defs.h
View File

@ -440,7 +440,7 @@ typedef struct {
garray_T b_syn_clusters; // table for syntax clusters garray_T b_syn_clusters; // table for syntax clusters
int b_spell_cluster_id; // @Spell cluster ID or 0 int b_spell_cluster_id; // @Spell cluster ID or 0
int b_nospell_cluster_id; // @NoSpell cluster ID or 0 int b_nospell_cluster_id; // @NoSpell cluster ID or 0
int b_syn_containedin; // TRUE when there is an item with a int b_syn_containedin; // true when there is an item with a
// "containedin" argument // "containedin" argument
int b_syn_sync_flags; // flags about how to sync int b_syn_sync_flags; // flags about how to sync
int16_t b_syn_sync_id; // group to sync on int16_t b_syn_sync_id; // group to sync on
@ -600,7 +600,7 @@ struct file_buffer {
fmark_T b_namedm[NMARKS]; // current named marks (mark.c) fmark_T b_namedm[NMARKS]; // current named marks (mark.c)
// These variables are set when VIsual_active becomes FALSE // These variables are set when VIsual_active becomes false
visualinfo_T b_visual; visualinfo_T b_visual;
int b_visual_mode_eval; // b_visual.vi_mode for visualmode() int b_visual_mode_eval; // b_visual.vi_mode for visualmode()
@ -847,7 +847,7 @@ struct file_buffer {
* spell buffer - used for spell info, never displayed and doesn't have a * spell buffer - used for spell info, never displayed and doesn't have a
* file name. * file name.
*/ */
bool b_help; // TRUE for help file buffer (when set b_p_bt bool b_help; // true for help file buffer (when set b_p_bt
// is "help") // is "help")
bool b_spell; // True for a spell file buffer, most fields bool b_spell; // True for a spell file buffer, most fields
// are not used! Use the B_SPELL macro to // are not used! Use the B_SPELL macro to
@ -972,15 +972,15 @@ struct tabpage_S {
* When the display is changed (e.g., when clearing the screen) w_lines_valid * When the display is changed (e.g., when clearing the screen) w_lines_valid
* is changed to exclude invalid entries. * is changed to exclude invalid entries.
* When making changes to the buffer, wl_valid is reset to indicate wl_size * When making changes to the buffer, wl_valid is reset to indicate wl_size
* may not reflect what is actually in the buffer. When wl_valid is FALSE, * may not reflect what is actually in the buffer. When wl_valid is false,
* the entries can only be used to count the number of displayed lines used. * the entries can only be used to count the number of displayed lines used.
* wl_lnum and wl_lastlnum are invalid too. * wl_lnum and wl_lastlnum are invalid too.
*/ */
typedef struct w_line { typedef struct w_line {
linenr_T wl_lnum; // buffer line number for logical line linenr_T wl_lnum; // buffer line number for logical line
uint16_t wl_size; // height in screen lines uint16_t wl_size; // height in screen lines
char wl_valid; // TRUE values are valid for text in buffer char wl_valid; // true values are valid for text in buffer
char wl_folded; // TRUE when this is a range of folded lines char wl_folded; // true when this is a range of folded lines
linenr_T wl_lastlnum; // last buffer line number for logical line linenr_T wl_lastlnum; // last buffer line number for logical line
} wline_T; } wline_T;
@ -1227,8 +1227,8 @@ struct window_S {
*/ */
linenr_T w_topline; /* buffer line number of the line at the linenr_T w_topline; /* buffer line number of the line at the
top of the window */ top of the window */
char w_topline_was_set; /* flag set to TRUE when topline is set, char w_topline_was_set; // flag set to true when topline is set,
e.g. by winrestview() */ // e.g. by winrestview()
int w_topfill; // number of filler lines above w_topline int w_topfill; // number of filler lines above w_topline
int w_old_topfill; // w_topfill at last redraw int w_old_topfill; // w_topfill at last redraw
bool w_botfill; // true when filler lines are actually bool w_botfill; // true when filler lines are actually
@ -1363,7 +1363,7 @@ struct window_S {
linenr_T w_ru_topline; // topline shown in ruler linenr_T w_ru_topline; // topline shown in ruler
linenr_T w_ru_line_count; // line count used for ruler linenr_T w_ru_line_count; // line count used for ruler
int w_ru_topfill; // topfill shown in ruler int w_ru_topfill; // topfill shown in ruler
char w_ru_empty; // TRUE if ruler shows 0-1 (empty line) char w_ru_empty; // true if ruler shows 0-1 (empty line)
int w_alt_fnum; // alternate file (for # and CTRL-^) int w_alt_fnum; // alternate file (for # and CTRL-^)

2
src/nvim/drawline.c
View File

@ -277,7 +277,7 @@ static bool use_cursor_line_sign(win_T *wp, linenr_T lnum)
} }
// Get information needed to display the sign in line 'lnum' in window 'wp'. // Get information needed to display the sign in line 'lnum' in window 'wp'.
// If 'nrcol' is TRUE, the sign is going to be displayed in the number column. // If 'nrcol' is true, the sign is going to be displayed in the number column.
// Otherwise the sign is going to be displayed in the sign column. // Otherwise the sign is going to be displayed in the sign column.
// //
// @param count max number of signs // @param count max number of signs

46
src/nvim/edit.c
View File

@ -1575,7 +1575,7 @@ static void undisplay_dollar(void)
/// type == INDENT_DEC decrease indent (for CTRL-D) /// type == INDENT_DEC decrease indent (for CTRL-D)
/// type == INDENT_SET set indent to "amount" /// type == INDENT_SET set indent to "amount"
/// ///
/// @param round if TRUE, round the indent to 'shiftwidth' (only with _INC and _Dec). /// @param round if true, round the indent to 'shiftwidth' (only with _INC and _Dec).
/// @param replaced replaced character, put on replace stack /// @param replaced replaced character, put on replace stack
/// @param call_changed_bytes call changed_bytes() /// @param call_changed_bytes call changed_bytes()
void change_indent(int type, int amount, int round, int replaced, int call_changed_bytes) void change_indent(int type, int amount, int round, int replaced, int call_changed_bytes)
@ -1599,7 +1599,7 @@ void change_indent(int type, int amount, int round, int replaced, int call_chang
// for the following tricks we don't want list mode // for the following tricks we don't want list mode
save_p_list = curwin->w_p_list; save_p_list = curwin->w_p_list;
curwin->w_p_list = FALSE; curwin->w_p_list = false;
vc = getvcol_nolist(&curwin->w_cursor); vc = getvcol_nolist(&curwin->w_cursor);
vcol = vc; vcol = vc;
@ -1718,7 +1718,7 @@ void change_indent(int type, int amount, int round, int replaced, int call_chang
} else { } else {
curwin->w_cursor.col = (colnr_T)new_cursor_col; curwin->w_cursor.col = (colnr_T)new_cursor_col;
} }
curwin->w_set_curswant = TRUE; curwin->w_set_curswant = true;
changed_cline_bef_curs(); changed_cline_bef_curs();
/* /*
@ -1978,7 +1978,7 @@ static void insert_special(int c, int allow_modmask, int ctrlv)
// inserted with ins_str(), so as not to replace characters in replace // inserted with ins_str(), so as not to replace characters in replace
// mode. // mode.
// Only use mod_mask for special keys, to avoid things like <S-Space>, // Only use mod_mask for special keys, to avoid things like <S-Space>,
// unless 'allow_modmask' is TRUE. // unless 'allow_modmask' is true.
if (mod_mask & MOD_MASK_CMD) { // Command-key never produces a normal key. if (mod_mask & MOD_MASK_CMD) { // Command-key never produces a normal key.
allow_modmask = true; allow_modmask = true;
} }
@ -3086,7 +3086,7 @@ void beginline(int flags)
curwin->w_cursor.col++; curwin->w_cursor.col++;
} }
} }
curwin->w_set_curswant = TRUE; curwin->w_set_curswant = true;
} }
} }
@ -3130,7 +3130,7 @@ int oneright(void)
} }
curwin->w_cursor.col += l; curwin->w_cursor.col += l;
curwin->w_set_curswant = TRUE; curwin->w_set_curswant = true;
return OK; return OK;
} }
@ -3165,7 +3165,7 @@ int oneleft(void)
} }
} }
curwin->w_set_curswant = TRUE; curwin->w_set_curswant = true;
return OK; return OK;
} }
@ -3182,7 +3182,7 @@ int oneleft(void)
return OK; return OK;
} }
/// @oaram upd_topline When TRUE: update topline /// @oaram upd_topline When true: update topline
int cursor_up(long n, int upd_topline) int cursor_up(long n, int upd_topline)
{ {
linenr_T lnum; linenr_T lnum;
@ -3237,7 +3237,7 @@ int cursor_up(long n, int upd_topline)
/// Cursor down a number of logical lines. /// Cursor down a number of logical lines.
/// ///
/// @param upd_topline When TRUE: update topline /// @param upd_topline When true: update topline
int cursor_down(long n, int upd_topline) int cursor_down(long n, int upd_topline)
{ {
linenr_T lnum; linenr_T lnum;
@ -4007,13 +4007,13 @@ static void ins_reg(void)
no_mapping++; no_mapping++;
allow_keys++; allow_keys++;
regname = plain_vgetc(); regname = plain_vgetc();
LANGMAP_ADJUST(regname, TRUE); LANGMAP_ADJUST(regname, true);
if (regname == Ctrl_R || regname == Ctrl_O || regname == Ctrl_P) { if (regname == Ctrl_R || regname == Ctrl_O || regname == Ctrl_P) {
// Get a third key for literal register insertion // Get a third key for literal register insertion
literally = regname; literally = regname;
add_to_showcmd_c(literally); add_to_showcmd_c(literally);
regname = plain_vgetc(); regname = plain_vgetc();
LANGMAP_ADJUST(regname, TRUE); LANGMAP_ADJUST(regname, true);
} }
no_mapping--; no_mapping--;
allow_keys--; allow_keys--;
@ -4051,7 +4051,7 @@ static void ins_reg(void)
need_redraw = true; // remove the '"' need_redraw = true; // remove the '"'
} else if (stop_insert_mode) { } else if (stop_insert_mode) {
// When the '=' register was used and a function was invoked that // When the '=' register was used and a function was invoked that
// did ":stopinsert" then stuff_empty() returns FALSE but we won't // did ":stopinsert" then stuff_empty() returns false but we won't
// insert anything, need to remove the '"' // insert anything, need to remove the '"'
need_redraw = true; need_redraw = true;
} }
@ -4202,7 +4202,7 @@ static bool ins_esc(long *count, int cmdchar, bool nomove)
// Repeat the insert // Repeat the insert
return false; return false;
} }
stop_insert(&curwin->w_cursor, TRUE, nomove); stop_insert(&curwin->w_cursor, true, nomove);
undisplay_dollar(); undisplay_dollar();
} }
@ -4400,9 +4400,9 @@ static void ins_shift(int c, int lastc)
if (lastc == '^') { if (lastc == '^') {
old_indent = get_indent(); // remember curr. indent old_indent = get_indent(); // remember curr. indent
} }
change_indent(INDENT_SET, 0, TRUE, 0, TRUE); change_indent(INDENT_SET, 0, true, 0, true);
} else { } else {
change_indent(c == Ctrl_D ? INDENT_DEC : INDENT_INC, 0, TRUE, 0, TRUE); change_indent(c == Ctrl_D ? INDENT_DEC : INDENT_INC, 0, true, 0, true);
} }
if (did_ai && *skipwhite((char *)get_cursor_line_ptr()) != NUL) { if (did_ai && *skipwhite((char *)get_cursor_line_ptr()) != NUL) {
@ -4574,7 +4574,7 @@ static bool ins_bs(int c, int mode, int *inserted_space_p)
} }
} }
do_join(2, FALSE, FALSE, FALSE, false); do_join(2, false, false, false, false);
if (temp == NUL && gchar_cursor() != NUL) { if (temp == NUL && gchar_cursor() != NUL) {
inc_cursor(); inc_cursor();
} }
@ -4856,7 +4856,7 @@ static void ins_mousescroll(int dir)
} }
} }
curwin->w_redr_status = TRUE; curwin->w_redr_status = true;
curwin = old_curwin; curwin = old_curwin;
curbuf = curwin->w_buffer; curbuf = curwin->w_buffer;
@ -5024,7 +5024,7 @@ static void ins_up(bool startcol)
undisplay_dollar(); undisplay_dollar();
tpos = curwin->w_cursor; tpos = curwin->w_cursor;
if (cursor_up(1L, TRUE) == OK) { if (cursor_up(1L, true) == OK) {
if (startcol) { if (startcol) {
coladvance(getvcol_nolist(&Insstart)); coladvance(getvcol_nolist(&Insstart));
} }
@ -5072,7 +5072,7 @@ static void ins_down(bool startcol)
undisplay_dollar(); undisplay_dollar();
tpos = curwin->w_cursor; tpos = curwin->w_cursor;
if (cursor_down(1L, TRUE) == OK) { if (cursor_down(1L, true) == OK) {
if (startcol) { if (startcol) {
coladvance(getvcol_nolist(&Insstart)); coladvance(getvcol_nolist(&Insstart));
} }
@ -5407,7 +5407,7 @@ static int ins_digraph(void)
if (IS_SPECIAL(c) || mod_mask) { // special key if (IS_SPECIAL(c) || mod_mask) { // special key
clear_showcmd(); clear_showcmd();
insert_special(c, TRUE, FALSE); insert_special(c, true, false);
return NUL; return NUL;
} }
if (c != ESC) { if (c != ESC) {
@ -5508,7 +5508,7 @@ static int ins_ctrl_ey(int tc)
} }
tw_save = curbuf->b_p_tw; tw_save = curbuf->b_p_tw;
curbuf->b_p_tw = -1; curbuf->b_p_tw = -1;
insert_special(c, TRUE, FALSE); insert_special(c, true, false);
curbuf->b_p_tw = tw_save; curbuf->b_p_tw = tw_save;
revins_chars++; revins_chars++;
revins_legal++; revins_legal++;
@ -5557,7 +5557,7 @@ static void ins_try_si(int c)
i = get_indent(); i = get_indent();
curwin->w_cursor = old_pos; curwin->w_cursor = old_pos;
if (State & VREPLACE_FLAG) { if (State & VREPLACE_FLAG) {
change_indent(INDENT_SET, i, FALSE, NUL, TRUE); change_indent(INDENT_SET, i, false, NUL, true);
} else { } else {
(void)set_indent(i, SIN_CHANGED); (void)set_indent(i, SIN_CHANGED);
} }
@ -5582,7 +5582,7 @@ static void ins_try_si(int c)
curwin->w_cursor = old_pos; curwin->w_cursor = old_pos;
} }
if (temp) { if (temp) {
shift_line(TRUE, FALSE, 1, TRUE); shift_line(true, false, 1, true);
} }
} }
} }

22
src/nvim/eval.c
View File

@ -101,7 +101,7 @@ static garray_T ga_loaded = { 0, 0, sizeof(char *), 4, NULL };
/// Info used by a ":for" loop. /// Info used by a ":for" loop.
typedef struct { typedef struct {
int fi_semicolon; // TRUE if ending in '; var]' int fi_semicolon; // true if ending in '; var]'
int fi_varcount; // nr of variables in the list int fi_varcount; // nr of variables in the list
listwatch_T fi_lw; // keep an eye on the item used. listwatch_T fi_lw; // keep an eye on the item used.
list_T *fi_list; // list being used list_T *fi_list; // list being used
@ -691,11 +691,11 @@ void eval_patch(const char *const origfile, const char *const difffile, const ch
} }
/// Top level evaluation function, returning a boolean. /// Top level evaluation function, returning a boolean.
/// Sets "error" to TRUE if there was an error. /// Sets "error" to true if there was an error.
/// ///
/// @param skip only parse, don't execute /// @param skip only parse, don't execute
/// ///
/// @return TRUE or FALSE. /// @return true or false.
int eval_to_bool(char *arg, bool *error, char **nextcmd, int skip) int eval_to_bool(char *arg, bool *error, char **nextcmd, int skip)
{ {
typval_T tv; typval_T tv;
@ -895,7 +895,7 @@ char *eval_to_string(char *arg, char **nextcmd, bool convert)
/// Call eval_to_string() without using current local variables and using /// Call eval_to_string() without using current local variables and using
/// textlock. /// textlock.
/// ///
/// @param use_sandbox when TRUE, use the sandbox. /// @param use_sandbox when true, use the sandbox.
char *eval_to_string_safe(char *arg, char **nextcmd, int use_sandbox) char *eval_to_string_safe(char *arg, char **nextcmd, int use_sandbox)
{ {
char *retval; char *retval;
@ -1812,7 +1812,7 @@ notify:
/// Evaluate the expression used in a ":for var in expr" command. /// Evaluate the expression used in a ":for var in expr" command.
/// "arg" points to "var". /// "arg" points to "var".
/// ///
/// @param[out] *errp set to TRUE for an error, FALSE otherwise; /// @param[out] *errp set to true for an error, false otherwise;
/// ///
/// @return a pointer that holds the info. Null when there is an error. /// @return a pointer that holds the info. Null when there is an error.
void *eval_for_line(const char *arg, bool *errp, char **nextcmdp, int skip) void *eval_for_line(const char *arg, bool *errp, char **nextcmdp, int skip)
@ -2184,7 +2184,7 @@ char *get_user_var_name(expand_T *xp, int idx)
/// Does not use 'cpo' and always uses 'magic'. /// Does not use 'cpo' and always uses 'magic'.
/// ///
/// @return TRUE if "pat" matches "text". /// @return true if "pat" matches "text".
int pattern_match(char *pat, char *text, bool ic) int pattern_match(char *pat, char *text, bool ic)
{ {
int matches = 0; int matches = 0;
@ -2263,13 +2263,13 @@ static int eval_func(char **const arg, char *const name, const int name_len, typ
// TODO(ZyX-I): move to eval/expressions // TODO(ZyX-I): move to eval/expressions
/// The "evaluate" argument: When FALSE, the argument is only parsed but not /// The "evaluate" argument: When false, the argument is only parsed but not
/// executed. The function may return OK, but the rettv will be of type /// executed. The function may return OK, but the rettv will be of type
/// VAR_UNKNOWN. The function still returns FAIL for a syntax error. /// VAR_UNKNOWN. The function still returns FAIL for a syntax error.
/// Handle zero level expression. /// Handle zero level expression.
/// This calls eval1() and handles error message and nextcmd. /// This calls eval1() and handles error message and nextcmd.
/// Put the result in "rettv" when returning OK and "evaluate" is TRUE. /// Put the result in "rettv" when returning OK and "evaluate" is true.
/// Note: "rettv.v_lock" is not set. /// Note: "rettv.v_lock" is not set.
/// ///
/// @return OK or FAIL. /// @return OK or FAIL.
@ -6786,14 +6786,14 @@ static char *make_expanded_name(const char *in_start, char *expr_start, char *ex
return retval; return retval;
} }
/// @return TRUE if character "c" can be used in a variable or function name. /// @return true if character "c" can be used in a variable or function name.
/// Does not include '{' or '}' for magic braces. /// Does not include '{' or '}' for magic braces.
int eval_isnamec(int c) int eval_isnamec(int c)
{ {
return ASCII_ISALNUM(c) || c == '_' || c == ':' || c == AUTOLOAD_CHAR; return ASCII_ISALNUM(c) || c == '_' || c == ':' || c == AUTOLOAD_CHAR;
} }
/// @return TRUE if character "c" can be used as the first character in a /// @return true if character "c" can be used as the first character in a
/// variable or function name (excluding '{' and '}'). /// variable or function name (excluding '{' and '}').
int eval_isnamec1(int c) int eval_isnamec1(int c)
{ {
@ -6846,7 +6846,7 @@ void set_vim_var_char(int c)
/// Set v:count to "count" and v:count1 to "count1". /// Set v:count to "count" and v:count1 to "count1".
/// ///
/// @param set_prevcount if TRUE, first set v:prevcount from v:count. /// @param set_prevcount if true, first set v:prevcount from v:count.
void set_vcount(long count, long count1, int set_prevcount) void set_vcount(long count, long count1, int set_prevcount)
{ {
if (set_prevcount) { if (set_prevcount) {

6
src/nvim/eval/funcs.c
View File

@ -234,7 +234,7 @@ int call_internal_method(const char_u *const fname, const int argcount, typval_T
return ERROR_NONE; return ERROR_NONE;
} }
/// @return TRUE for a non-zero Number and a non-empty String. /// @return true for a non-zero Number and a non-empty String.
static int non_zero_arg(typval_T *argvars) static int non_zero_arg(typval_T *argvars)
{ {
return ((argvars[0].v_type == VAR_NUMBER return ((argvars[0].v_type == VAR_NUMBER
@ -2548,7 +2548,7 @@ static void f_getbufinfo(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
/// Get line or list of lines from buffer "buf" into "rettv". /// Get line or list of lines from buffer "buf" into "rettv".
/// ///
/// @param retlist if TRUE, then the lines are returned as a Vim List. /// @param retlist if true, then the lines are returned as a Vim List.
/// ///
/// @return range (from start to end) of lines in rettv from the specified /// @return range (from start to end) of lines in rettv from the specified
/// buffer. /// buffer.
@ -7549,7 +7549,7 @@ static void f_setbufline(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
} }
/// Set the cursor or mark position. /// Set the cursor or mark position.
/// If 'charpos' is TRUE, then use the column number as a character offset. /// If 'charpos' is true, then use the column number as a character offset.
/// Otherwise use the column number as a byte offset. /// Otherwise use the column number as a byte offset.
static void set_position(typval_T *argvars, typval_T *rettv, bool charpos) static void set_position(typval_T *argvars, typval_T *rettv, bool charpos)
{ {

20
src/nvim/eval/userfunc.c
View File

@ -1083,7 +1083,7 @@ void call_user_func(ufunc_T *fp, int argcount, typval_T *argvars, typval_T *rett
const sctx_T save_current_sctx = current_sctx; const sctx_T save_current_sctx = current_sctx;
current_sctx = fp->uf_script_ctx; current_sctx = fp->uf_script_ctx;
save_did_emsg = did_emsg; save_did_emsg = did_emsg;
did_emsg = FALSE; did_emsg = false;
if (default_arg_err && (fp->uf_flags & FC_ABORT)) { if (default_arg_err && (fp->uf_flags & FC_ABORT)) {
did_emsg = true; did_emsg = true;
@ -2012,14 +2012,14 @@ void ex_function(exarg_T *eap)
xfree(fudi.fd_newkey); xfree(fudi.fd_newkey);
return; return;
} else { } else {
eap->skip = TRUE; eap->skip = true;
} }
} }
// An error in a function call during evaluation of an expression in magic // An error in a function call during evaluation of an expression in magic
// braces should not cause the function not to be defined. // braces should not cause the function not to be defined.
saved_did_emsg = did_emsg; saved_did_emsg = did_emsg;
did_emsg = FALSE; did_emsg = false;
// //
// ":function func" with only function name: list function. // ":function func" with only function name: list function.
@ -2853,7 +2853,7 @@ void ex_return(exarg_T *eap)
{ {
char_u *arg = (char_u *)eap->arg; char_u *arg = (char_u *)eap->arg;
typval_T rettv; typval_T rettv;
int returning = FALSE; int returning = false;
if (current_funccal == NULL) { if (current_funccal == NULL) {
emsg(_("E133: :return not inside a function")); emsg(_("E133: :return not inside a function"));
@ -3035,8 +3035,8 @@ end:
/// @param is_cmd set when called due to a ":return" command. /// @param is_cmd set when called due to a ":return" command.
/// @param rettv may point to a typval_T with the return rettv. /// @param rettv may point to a typval_T with the return rettv.
/// ///
/// @return TRUE when the return can be carried out, /// @return true when the return can be carried out,
/// FALSE when the return gets pending. /// false when the return gets pending.
int do_return(exarg_T *eap, int reanimate, int is_cmd, void *rettv) int do_return(exarg_T *eap, int reanimate, int is_cmd, void *rettv)
{ {
int idx; int idx;
@ -3086,7 +3086,7 @@ int do_return(exarg_T *eap, int reanimate, int is_cmd, void *rettv)
} }
report_make_pending(CSTP_RETURN, rettv); report_make_pending(CSTP_RETURN, rettv);
} else { } else {
current_funccal->returned = TRUE; current_funccal->returned = true;
// If the return is carried out now, store the return value. For // If the return is carried out now, store the return value. For
// a return immediately after reanimation, the value is already // a return immediately after reanimation, the value is already
@ -3178,7 +3178,7 @@ char *get_func_line(int c, void *cookie, int indent, bool do_concat)
return (char *)retval; return (char *)retval;
} }
/// @return TRUE if the currently active function should be ended, because a /// @return true if the currently active function should be ended, because a
/// return was encountered or an error occurred. Used inside a ":while". /// return was encountered or an error occurred. Used inside a ":while".
int func_has_ended(void *cookie) int func_has_ended(void *cookie)
{ {
@ -3190,7 +3190,7 @@ int func_has_ended(void *cookie)
|| fcp->returned; || fcp->returned;
} }
/// @return TRUE if cookie indicates a function which "abort"s on errors. /// @return true if cookie indicates a function which "abort"s on errors.
int func_has_abort(void *cookie) int func_has_abort(void *cookie)
{ {
return ((funccall_T *)cookie)->func->uf_flags & FC_ABORT; return ((funccall_T *)cookie)->func->uf_flags & FC_ABORT;
@ -3281,7 +3281,7 @@ int func_level(void *cookie)
return ((funccall_T *)cookie)->level; return ((funccall_T *)cookie)->level;
} }
/// @return TRUE when a function was ended by a ":return" command. /// @return true when a function was ended by a ":return" command.
int current_func_returned(void) int current_func_returned(void)
{ {
return current_funccal->returned; return current_funccal->returned;

2
src/nvim/eval/vars.c
View File

@ -1119,7 +1119,7 @@ void vars_clear(hashtab_T *ht)
vars_clear_ext(ht, true); vars_clear_ext(ht, true);
} }
/// Like vars_clear(), but only free the value if "free_val" is TRUE. /// Like vars_clear(), but only free the value if "free_val" is true.
void vars_clear_ext(hashtab_T *ht, int free_val) void vars_clear_ext(hashtab_T *ht, int free_val)
{ {
int todo; int todo;

79
src/nvim/ex_cmds.c
View File

@ -274,7 +274,7 @@ void ex_align(exarg_T *eap)
if (eap->cmdidx == CMD_left) { // left align if (eap->cmdidx == CMD_left) { // left align
new_indent = indent; new_indent = indent;
} else { } else {
has_tab = FALSE; // avoid uninit warnings has_tab = false; // avoid uninit warnings
len = linelen(eap->cmdidx == CMD_right ? &has_tab len = linelen(eap->cmdidx == CMD_right ? &has_tab
: NULL) - get_indent(); : NULL) - get_indent();
@ -404,7 +404,7 @@ static int sort_compare(const void *s1, const void *s2)
} }
fast_breakcheck(); fast_breakcheck();
if (got_int) { if (got_int) {
sort_abort = TRUE; sort_abort = true;
} }
// When sorting numbers "start_col_nr" is the number, not the column // When sorting numbers "start_col_nr" is the number, not the column
@ -1150,7 +1150,7 @@ void do_bang(int addr_count, exarg_T *eap, bool forceit, bool do_in, bool do_out
} }
if (addr_count == 0) { // :! if (addr_count == 0) { // :!
msg_scroll = FALSE; // don't scroll here msg_scroll = false; // don't scroll here
autowrite_all(); autowrite_all();
msg_scroll = scroll_save; msg_scroll = scroll_save;
} }
@ -1376,14 +1376,14 @@ static void do_filter(linenr_T line1, linenr_T line2, exarg_T *eap, char *cmd, b
call_shell((char_u *)cmd_buf, (ShellOpts)(kShellOptFilter | shell_flags), NULL); call_shell((char_u *)cmd_buf, (ShellOpts)(kShellOptFilter | shell_flags), NULL);
xfree(cmd_buf); xfree(cmd_buf);
did_check_timestamps = FALSE; did_check_timestamps = false;
need_check_timestamps = TRUE; need_check_timestamps = true;
// When interrupting the shell command, it may still have produced some // When interrupting the shell command, it may still have produced some
// useful output. Reset got_int here, so that readfile() won't cancel // useful output. Reset got_int here, so that readfile() won't cancel
// reading. // reading.
os_breakcheck(); os_breakcheck();
got_int = FALSE; got_int = false;
if (do_out) { if (do_out) {
if (otmp != NULL) { if (otmp != NULL) {
@ -1714,7 +1714,7 @@ void print_line(linenr_T lnum, int use_number, int list)
} }
msg_start(); msg_start();
silent_mode = FALSE; silent_mode = false;
info_message = true; // use mch_msg(), not mch_errmsg() info_message = true; // use mch_msg(), not mch_errmsg()
print_line_no_prefix(lnum, use_number, list); print_line_no_prefix(lnum, use_number, list);
if (save_silent) { if (save_silent) {
@ -1822,7 +1822,7 @@ void ex_write(exarg_T *eap)
} }
/// write current buffer to file 'eap->arg' /// write current buffer to file 'eap->arg'
/// if 'eap->append' is TRUE, append to the file /// if 'eap->append' is true, append to the file
/// ///
/// if *eap->arg == NUL write to current file /// if *eap->arg == NUL write to current file
/// ///
@ -1847,7 +1847,7 @@ int do_write(exarg_T *eap)
emsg(_(e_argreq)); emsg(_(e_argreq));
goto theend; goto theend;
} }
other = FALSE; other = false;
} else { } else {
fname = ffname; fname = ffname;
free_fname = fix_fname(ffname); free_fname = fix_fname(ffname);
@ -1899,7 +1899,7 @@ int do_write(exarg_T *eap)
(char_u *)_("Write partial file?"), 2) != VIM_YES) { (char_u *)_("Write partial file?"), 2) != VIM_YES) {
goto theend; goto theend;
} }
eap->forceit = TRUE; eap->forceit = true;
} else { } else {
emsg(_("E140: Use ! to write partial buffer")); emsg(_("E140: Use ! to write partial buffer"));
goto theend; goto theend;
@ -1936,8 +1936,8 @@ int do_write(exarg_T *eap)
apply_autocmds(EVENT_BUFFILEPOST, NULL, NULL, false, curbuf); apply_autocmds(EVENT_BUFFILEPOST, NULL, NULL, false, curbuf);
apply_autocmds(EVENT_BUFFILEPOST, NULL, NULL, false, alt_buf); apply_autocmds(EVENT_BUFFILEPOST, NULL, NULL, false, alt_buf);
if (!alt_buf->b_p_bl) { if (!alt_buf->b_p_bl) {
alt_buf->b_p_bl = TRUE; alt_buf->b_p_bl = true;
apply_autocmds(EVENT_BUFADD, NULL, NULL, FALSE, alt_buf); apply_autocmds(EVENT_BUFADD, NULL, NULL, false, alt_buf);
} }
if (curbuf != was_curbuf || aborting()) { if (curbuf != was_curbuf || aborting()) {
// buffer changed, don't write the file // buffer changed, don't write the file
@ -1965,7 +1965,7 @@ int do_write(exarg_T *eap)
// After ":saveas fname" reset 'readonly'. // After ":saveas fname" reset 'readonly'.
if (eap->cmdidx == CMD_saveas) { if (eap->cmdidx == CMD_saveas) {
if (retval == OK) { if (retval == OK) {
curbuf->b_p_ro = FALSE; curbuf->b_p_ro = false;
redraw_tabline = true; redraw_tabline = true;
} }
} }
@ -2017,7 +2017,7 @@ int check_overwrite(exarg_T *eap, buf_T *buf, char *fname, char *ffname, int oth
if (vim_dialog_yesno(VIM_QUESTION, NULL, (char_u *)buff, 2) != VIM_YES) { if (vim_dialog_yesno(VIM_QUESTION, NULL, (char_u *)buff, 2) != VIM_YES) {
return FAIL; return FAIL;
} }
eap->forceit = TRUE; eap->forceit = true;
} else { } else {
emsg(_(e_exists)); emsg(_(e_exists));
return FAIL; return FAIL;
@ -2057,7 +2057,7 @@ int check_overwrite(exarg_T *eap, buf_T *buf, char *fname, char *ffname, int oth
xfree(swapname); xfree(swapname);
return FAIL; return FAIL;
} }
eap->forceit = TRUE; eap->forceit = true;
} else { } else {
semsg(_("E768: Swap file exists: %s (:silent! overrides)"), semsg(_("E768: Swap file exists: %s (:silent! overrides)"),
swapname); swapname);
@ -2158,7 +2158,7 @@ bool not_writing(void)
} }
/// Check if a buffer is read-only (either 'readonly' option is set or file is /// Check if a buffer is read-only (either 'readonly' option is set or file is
/// read-only). Ask for overruling in a dialog. Return TRUE and give an error /// read-only). Ask for overruling in a dialog. Return true and give an error
/// message when the buffer is readonly. /// message when the buffer is readonly.
static int check_readonly(int *forceit, buf_T *buf) static int check_readonly(int *forceit, buf_T *buf)
{ {
@ -2183,10 +2183,10 @@ static int check_readonly(int *forceit, buf_T *buf)
if (vim_dialog_yesno(VIM_QUESTION, NULL, (char_u *)buff, 2) == VIM_YES) { if (vim_dialog_yesno(VIM_QUESTION, NULL, (char_u *)buff, 2) == VIM_YES) {
// Set forceit, to force the writing of a readonly file // Set forceit, to force the writing of a readonly file
*forceit = TRUE; *forceit = true;
return FALSE; return false;
} else { } else {
return TRUE; return true;
} }
} else if (buf->b_p_ro) { } else if (buf->b_p_ro) {
emsg(_(e_readonly)); emsg(_(e_readonly));
@ -2194,10 +2194,10 @@ static int check_readonly(int *forceit, buf_T *buf)
semsg(_("E505: \"%s\" is read-only (add ! to override)"), semsg(_("E505: \"%s\" is read-only (add ! to override)"),
buf->b_fname); buf->b_fname);
} }
return TRUE; return true;
} }
return FALSE; return false;
} }
/// Try to abandon the current file and edit a new or existing file. /// Try to abandon the current file and edit a new or existing file.
@ -2291,7 +2291,7 @@ theend:
/// ECMD_LASTL: use last position in loaded file /// ECMD_LASTL: use last position in loaded file
/// ECMD_LAST: use last position in all files /// ECMD_LAST: use last position in all files
/// ECMD_ONE: use first line /// ECMD_ONE: use first line
/// @param flags ECMD_HIDE: if TRUE don't free the current buffer /// @param flags ECMD_HIDE: if true don't free the current buffer
/// ECMD_SET_HELP: set b_help flag of (new) buffer before /// ECMD_SET_HELP: set b_help flag of (new) buffer before
/// opening file /// opening file
/// ECMD_OLDBUF: use existing buffer if it exists /// ECMD_OLDBUF: use existing buffer if it exists
@ -2309,7 +2309,7 @@ int do_ecmd(int fnum, char *ffname, char *sfname, exarg_T *eap, linenr_T newlnum
win_T *oldwin) win_T *oldwin)
{ {
bool other_file; // true if editing another file bool other_file; // true if editing another file
int oldbuf; // TRUE if using existing buffer int oldbuf; // true if using existing buffer
bool auto_buf = false; // true if autocommands brought us bool auto_buf = false; // true if autocommands brought us
// into the buffer unexpectedly // into the buffer unexpectedly
char *new_name = NULL; char *new_name = NULL;
@ -2385,7 +2385,7 @@ int do_ecmd(int fnum, char *ffname, char *sfname, exarg_T *eap, linenr_T newlnum
// If the file was changed we may not be allowed to abandon it: // If the file was changed we may not be allowed to abandon it:
// - if we are going to re-edit the same file // - if we are going to re-edit the same file
// - or if we are the only window on this file and if ECMD_HIDE is FALSE // - or if we are the only window on this file and if ECMD_HIDE is false
if (((!other_file && !(flags & ECMD_OLDBUF)) if (((!other_file && !(flags & ECMD_OLDBUF))
|| (curbuf->b_nwindows == 1 || (curbuf->b_nwindows == 1
&& !(flags & (ECMD_HIDE | ECMD_ADDBUF | ECMD_ALTBUF)))) && !(flags & (ECMD_HIDE | ECMD_ADDBUF | ECMD_ALTBUF))))
@ -2503,7 +2503,7 @@ int do_ecmd(int fnum, char *ffname, char *sfname, exarg_T *eap, linenr_T newlnum
/* /*
* Make the (new) buffer the one used by the current window. * Make the (new) buffer the one used by the current window.
* If the old buffer becomes unused, free it if ECMD_HIDE is FALSE. * If the old buffer becomes unused, free it if ECMD_HIDE is false.
* If the current buffer was empty and has no file name, curbuf * If the current buffer was empty and has no file name, curbuf
* is returned by buflist_new(), nothing to do here. * is returned by buflist_new(), nothing to do here.
*/ */
@ -2604,7 +2604,7 @@ int do_ecmd(int fnum, char *ffname, char *sfname, exarg_T *eap, linenr_T newlnum
// Set 'fileformat', 'binary' and 'fenc' when forced. // Set 'fileformat', 'binary' and 'fenc' when forced.
if (!oldbuf && eap != NULL) { if (!oldbuf && eap != NULL) {
set_file_options(TRUE, eap); set_file_options(true, eap);
set_forced_fenc(eap); set_forced_fenc(eap);
} }
} }
@ -2640,7 +2640,7 @@ int do_ecmd(int fnum, char *ffname, char *sfname, exarg_T *eap, linenr_T newlnum
} else if (!curbuf->b_help) { } else if (!curbuf->b_help) {
// Don't make a buffer listed if it's a help buffer. Useful when using // Don't make a buffer listed if it's a help buffer. Useful when using
// CTRL-O to go back to a help file. // CTRL-O to go back to a help file.
set_buflisted(TRUE); set_buflisted(true);
} }
// If autocommands change buffers under our fingers, forget about // If autocommands change buffers under our fingers, forget about
@ -2659,10 +2659,10 @@ int do_ecmd(int fnum, char *ffname, char *sfname, exarg_T *eap, linenr_T newlnum
/* /*
* other_file oldbuf * other_file oldbuf
* FALSE FALSE re-edit same file, buffer is re-used * false false re-edit same file, buffer is re-used
* FALSE TRUE re-edit same file, nothing changes * false true re-edit same file, nothing changes
* TRUE FALSE start editing new file, new buffer * true false start editing new file, new buffer
* TRUE TRUE start editing in existing buffer (nothing to do) * true true start editing in existing buffer (nothing to do)
*/ */
if (!other_file && !oldbuf) { // re-use the buffer if (!other_file && !oldbuf) { // re-use the buffer
set_last_cursor(curwin); // may set b_last_cursor set_last_cursor(curwin); // may set b_last_cursor
@ -2789,7 +2789,7 @@ int do_ecmd(int fnum, char *ffname, char *sfname, exarg_T *eap, linenr_T newlnum
// changed by the user. // changed by the user.
do_modelines(OPT_WINONLY); do_modelines(OPT_WINONLY);
apply_autocmds_retval(EVENT_BUFENTER, NULL, NULL, FALSE, curbuf, apply_autocmds_retval(EVENT_BUFENTER, NULL, NULL, false, curbuf,
&retval); &retval);
if ((flags & ECMD_NOWINENTER) == 0) { if ((flags & ECMD_NOWINENTER) == 0) {
apply_autocmds_retval(EVENT_BUFWINENTER, NULL, NULL, false, curbuf, apply_autocmds_retval(EVENT_BUFWINENTER, NULL, NULL, false, curbuf,
@ -2847,7 +2847,7 @@ int do_ecmd(int fnum, char *ffname, char *sfname, exarg_T *eap, linenr_T newlnum
curwin->w_cursor.col = solcol; curwin->w_cursor.col = solcol;
check_cursor_col(); check_cursor_col();
curwin->w_cursor.coladd = 0; curwin->w_cursor.coladd = 0;
curwin->w_set_curswant = TRUE; curwin->w_set_curswant = true;
} else { } else {
beginline(BL_SOL | BL_FIX); beginline(BL_SOL | BL_FIX);
} }
@ -2873,7 +2873,7 @@ int do_ecmd(int fnum, char *ffname, char *sfname, exarg_T *eap, linenr_T newlnum
// Obey the 'O' flag in 'cpoptions': overwrite any previous file // Obey the 'O' flag in 'cpoptions': overwrite any previous file
// message. // message.
if (shortmess(SHM_OVERALL) && !exiting && p_verbose == 0) { if (shortmess(SHM_OVERALL) && !exiting && p_verbose == 0) {
msg_scroll = FALSE; msg_scroll = false;
} }
if (!msg_scroll) { // wait a bit when overwriting an error msg if (!msg_scroll) { // wait a bit when overwriting an error msg
check_for_delay(false); check_for_delay(false);
@ -3803,7 +3803,7 @@ static int do_sub(exarg_T *eap, proftime_T timeout, long cmdpreview_ns, handle_T
// Save the line number of the last change for the final // Save the line number of the last change for the final
// cursor position (just like Vi). // cursor position (just like Vi).
curwin->w_cursor.lnum = lnum; curwin->w_cursor.lnum = lnum;
do_again = FALSE; do_again = false;
/* /*
* 1. Match empty string does not count, except for first * 1. Match empty string does not count, except for first
@ -3954,7 +3954,7 @@ static int do_sub(exarg_T *eap, proftime_T timeout, long cmdpreview_ns, handle_T
- regmatch.startpos[0].lnum; - regmatch.startpos[0].lnum;
search_match_endcol = regmatch.endpos[0].col search_match_endcol = regmatch.endpos[0].col
+ len_change; + len_change;
highlight_match = TRUE; highlight_match = true;
update_topline(curwin); update_topline(curwin);
validate_cursor(); validate_cursor();
@ -4767,10 +4767,9 @@ bool prepare_tagpreview(bool undo_sync)
== FAIL) { == FAIL) {
return false; return false;
} }
curwin->w_p_pvw = TRUE; curwin->w_p_pvw = true;
curwin->w_p_wfh = TRUE; curwin->w_p_wfh = true;
RESET_BINDING(curwin); /* don't take over 'scrollbind' RESET_BINDING(curwin); // don't take over 'scrollbind' and 'cursorbind'
and 'cursorbind' */
curwin->w_p_diff = false; // no 'diff' curwin->w_p_diff = false; // no 'diff'
set_string_option_direct("fdc", -1, // no 'foldcolumn' set_string_option_direct("fdc", -1, // no 'foldcolumn'
"0", OPT_FREE, SID_NONE); "0", OPT_FREE, SID_NONE);

8
src/nvim/ex_cmds_defs.h
View File

@ -188,7 +188,7 @@ struct exarg {
cmdidx_T cmdidx; ///< the index for the command cmdidx_T cmdidx; ///< the index for the command
uint32_t argt; ///< flags for the command uint32_t argt; ///< flags for the command
int skip; ///< don't execute the command, only parse it int skip; ///< don't execute the command, only parse it
int forceit; ///< TRUE if ! present int forceit; ///< true if ! present
int addr_count; ///< the number of addresses given int addr_count; ///< the number of addresses given
linenr_T line1; ///< the first line number linenr_T line1; ///< the first line number
linenr_T line2; ///< the second line number or count linenr_T line2; ///< the second line number or count
@ -196,8 +196,8 @@ struct exarg {
int flags; ///< extra flags after count: EXFLAG_ int flags; ///< extra flags after count: EXFLAG_
char *do_ecmd_cmd; ///< +command arg to be used in edited file char *do_ecmd_cmd; ///< +command arg to be used in edited file
linenr_T do_ecmd_lnum; ///< the line number in an edited file linenr_T do_ecmd_lnum; ///< the line number in an edited file
int append; ///< TRUE with ":w >>file" command int append; ///< true with ":w >>file" command
int usefilter; ///< TRUE with ":w !command" and ":r!command" int usefilter; ///< true with ":w !command" and ":r!command"
int amount; ///< number of '>' or '<' for shift command int amount; ///< number of '>' or '<' for shift command
int regname; ///< register name (NUL if none) int regname; ///< register name (NUL if none)
int force_bin; ///< 0, FORCE_BIN or FORCE_NOBIN int force_bin; ///< 0, FORCE_BIN or FORCE_NOBIN
@ -230,7 +230,7 @@ struct expand {
sctx_T xp_script_ctx; // SCTX for completion function sctx_T xp_script_ctx; // SCTX for completion function
int xp_backslash; // one of the XP_BS_ values int xp_backslash; // one of the XP_BS_ values
#ifndef BACKSLASH_IN_FILENAME #ifndef BACKSLASH_IN_FILENAME
int xp_shell; // TRUE for a shell command, more int xp_shell; // true for a shell command, more
// characters need to be escaped // characters need to be escaped
#endif #endif
int xp_numfiles; // number of files found by file name completion int xp_numfiles; // number of files found by file name completion

88
src/nvim/ex_eval.c
View File

@ -45,7 +45,7 @@
// there or even outside the try conditional. Try conditionals may be nested. // there or even outside the try conditional. Try conditionals may be nested.
// Configuration whether an exception is thrown on error or interrupt. When // Configuration whether an exception is thrown on error or interrupt. When
// the preprocessor macros below evaluate to FALSE, an error (did_emsg) or // the preprocessor macros below evaluate to false, an error (did_emsg) or
// interrupt (got_int) under an active try conditional terminates the script // interrupt (got_int) under an active try conditional terminates the script
// after the non-active finally clauses of all active try conditionals have been // after the non-active finally clauses of all active try conditionals have been
// executed. Otherwise, errors and/or interrupts are converted into catchable // executed. Otherwise, errors and/or interrupts are converted into catchable
@ -82,14 +82,14 @@ static void discard_pending_return(typval_T *p)
/* /*
* When several errors appear in a row, setting "force_abort" is delayed until * When several errors appear in a row, setting "force_abort" is delayed until
* the failing command returned. "cause_abort" is set to TRUE meanwhile, in * the failing command returned. "cause_abort" is set to true meanwhile, in
* order to indicate that situation. This is useful when "force_abort" was set * order to indicate that situation. This is useful when "force_abort" was set
* during execution of a function call from an expression: the aborting of the * during execution of a function call from an expression: the aborting of the
* expression evaluation is done without producing any error messages, but all * expression evaluation is done without producing any error messages, but all
* error messages on parsing errors during the expression evaluation are given * error messages on parsing errors during the expression evaluation are given
* (even if a try conditional is active). * (even if a try conditional is active).
*/ */
static int cause_abort = FALSE; static int cause_abort = false;
/// @return true when immediately aborting on error, or when an interrupt /// @return true when immediately aborting on error, or when an interrupt
/// occurred or an exception was thrown but not caught. /// occurred or an exception was thrown but not caught.
@ -114,11 +114,11 @@ int aborting(void)
void update_force_abort(void) void update_force_abort(void)
{ {
if (cause_abort) { if (cause_abort) {
force_abort = TRUE; force_abort = true;
} }
} }
/// @return TRUE if a command with a subcommand resulting in "retcode" should /// @return true if a command with a subcommand resulting in "retcode" should
/// abort the script processing. Can be used to suppress an autocommand after /// abort the script processing. Can be used to suppress an autocommand after
/// execution of a failing subcommand as long as the error message has not been /// execution of a failing subcommand as long as the error message has not been
/// displayed and actually caused the abortion. /// displayed and actually caused the abortion.
@ -127,7 +127,7 @@ int should_abort(int retcode)
return (retcode == FAIL && trylevel != 0 && !emsg_silent) || aborting(); return (retcode == FAIL && trylevel != 0 && !emsg_silent) || aborting();
} }
/// @return TRUE if a function with the "abort" flag should not be considered /// @return true if a function with the "abort" flag should not be considered
/// ended on an error. This means that parsing commands is continued in order /// ended on an error. This means that parsing commands is continued in order
/// to find finally clauses to be executed, and that some errors in skipped /// to find finally clauses to be executed, and that some errors in skipped
/// commands are still reported. /// commands are still reported.
@ -175,7 +175,7 @@ bool cause_errthrow(const char *mesg, bool severe, bool *ignore)
*/ */
if (!did_emsg) { if (!did_emsg) {
cause_abort = force_abort; cause_abort = force_abort;
force_abort = FALSE; force_abort = false;
} }
/* /*
@ -206,7 +206,7 @@ bool cause_errthrow(const char *mesg, bool severe, bool *ignore)
* Ensure that all commands in nested function calls and sourced files * Ensure that all commands in nested function calls and sourced files
* are aborted immediately. * are aborted immediately.
*/ */
cause_abort = TRUE; cause_abort = true;
/* /*
* When an exception is being thrown, some commands (like conditionals) are * When an exception is being thrown, some commands (like conditionals) are
@ -318,8 +318,8 @@ void do_errthrow(cstack_T *cstack, char *cmdname)
* are aborted immediately. * are aborted immediately.
*/ */
if (cause_abort) { if (cause_abort) {
cause_abort = FALSE; cause_abort = false;
force_abort = TRUE; force_abort = true;
} }
// If no exception is to be thrown or the conversion should be done after // If no exception is to be thrown or the conversion should be done after
@ -334,7 +334,7 @@ void do_errthrow(cstack_T *cstack, char *cmdname)
if (cstack != NULL) { if (cstack != NULL) {
do_throw(cstack); do_throw(cstack);
} else { } else {
need_rethrow = TRUE; need_rethrow = true;
} }
} }
*msg_list = NULL; *msg_list = NULL;
@ -343,8 +343,8 @@ void do_errthrow(cstack_T *cstack, char *cmdname)
/// do_intthrow(): Replace the current exception by an interrupt or interrupt /// do_intthrow(): Replace the current exception by an interrupt or interrupt
/// exception if appropriate. /// exception if appropriate.
/// ///
/// @return TRUE if the current exception is discarded or, /// @return true if the current exception is discarded or,
/// FALSE otherwise. /// false otherwise.
int do_intthrow(cstack_T *cstack) int do_intthrow(cstack_T *cstack)
{ {
// If no interrupt occurred or no try conditional is active and no exception // If no interrupt occurred or no try conditional is active and no exception
@ -501,13 +501,13 @@ static int throw_exception(void *value, except_type_T type, char *cmdname)
int save_msg_silent = msg_silent; int save_msg_silent = msg_silent;
if (debug_break_level > 0) { if (debug_break_level > 0) {
msg_silent = FALSE; // display messages msg_silent = false; // display messages
} else { } else {
verbose_enter(); verbose_enter();
} }
no_wait_return++; no_wait_return++;
if (debug_break_level > 0 || *p_vfile == NUL) { if (debug_break_level > 0 || *p_vfile == NUL) {
msg_scroll = TRUE; // always scroll up, don't overwrite msg_scroll = true; // always scroll up, don't overwrite
} }
smsg(_("Exception thrown: %s"), excp->value); smsg(_("Exception thrown: %s"), excp->value);
msg_puts("\n"); // don't overwrite this either msg_puts("\n"); // don't overwrite this either
@ -554,13 +554,13 @@ static void discard_exception(except_T *excp, bool was_finished)
saved_IObuff = (char *)vim_strsave(IObuff); saved_IObuff = (char *)vim_strsave(IObuff);
if (debug_break_level > 0) { if (debug_break_level > 0) {
msg_silent = FALSE; // display messages msg_silent = false; // display messages
} else { } else {
verbose_enter(); verbose_enter();
} }
no_wait_return++; no_wait_return++;
if (debug_break_level > 0 || *p_vfile == NUL) { if (debug_break_level > 0 || *p_vfile == NUL) {
msg_scroll = TRUE; // always scroll up, don't overwrite msg_scroll = true; // always scroll up, don't overwrite
} }
smsg(was_finished ? _("Exception finished: %s") smsg(was_finished ? _("Exception finished: %s")
: _("Exception discarded: %s"), : _("Exception discarded: %s"),
@ -622,13 +622,13 @@ static void catch_exception(except_T *excp)
int save_msg_silent = msg_silent; int save_msg_silent = msg_silent;
if (debug_break_level > 0) { if (debug_break_level > 0) {
msg_silent = FALSE; // display messages msg_silent = false; // display messages
} else { } else {
verbose_enter(); verbose_enter();
} }
no_wait_return++; no_wait_return++;
if (debug_break_level > 0 || *p_vfile == NUL) { if (debug_break_level > 0 || *p_vfile == NUL) {
msg_scroll = TRUE; // always scroll up, don't overwrite msg_scroll = true; // always scroll up, don't overwrite
} }
smsg(_("Exception caught: %s"), excp->value); smsg(_("Exception caught: %s"), excp->value);
msg_puts("\n"); // don't overwrite this either msg_puts("\n"); // don't overwrite this either
@ -746,7 +746,7 @@ static void report_pending(int action, int pending, void *value)
save_msg_silent = msg_silent; save_msg_silent = msg_silent;
if (debug_break_level > 0) { if (debug_break_level > 0) {
msg_silent = FALSE; // display messages msg_silent = false; // display messages
} }
no_wait_return++; no_wait_return++;
msg_scroll = true; // always scroll up, don't overwrite msg_scroll = true; // always scroll up, don't overwrite
@ -987,7 +987,7 @@ void ex_while(exarg_T *eap)
// Jumping here from a ":continue" or ":endfor": use the // Jumping here from a ":continue" or ":endfor": use the
// previously evaluated list. // previously evaluated list.
fi = cstack->cs_forinfo[cstack->cs_idx]; fi = cstack->cs_forinfo[cstack->cs_idx];
error = FALSE; error = false;
} else { } else {
// Evaluate the argument and get the info in a structure. // Evaluate the argument and get the info in a structure.
fi = eval_for_line(eap->arg, &error, &eap->nextcmd, skip); fi = eval_for_line(eap->arg, &error, &eap->nextcmd, skip);
@ -998,7 +998,7 @@ void ex_while(exarg_T *eap)
if (!error && fi != NULL && !skip) { if (!error && fi != NULL && !skip) {
result = next_for_item(fi, eap->arg); result = next_for_item(fi, eap->arg);
} else { } else {
result = FALSE; result = false;
} }
if (!result) { if (!result) {
@ -1131,7 +1131,7 @@ void ex_endwhile(exarg_T *eap)
} }
} }
// Cleanup and rewind all contained (and unclosed) conditionals. // Cleanup and rewind all contained (and unclosed) conditionals.
(void)cleanup_conditionals(cstack, CSF_WHILE | CSF_FOR, FALSE); (void)cleanup_conditionals(cstack, CSF_WHILE | CSF_FOR, false);
rewind_conditionals(cstack, idx, CSF_TRY, &cstack->cs_trylevel); rewind_conditionals(cstack, idx, CSF_TRY, &cstack->cs_trylevel);
} else if (cstack->cs_flags[cstack->cs_idx] & CSF_TRUE } else if (cstack->cs_flags[cstack->cs_idx] & CSF_TRUE
&& !(cstack->cs_flags[cstack->cs_idx] & CSF_ACTIVE) && !(cstack->cs_flags[cstack->cs_idx] & CSF_ACTIVE)
@ -1186,7 +1186,7 @@ void ex_throw(exarg_T *eap)
void do_throw(cstack_T *cstack) void do_throw(cstack_T *cstack)
{ {
int idx; int idx;
int inactivate_try = FALSE; int inactivate_try = false;
// //
// Cleanup and deactivate up to the next surrounding try conditional that // Cleanup and deactivate up to the next surrounding try conditional that
@ -1199,14 +1199,14 @@ void do_throw(cstack_T *cstack)
// //
#ifndef THROW_ON_ERROR_TRUE #ifndef THROW_ON_ERROR_TRUE
if (did_emsg && !THROW_ON_ERROR) { if (did_emsg && !THROW_ON_ERROR) {
inactivate_try = TRUE; inactivate_try = true;
did_emsg = FALSE; did_emsg = false;
} }
#endif #endif
#ifndef THROW_ON_INTERRUPT_TRUE #ifndef THROW_ON_INTERRUPT_TRUE
if (got_int && !THROW_ON_INTERRUPT) { if (got_int && !THROW_ON_INTERRUPT) {
inactivate_try = TRUE; inactivate_try = true;
got_int = FALSE; got_int = false;
} }
#endif #endif
idx = cleanup_conditionals(cstack, 0, inactivate_try); idx = cleanup_conditionals(cstack, 0, inactivate_try);
@ -1434,7 +1434,7 @@ void ex_catch(exarg_T *eap)
* a ":continue", ":break", ":return", or ":finish", discard the * a ":continue", ":break", ":return", or ":finish", discard the
* pending action. * pending action.
*/ */
cleanup_conditionals(cstack, CSF_TRY, TRUE); cleanup_conditionals(cstack, CSF_TRY, true);
} }
} }
@ -1447,7 +1447,7 @@ void ex_catch(exarg_T *eap)
void ex_finally(exarg_T *eap) void ex_finally(exarg_T *eap)
{ {
int idx; int idx;
int skip = FALSE; int skip = false;
int pending = CSTP_NONE; int pending = CSTP_NONE;
cstack_T *const cstack = eap->cstack; cstack_T *const cstack = eap->cstack;
@ -1507,7 +1507,7 @@ void ex_finally(exarg_T *eap)
* ":continue", ":break", ":finish", or ":return" from the preceding * ":continue", ":break", ":finish", or ":return" from the preceding
* try block or catch clause. * try block or catch clause.
*/ */
cleanup_conditionals(cstack, CSF_TRY, FALSE); cleanup_conditionals(cstack, CSF_TRY, false);
/* /*
* Make did_emsg, got_int, current_exception pending. If set, they * Make did_emsg, got_int, current_exception pending. If set, they
@ -1683,7 +1683,7 @@ void ex_endtry(exarg_T *eap)
* after errors except when this ":endtry" is not within a ":try". * after errors except when this ":endtry" is not within a ":try".
* Restore "emsg_silent" if it has been reset by this try conditional. * Restore "emsg_silent" if it has been reset by this try conditional.
*/ */
(void)cleanup_conditionals(cstack, CSF_TRY | CSF_SILENT, TRUE); (void)cleanup_conditionals(cstack, CSF_TRY | CSF_SILENT, true);
if (cstack->cs_idx >= 0 && (cstack->cs_flags[cstack->cs_idx] & CSF_TRY)) { if (cstack->cs_idx >= 0 && (cstack->cs_flags[cstack->cs_idx] & CSF_TRY)) {
cstack->cs_idx--; cstack->cs_idx--;
@ -1712,10 +1712,10 @@ void ex_endtry(exarg_T *eap)
ex_break(eap); ex_break(eap);
break; break;
case CSTP_RETURN: case CSTP_RETURN:
do_return(eap, FALSE, FALSE, rettv); do_return(eap, false, false, rettv);
break; break;
case CSTP_FINISH: case CSTP_FINISH:
do_finish(eap, FALSE); do_finish(eap, false);
break; break;
// When the finally clause was entered due to an error, // When the finally clause was entered due to an error,
@ -1792,7 +1792,7 @@ void enter_cleanup(cleanup_T *csp)
csp->exception = NULL; csp->exception = NULL;
if (did_emsg) { if (did_emsg) {
force_abort |= cause_abort; force_abort |= cause_abort;
cause_abort = FALSE; cause_abort = false;
} }
} }
did_emsg = got_int = need_rethrow = false; did_emsg = got_int = need_rethrow = false;
@ -1863,7 +1863,7 @@ void leave_cleanup(cleanup_T *csp)
// enter_cleanup() was called, let "cause_abort" take the part of // enter_cleanup() was called, let "cause_abort" take the part of
// "force_abort" (as done by cause_errthrow()). // "force_abort" (as done by cause_errthrow()).
cause_abort = force_abort; cause_abort = force_abort;
force_abort = FALSE; force_abort = false;
} }
// Restore the pending values of did_emsg, got_int, and current_exception. // Restore the pending values of did_emsg, got_int, and current_exception.
@ -1895,7 +1895,7 @@ void leave_cleanup(cleanup_T *csp)
/// inactive itself (a try conditional not in its finally /// inactive itself (a try conditional not in its finally
/// clause possibly find before is always made inactive). /// clause possibly find before is always made inactive).
/// ///
/// If "inclusive" is TRUE and "searched_cond" is CSF_TRY|CSF_SILENT, the saved /// If "inclusive" is true and "searched_cond" is CSF_TRY|CSF_SILENT, the saved
/// former value of "emsg_silent", if reset when the try conditional finally /// former value of "emsg_silent", if reset when the try conditional finally
/// reached was entered, is restored (used by ex_endtry()). This is normally /// reached was entered, is restored (used by ex_endtry()). This is normally
/// done only when such a try conditional is left. /// done only when such a try conditional is left.
@ -1904,7 +1904,7 @@ void leave_cleanup(cleanup_T *csp)
int cleanup_conditionals(cstack_T *cstack, int searched_cond, int inclusive) int cleanup_conditionals(cstack_T *cstack, int searched_cond, int inclusive)
{ {
int idx; int idx;
int stop = FALSE; int stop = false;
for (idx = cstack->cs_idx; idx >= 0; idx--) { for (idx = cstack->cs_idx; idx >= 0; idx--) {
if (cstack->cs_flags[idx] & CSF_TRY) { if (cstack->cs_flags[idx] & CSF_TRY) {
@ -1968,20 +1968,20 @@ int cleanup_conditionals(cstack_T *cstack, int searched_cond, int inclusive)
if (searched_cond == 0 && !inclusive) { if (searched_cond == 0 && !inclusive) {
break; break;
} }
stop = TRUE; stop = true;
} }
} }
} }
// Stop on the searched conditional type (even when the surrounding // Stop on the searched conditional type (even when the surrounding
// conditional is not active or something has been made pending). // conditional is not active or something has been made pending).
// If "inclusive" is TRUE and "searched_cond" is CSF_TRY|CSF_SILENT, // If "inclusive" is true and "searched_cond" is CSF_TRY|CSF_SILENT,
// check first whether "emsg_silent" needs to be restored. // check first whether "emsg_silent" needs to be restored.
if (cstack->cs_flags[idx] & searched_cond) { if (cstack->cs_flags[idx] & searched_cond) {
if (!inclusive) { if (!inclusive) {
break; break;
} }
stop = TRUE; stop = true;
} }
cstack->cs_flags[idx] &= ~CSF_ACTIVE; cstack->cs_flags[idx] &= ~CSF_ACTIVE;
if (stop && searched_cond != (CSF_TRY | CSF_SILENT)) { if (stop && searched_cond != (CSF_TRY | CSF_SILENT)) {
@ -2046,7 +2046,7 @@ void ex_endfunction(exarg_T *eap)
emsg(_("E193: :endfunction not inside a function")); emsg(_("E193: :endfunction not inside a function"));
} }
/// @return TRUE if the string "p" looks like a ":while" or ":for" command. /// @return true if the string "p" looks like a ":while" or ":for" command.
int has_loop_cmd(char *p) int has_loop_cmd(char *p)
{ {
int len; int len;
@ -2064,7 +2064,7 @@ int has_loop_cmd(char *p)
} }
if ((p[0] == 'w' && p[1] == 'h') if ((p[0] == 'w' && p[1] == 'h')
|| (p[0] == 'f' && p[1] == 'o' && p[2] == 'r')) { || (p[0] == 'f' && p[1] == 'o' && p[2] == 'r')) {
return TRUE; return true;
} }
return FALSE; return false;
} }

28
src/nvim/ex_getln.c
View File

@ -105,8 +105,8 @@ typedef struct command_line_state {
long count; long count;
int indent; int indent;
int c; int c;
int gotesc; // TRUE when <ESC> just typed int gotesc; // true when <ESC> just typed
int do_abbr; // when TRUE check for abbr. int do_abbr; // when true check for abbr.
char_u *lookfor; // string to match char_u *lookfor; // string to match
int hiscnt; // current history line in use int hiscnt; // current history line in use
int save_hiscnt; // history line before attempting int save_hiscnt; // history line before attempting
@ -3029,7 +3029,7 @@ color_cmdline_error:
/* /*
* Draw part of the cmdline at the current cursor position. But draw stars * Draw part of the cmdline at the current cursor position. But draw stars
* when cmdline_star is TRUE. * when cmdline_star is true.
*/ */
static void draw_cmdline(int start, int len) static void draw_cmdline(int start, int len)
{ {
@ -3283,7 +3283,7 @@ void cmdline_ui_flush(void)
/* /*
* Put a character on the command line. Shifts the following text to the * Put a character on the command line. Shifts the following text to the
* right when "shift" is TRUE. Used for CTRL-V, CTRL-K, etc. * right when "shift" is true. Used for CTRL-V, CTRL-K, etc.
* "c" must be printable (fit in one display cell)! * "c" must be printable (fit in one display cell)!
*/ */
void putcmdline(char c, int shift) void putcmdline(char c, int shift)
@ -3309,7 +3309,7 @@ void putcmdline(char c, int shift)
ui_cursor_shape(); ui_cursor_shape();
} }
/// Undo a putcmdline(c, FALSE). /// Undo a putcmdline(c, false).
void unputcmdline(void) void unputcmdline(void)
{ {
if (cmd_silent) { if (cmd_silent) {
@ -3330,9 +3330,9 @@ void unputcmdline(void)
/* /*
* Put the given string, of the given length, onto the command line. * Put the given string, of the given length, onto the command line.
* If len is -1, then STRLEN() is used to calculate the length. * If len is -1, then STRLEN() is used to calculate the length.
* If 'redraw' is TRUE then the new part of the command line, and the remaining * If 'redraw' is true then the new part of the command line, and the remaining
* part will be redrawn, otherwise it will not. If this function is called * part will be redrawn, otherwise it will not. If this function is called
* twice in a row, then 'redraw' should be FALSE and redrawcmd() should be * twice in a row, then 'redraw' should be false and redrawcmd() should be
* called afterwards. * called afterwards.
*/ */
void put_on_cmdline(char_u *str, int len, int redraw) void put_on_cmdline(char_u *str, int len, int redraw)
@ -3409,7 +3409,7 @@ void put_on_cmdline(char_u *str, int len, int redraw)
} }
if (redraw && !cmd_silent) { if (redraw && !cmd_silent) {
msg_no_more = TRUE; msg_no_more = true;
i = cmdline_row; i = cmdline_row;
cursorcmd(); cursorcmd();
draw_cmdline(ccline.cmdpos, ccline.cmdlen - ccline.cmdpos); draw_cmdline(ccline.cmdpos, ccline.cmdlen - ccline.cmdpos);
@ -3417,7 +3417,7 @@ void put_on_cmdline(char_u *str, int len, int redraw)
if (cmdline_row != i || ccline.overstrike) { if (cmdline_row != i || ccline.overstrike) {
msg_clr_eos(); msg_clr_eos();
} }
msg_no_more = FALSE; msg_no_more = false;
} }
if (KeyTyped) { if (KeyTyped) {
m = Columns * Rows; m = Columns * Rows;
@ -3544,8 +3544,8 @@ static bool cmdline_paste(int regname, bool literally, bool remcr)
/* /*
* Put a string on the command line. * Put a string on the command line.
* When "literally" is TRUE, insert literally. * When "literally" is true, insert literally.
* When "literally" is FALSE, insert as typed, but don't leave the command * When "literally" is false, insert as typed, but don't leave the command
* line. * line.
*/ */
void cmdline_paste_str(char_u *s, int literally) void cmdline_paste_str(char_u *s, int literally)
@ -3553,7 +3553,7 @@ void cmdline_paste_str(char_u *s, int literally)
int c, cv; int c, cv;
if (literally) { if (literally) {
put_on_cmdline(s, -1, TRUE); put_on_cmdline(s, -1, true);
} else { } else {
while (*s != NUL) { while (*s != NUL) {
cv = *s; cv = *s;
@ -3642,7 +3642,7 @@ void redrawcmd(void)
redrawcmdprompt(); redrawcmdprompt();
// Don't use more prompt, truncate the cmdline if it doesn't fit. // Don't use more prompt, truncate the cmdline if it doesn't fit.
msg_no_more = TRUE; msg_no_more = true;
draw_cmdline(0, ccline.cmdlen); draw_cmdline(0, ccline.cmdlen);
msg_clr_eos(); msg_clr_eos();
msg_no_more = false; msg_no_more = false;
@ -3657,7 +3657,7 @@ void redrawcmd(void)
* An emsg() before may have set msg_scroll. This is used in normal mode, * An emsg() before may have set msg_scroll. This is used in normal mode,
* in cmdline mode we can reset them now. * in cmdline mode we can reset them now.
*/ */
msg_scroll = FALSE; // next message overwrites cmdline msg_scroll = false; // next message overwrites cmdline
// Typing ':' at the more prompt may set skip_redraw. We don't want this // Typing ':' at the more prompt may set skip_redraw. We don't want this
// in cmdline mode. // in cmdline mode.

34
src/nvim/file_search.c
View File

@ -220,8 +220,8 @@ static char_u e_pathtoolong[] = N_("E854: path too long for completion");
/// ///
/// Upward search is only done on the starting dir. /// Upward search is only done on the starting dir.
/// ///
/// If 'free_visited' is TRUE the list of already visited files/directories is /// If 'free_visited' is true the list of already visited files/directories is
/// cleared. Set this to FALSE if you just want to search from another /// cleared. Set this to false if you just want to search from another
/// directory, but want to be sure that no directory from a previous search is /// directory, but want to be sure that no directory from a previous search is
/// searched again. This is useful if you search for a file at different places. /// searched again. This is useful if you search for a file at different places.
/// The list of visited files/dirs can also be cleared with the function /// The list of visited files/dirs can also be cleared with the function
@ -268,7 +268,7 @@ void *vim_findfile_init(char_u *path, char_u *filename, char_u *stopdirs, int le
ff_clear(search_ctx); ff_clear(search_ctx);
// clear visited list if wanted // clear visited list if wanted
if (free_visited == TRUE) { if (free_visited == true) {
vim_findfile_free_visited(search_ctx); vim_findfile_free_visited(search_ctx);
} else { } else {
/* Reuse old visited lists. Get the visited list for the given /* Reuse old visited lists. Get the visited list for the given
@ -301,7 +301,7 @@ void *vim_findfile_init(char_u *path, char_u *filename, char_u *stopdirs, int le
if (!vim_isAbsName(rel_fname) && len + 1 < MAXPATHL) { if (!vim_isAbsName(rel_fname) && len + 1 < MAXPATHL) {
// Make the start dir an absolute path name. // Make the start dir an absolute path name.
STRLCPY(ff_expand_buffer, rel_fname, len + 1); STRLCPY(ff_expand_buffer, rel_fname, len + 1);
search_ctx->ffsc_start_dir = (char_u *)FullName_save((char *)ff_expand_buffer, FALSE); search_ctx->ffsc_start_dir = (char_u *)FullName_save((char *)ff_expand_buffer, false);
} else { } else {
search_ctx->ffsc_start_dir = vim_strnsave(rel_fname, len); search_ctx->ffsc_start_dir = vim_strnsave(rel_fname, len);
} }
@ -932,7 +932,7 @@ char_u *vim_findfile(void *search_ctx_arg)
// is the last starting directory in the stop list? // is the last starting directory in the stop list?
if (ff_path_in_stoplist(search_ctx->ffsc_start_dir, if (ff_path_in_stoplist(search_ctx->ffsc_start_dir,
(int)(path_end - search_ctx->ffsc_start_dir), (int)(path_end - search_ctx->ffsc_start_dir),
search_ctx->ffsc_stopdirs_v) == TRUE) { search_ctx->ffsc_stopdirs_v) == true) {
break; break;
} }
@ -1276,7 +1276,7 @@ static void ff_clear(ff_search_ctx_T *search_ctx)
/// check if the given path is in the stopdirs /// check if the given path is in the stopdirs
/// ///
/// @return TRUE if yes else FALSE /// @return true if yes else false
static int ff_path_in_stoplist(char_u *path, int path_len, char_u **stopdirs_v) static int ff_path_in_stoplist(char_u *path, int path_len, char_u **stopdirs_v)
{ {
int i = 0; int i = 0;
@ -1288,7 +1288,7 @@ static int ff_path_in_stoplist(char_u *path, int path_len, char_u **stopdirs_v)
// if no path consider it as match // if no path consider it as match
if (path_len == 0) { if (path_len == 0) {
return TRUE; return true;
} }
for (i = 0; stopdirs_v[i] != NULL; i++) { for (i = 0; stopdirs_v[i] != NULL; i++) {
@ -1299,7 +1299,7 @@ static int ff_path_in_stoplist(char_u *path, int path_len, char_u **stopdirs_v)
*/ */
if (FNAMENCMP(stopdirs_v[i], path, path_len) == 0 if (FNAMENCMP(stopdirs_v[i], path, path_len) == 0
&& vim_ispathsep(stopdirs_v[i][path_len])) { && vim_ispathsep(stopdirs_v[i][path_len])) {
return TRUE; return true;
} }
} else { } else {
if (FNAMECMP(stopdirs_v[i], path) == 0) { if (FNAMECMP(stopdirs_v[i], path) == 0) {
@ -1307,13 +1307,13 @@ static int ff_path_in_stoplist(char_u *path, int path_len, char_u **stopdirs_v)
} }
} }
} }
return FALSE; return false;
} }
/// Find the file name "ptr[len]" in the path. Also finds directory names. /// Find the file name "ptr[len]" in the path. Also finds directory names.
/// ///
/// On the first call set the parameter 'first' to TRUE to initialize /// On the first call set the parameter 'first' to true to initialize
/// the search. For repeating calls to FALSE. /// the search. For repeating calls to false.
/// ///
/// Repeating calls will return other files called 'ptr[len]' from the path. /// Repeating calls will return other files called 'ptr[len]' from the path.
/// ///
@ -1374,7 +1374,7 @@ void free_findfile(void)
/// @return an allocated string for the file name. NULL for error. /// @return an allocated string for the file name. NULL for error.
char_u *find_directory_in_path(char_u *ptr, size_t len, int options, char_u *rel_fname) char_u *find_directory_in_path(char_u *ptr, size_t len, int options, char_u *rel_fname)
{ {
return find_file_in_path_option(ptr, len, options, TRUE, p_cdpath, return find_file_in_path_option(ptr, len, options, true, p_cdpath,
FINDFILE_DIR, rel_fname, (char_u *)""); FINDFILE_DIR, rel_fname, (char_u *)"");
} }
@ -1445,7 +1445,7 @@ char_u *find_file_in_path_option(char_u *ptr, size_t len, int options, int first
* If this is not a first call, return NULL. We already returned a * If this is not a first call, return NULL. We already returned a
* filename on the first call. * filename on the first call.
*/ */
if (first == TRUE) { if (first == true) {
if (path_with_url((char *)ff_file_to_find)) { if (path_with_url((char *)ff_file_to_find)) {
file_name = vim_strsave(ff_file_to_find); file_name = vim_strsave(ff_file_to_find);
goto theend; goto theend;
@ -1494,7 +1494,7 @@ char_u *find_file_in_path_option(char_u *ptr, size_t len, int options, int first
* When "first" is set, first setup to the start of the option. * When "first" is set, first setup to the start of the option.
* Otherwise continue to find the next match. * Otherwise continue to find the next match.
*/ */
if (first == TRUE) { if (first == true) {
// vim_findfile_free_visited can handle a possible NULL pointer // vim_findfile_free_visited can handle a possible NULL pointer
vim_findfile_free_visited(fdip_search_ctx); vim_findfile_free_visited(fdip_search_ctx);
dir = (char *)path_option; dir = (char *)path_option;
@ -1508,7 +1508,7 @@ char_u *find_file_in_path_option(char_u *ptr, size_t len, int options, int first
break; break;
} }
did_findfile_init = FALSE; did_findfile_init = false;
} else { } else {
char_u *r_ptr; char_u *r_ptr;
@ -1532,14 +1532,14 @@ char_u *find_file_in_path_option(char_u *ptr, size_t len, int options, int first
r_ptr, 100, false, find_what, r_ptr, 100, false, find_what,
fdip_search_ctx, false, rel_fname); fdip_search_ctx, false, rel_fname);
if (fdip_search_ctx != NULL) { if (fdip_search_ctx != NULL) {
did_findfile_init = TRUE; did_findfile_init = true;
} }
xfree(buf); xfree(buf);
} }
} }
} }
if (file_name == NULL && (options & FNAME_MESS)) { if (file_name == NULL && (options & FNAME_MESS)) {
if (first == TRUE) { if (first == true) {
if (find_what == FINDFILE_DIR) { if (find_what == FINDFILE_DIR) {
semsg(_("E344: Can't find directory \"%s\" in cdpath"), semsg(_("E344: Can't find directory \"%s\" in cdpath"),
ff_file_to_find); ff_file_to_find);

214
src/nvim/fileio.c
View File

@ -134,7 +134,7 @@ void filemess(buf_T *buf, char_u *name, char_u *s, int attr)
// calling filemess(). // calling filemess().
msg_scroll_save = msg_scroll; msg_scroll_save = msg_scroll;
if (shortmess(SHM_OVERALL) && !exiting && p_verbose == 0) { if (shortmess(SHM_OVERALL) && !exiting && p_verbose == 0) {
msg_scroll = FALSE; msg_scroll = false;
} }
if (!msg_scroll) { // wait a bit when overwriting an error msg if (!msg_scroll) { // wait a bit when overwriting an error msg
check_for_delay(false); check_for_delay(false);
@ -143,7 +143,7 @@ void filemess(buf_T *buf, char_u *name, char_u *s, int attr)
msg_scroll = msg_scroll_save; msg_scroll = msg_scroll_save;
msg_scrolled_ign = true; msg_scrolled_ign = true;
// may truncate the message to avoid a hit-return prompt // may truncate the message to avoid a hit-return prompt
msg_outtrans_attr(msg_may_trunc(FALSE, IObuff), attr); msg_outtrans_attr(msg_may_trunc(false, IObuff), attr);
msg_clr_eos(); msg_clr_eos();
ui_flush(); ui_flush();
msg_scrolled_ign = false; msg_scrolled_ign = false;
@ -337,9 +337,9 @@ int readfile(char *fname, char *sfname, linenr_T from, linenr_T lines_to_skip,
} }
if ((shortmess(SHM_OVER) || curbuf->b_help) && p_verbose == 0) { if ((shortmess(SHM_OVER) || curbuf->b_help) && p_verbose == 0) {
msg_scroll = FALSE; // overwrite previous file message msg_scroll = false; // overwrite previous file message
} else { } else {
msg_scroll = TRUE; // don't overwrite previous file message msg_scroll = true; // don't overwrite previous file message
} }
// If the name is too long we might crash further on, quit here. // If the name is too long we might crash further on, quit here.
if (fname != NULL && *fname != NUL) { if (fname != NULL && *fname != NUL) {
@ -402,7 +402,7 @@ int readfile(char *fname, char *sfname, linenr_T from, linenr_T lines_to_skip,
*/ */
check_readonly = (newfile && (curbuf->b_flags & BF_CHECK_RO)); check_readonly = (newfile && (curbuf->b_flags & BF_CHECK_RO));
if (check_readonly && !readonlymode) { if (check_readonly && !readonlymode) {
curbuf->b_p_ro = FALSE; curbuf->b_p_ro = false;
} }
if (newfile && !read_stdin && !read_buffer && !read_fifo) { if (newfile && !read_stdin && !read_buffer && !read_fifo) {
@ -518,18 +518,18 @@ int readfile(char *fname, char *sfname, linenr_T from, linenr_T lines_to_skip,
* loaded. Help files always get readonly mode * loaded. Help files always get readonly mode
*/ */
if ((check_readonly && file_readonly) || curbuf->b_help) { if ((check_readonly && file_readonly) || curbuf->b_help) {
curbuf->b_p_ro = TRUE; curbuf->b_p_ro = true;
} }
if (set_options) { if (set_options) {
// Don't change 'eol' if reading from buffer as it will already be // Don't change 'eol' if reading from buffer as it will already be
// correctly set when reading stdin. // correctly set when reading stdin.
if (!read_buffer) { if (!read_buffer) {
curbuf->b_p_eol = TRUE; curbuf->b_p_eol = true;
curbuf->b_start_eol = TRUE; curbuf->b_start_eol = true;
} }
curbuf->b_p_bomb = FALSE; curbuf->b_p_bomb = false;
curbuf->b_start_bomb = FALSE; curbuf->b_start_bomb = false;
} }
// Create a swap file now, so that other Vims are warned that we are // Create a swap file now, so that other Vims are warned that we are
@ -635,7 +635,7 @@ int readfile(char *fname, char *sfname, linenr_T from, linenr_T lines_to_skip,
if (aborting()) { // autocmds may abort script processing if (aborting()) { // autocmds may abort script processing
no_wait_return--; no_wait_return--;
msg_scroll = msg_save; msg_scroll = msg_save;
curbuf->b_p_ro = TRUE; // must use "w!" now curbuf->b_p_ro = true; // must use "w!" now
return FAIL; return FAIL;
} }
/* /*
@ -656,7 +656,7 @@ int readfile(char *fname, char *sfname, linenr_T from, linenr_T lines_to_skip,
} else { } else {
emsg(_("E201: *ReadPre autocommands must not change current buffer")); emsg(_("E201: *ReadPre autocommands must not change current buffer"));
} }
curbuf->b_p_ro = TRUE; // must use "w!" now curbuf->b_p_ro = true; // must use "w!" now
return FAIL; return FAIL;
} }
} }
@ -670,7 +670,7 @@ int readfile(char *fname, char *sfname, linenr_T from, linenr_T lines_to_skip,
} }
} }
msg_scroll = FALSE; // overwrite the file message msg_scroll = false; // overwrite the file message
/* /*
* Set linecnt now, before the "retry" caused by a wrong guess for * Set linecnt now, before the "retry" caused by a wrong guess for
@ -751,8 +751,8 @@ retry:
} }
file_rewind = false; file_rewind = false;
if (set_options) { if (set_options) {
curbuf->b_p_bomb = FALSE; curbuf->b_p_bomb = false;
curbuf->b_start_bomb = FALSE; curbuf->b_start_bomb = false;
} }
conv_error = 0; conv_error = 0;
} }
@ -766,7 +766,7 @@ retry:
} else { } else {
if (eap != NULL && eap->force_ff != 0) { if (eap != NULL && eap->force_ff != 0) {
fileformat = get_fileformat_force(curbuf, eap); fileformat = get_fileformat_force(curbuf, eap);
try_unix = try_dos = try_mac = FALSE; try_unix = try_dos = try_mac = false;
} else if (curbuf->b_p_bin) { } else if (curbuf->b_p_bin) {
fileformat = EOL_UNIX; // binary: use Unix format fileformat = EOL_UNIX; // binary: use Unix format
} else if (*p_ffs == } else if (*p_ffs ==
@ -892,7 +892,7 @@ retry:
} }
// Set "can_retry" when it's possible to rewind the file and try with // Set "can_retry" when it's possible to rewind the file and try with
// another "fenc" value. It's FALSE when no other "fenc" to try, reading // another "fenc" value. It's false when no other "fenc" to try, reading
// stdin or fixed at a specific encoding. // stdin or fixed at a specific encoding.
can_retry = (*fenc != NUL && !read_stdin && !keep_dest_enc && !read_fifo); can_retry = (*fenc != NUL && !read_stdin && !keep_dest_enc && !read_fifo);
@ -1138,8 +1138,8 @@ retry:
size -= blen; size -= blen;
memmove(ptr, ptr + blen, (size_t)size); memmove(ptr, ptr + blen, (size_t)size);
if (set_options) { if (set_options) {
curbuf->b_p_bomb = TRUE; curbuf->b_p_bomb = true;
curbuf->b_start_bomb = TRUE; curbuf->b_start_bomb = true;
} }
} }
@ -1672,7 +1672,7 @@ failed:
&& ptr == line_start + 1)) { && ptr == line_start + 1)) {
// remember for when writing // remember for when writing
if (set_options) { if (set_options) {
curbuf->b_p_eol = FALSE; curbuf->b_p_eol = false;
} }
*ptr = NUL; *ptr = NUL;
len = (colnr_T)(ptr - line_start + 1); len = (colnr_T)(ptr - line_start + 1);
@ -1773,7 +1773,7 @@ failed:
if (!(flags & READ_DUMMY)) { if (!(flags & READ_DUMMY)) {
filemess(curbuf, (char_u *)sfname, (char_u *)_(e_interr), 0); filemess(curbuf, (char_u *)sfname, (char_u *)_(e_interr), 0);
if (newfile) { if (newfile) {
curbuf->b_p_ro = TRUE; // must use "w!" now curbuf->b_p_ro = true; // must use "w!" now
} }
} }
msg_scroll = msg_save; msg_scroll = msg_save;
@ -1788,30 +1788,30 @@ failed:
#ifdef UNIX #ifdef UNIX
if (S_ISFIFO(perm)) { // fifo if (S_ISFIFO(perm)) { // fifo
STRCAT(IObuff, _("[fifo]")); STRCAT(IObuff, _("[fifo]"));
c = TRUE; c = true;
} }
if (S_ISSOCK(perm)) { // or socket if (S_ISSOCK(perm)) { // or socket
STRCAT(IObuff, _("[socket]")); STRCAT(IObuff, _("[socket]"));
c = TRUE; c = true;
} }
# ifdef OPEN_CHR_FILES # ifdef OPEN_CHR_FILES
if (S_ISCHR(perm)) { // or character special if (S_ISCHR(perm)) { // or character special
STRCAT(IObuff, _("[character special]")); STRCAT(IObuff, _("[character special]"));
c = TRUE; c = true;
} }
# endif # endif
#endif #endif
if (curbuf->b_p_ro) { if (curbuf->b_p_ro) {
STRCAT(IObuff, shortmess(SHM_RO) ? _("[RO]") : _("[readonly]")); STRCAT(IObuff, shortmess(SHM_RO) ? _("[RO]") : _("[readonly]"));
c = TRUE; c = true;
} }
if (read_no_eol_lnum) { if (read_no_eol_lnum) {
msg_add_eol(); msg_add_eol();
c = TRUE; c = true;
} }
if (ff_error == EOL_DOS) { if (ff_error == EOL_DOS) {
STRCAT(IObuff, _("[CR missing]")); STRCAT(IObuff, _("[CR missing]"));
c = TRUE; c = true;
} }
if (split) { if (split) {
STRCAT(IObuff, _("[long lines split]")); STRCAT(IObuff, _("[long lines split]"));
@ -1819,25 +1819,25 @@ failed:
} }
if (notconverted) { if (notconverted) {
STRCAT(IObuff, _("[NOT converted]")); STRCAT(IObuff, _("[NOT converted]"));
c = TRUE; c = true;
} else if (converted) { } else if (converted) {
STRCAT(IObuff, _("[converted]")); STRCAT(IObuff, _("[converted]"));
c = TRUE; c = true;
} }
if (conv_error != 0) { if (conv_error != 0) {
sprintf((char *)IObuff + STRLEN(IObuff), sprintf((char *)IObuff + STRLEN(IObuff),
_("[CONVERSION ERROR in line %" PRId64 "]"), (int64_t)conv_error); _("[CONVERSION ERROR in line %" PRId64 "]"), (int64_t)conv_error);
c = TRUE; c = true;
} else if (illegal_byte > 0) { } else if (illegal_byte > 0) {
sprintf((char *)IObuff + STRLEN(IObuff), sprintf((char *)IObuff + STRLEN(IObuff),
_("[ILLEGAL BYTE in line %" PRId64 "]"), (int64_t)illegal_byte); _("[ILLEGAL BYTE in line %" PRId64 "]"), (int64_t)illegal_byte);
c = TRUE; c = true;
} else if (error) { } else if (error) {
STRCAT(IObuff, _("[READ ERRORS]")); STRCAT(IObuff, _("[READ ERRORS]"));
c = TRUE; c = true;
} }
if (msg_add_fileformat(fileformat)) { if (msg_add_fileformat(fileformat)) {
c = TRUE; c = true;
} }
msg_add_lines(c, (long)linecnt, filesize); msg_add_lines(c, (long)linecnt, filesize);
@ -1865,9 +1865,8 @@ failed:
// with errors writing the file requires ":w!" // with errors writing the file requires ":w!"
if (newfile && (error if (newfile && (error
|| conv_error != 0 || conv_error != 0
|| (illegal_byte > 0 && bad_char_behavior != BAD_KEEP) || (illegal_byte > 0 && bad_char_behavior != BAD_KEEP))) {
)) { curbuf->b_p_ro = true;
curbuf->b_p_ro = TRUE;
} }
u_clearline(); // cannot use "U" command after adding lines u_clearline(); // cannot use "U" command after adding lines
@ -2021,8 +2020,8 @@ void prep_exarg(exarg_T *eap, const buf_T *buf)
eap->force_ff = *buf->b_p_ff; eap->force_ff = *buf->b_p_ff;
eap->force_bin = buf->b_p_bin ? FORCE_BIN : FORCE_NOBIN; eap->force_bin = buf->b_p_bin ? FORCE_BIN : FORCE_NOBIN;
eap->read_edit = FALSE; eap->read_edit = false;
eap->forceit = FALSE; eap->forceit = false;
} }
/// Set default or forced 'fileformat' and 'binary'. /// Set default or forced 'fileformat' and 'binary'.
@ -2161,9 +2160,9 @@ char *new_file_message(void)
/// ///
/// If "forceit" is true, we don't care for errors when attempting backups. /// If "forceit" is true, we don't care for errors when attempting backups.
/// In case of an error everything possible is done to restore the original /// In case of an error everything possible is done to restore the original
/// file. But when "forceit" is TRUE, we risk losing it. /// file. But when "forceit" is true, we risk losing it.
/// ///
/// When "reset_changed" is TRUE and "append" == FALSE and "start" == 1 and /// When "reset_changed" is true and "append" == false and "start" == 1 and
/// "end" == curbuf->b_ml.ml_line_count, reset curbuf->b_changed. /// "end" == curbuf->b_ml.ml_line_count, reset curbuf->b_changed.
/// ///
/// This function must NOT use NameBuff (because it's called by autowrite()). /// This function must NOT use NameBuff (because it's called by autowrite()).
@ -2204,9 +2203,9 @@ int buf_write(buf_T *buf, char *fname, char *sfname, linenr_T start, linenr_T en
int bufsize; int bufsize;
long perm; // file permissions long perm; // file permissions
int retval = OK; int retval = OK;
int newfile = false; // TRUE if file doesn't exist yet int newfile = false; // true if file doesn't exist yet
int msg_save = msg_scroll; int msg_save = msg_scroll;
int overwriting; // TRUE if writing over original int overwriting; // true if writing over original
int no_eol = false; // no end-of-line written int no_eol = false; // no end-of-line written
int device = false; // writing to a device int device = false; // writing to a device
int prev_got_int = got_int; int prev_got_int = got_int;
@ -2215,7 +2214,7 @@ int buf_write(buf_T *buf, char *fname, char *sfname, linenr_T start, linenr_T en
static char *err_readonly = static char *err_readonly =
"is read-only (cannot override: \"W\" in 'cpoptions')"; "is read-only (cannot override: \"W\" in 'cpoptions')";
#if defined(UNIX) #if defined(UNIX)
int made_writable = FALSE; // 'w' bit has been set int made_writable = false; // 'w' bit has been set
#endif #endif
// writing everything // writing everything
int whole = (start == 1 && end == buf->b_ml.ml_line_count); int whole = (start == 1 && end == buf->b_ml.ml_line_count);
@ -2234,7 +2233,7 @@ int buf_write(buf_T *buf, char *fname, char *sfname, linenr_T start, linenr_T en
vim_acl_T acl = NULL; /* ACL copied from original file to vim_acl_T acl = NULL; /* ACL copied from original file to
backup or new file */ backup or new file */
#endif #endif
int write_undo_file = FALSE; int write_undo_file = false;
context_sha256_T sha_ctx; context_sha256_T sha_ctx;
unsigned int bkc = get_bkc_value(buf); unsigned int bkc = get_bkc_value(buf);
const pos_T orig_start = buf->b_op_start; const pos_T orig_start = buf->b_op_start;
@ -2266,7 +2265,7 @@ int buf_write(buf_T *buf, char *fname, char *sfname, linenr_T start, linenr_T en
// must init bw_conv_buf and bw_iconv_fd before jumping to "fail" // must init bw_conv_buf and bw_iconv_fd before jumping to "fail"
write_info.bw_conv_buf = NULL; write_info.bw_conv_buf = NULL;
write_info.bw_conv_error = FALSE; write_info.bw_conv_error = false;
write_info.bw_conv_error_lnum = 0; write_info.bw_conv_error_lnum = 0;
write_info.bw_restlen = 0; write_info.bw_restlen = 0;
#ifdef HAVE_ICONV #ifdef HAVE_ICONV
@ -2314,7 +2313,7 @@ int buf_write(buf_T *buf, char *fname, char *sfname, linenr_T start, linenr_T en
if (buf->b_ffname != NULL && FNAMECMP(ffname, buf->b_ffname) == 0) { if (buf->b_ffname != NULL && FNAMECMP(ffname, buf->b_ffname) == 0) {
overwriting = true; overwriting = true;
} else { } else {
overwriting = FALSE; overwriting = false;
} }
no_wait_return++; // don't wait for return yet no_wait_return++; // don't wait for return yet
@ -2329,12 +2328,12 @@ int buf_write(buf_T *buf, char *fname, char *sfname, linenr_T start, linenr_T en
{ {
aco_save_T aco; aco_save_T aco;
int buf_ffname = FALSE; int buf_ffname = false;
int buf_sfname = FALSE; int buf_sfname = false;
int buf_fname_f = FALSE; int buf_fname_f = false;
int buf_fname_s = FALSE; int buf_fname_s = false;
int did_cmd = FALSE; int did_cmd = false;
int nofile_err = FALSE; int nofile_err = false;
int empty_memline = (buf->b_ml.ml_mfp == NULL); int empty_memline = (buf->b_ml.ml_mfp == NULL);
bufref_T bufref; bufref_T bufref;
@ -2512,9 +2511,9 @@ int buf_write(buf_T *buf, char *fname, char *sfname, linenr_T start, linenr_T en
} }
if (shortmess(SHM_OVER) && !exiting) { if (shortmess(SHM_OVER) && !exiting) {
msg_scroll = FALSE; // overwrite previous file message msg_scroll = false; // overwrite previous file message
} else { } else {
msg_scroll = TRUE; // don't overwrite previous file message msg_scroll = true; // don't overwrite previous file message
} }
if (!filtering) { if (!filtering) {
filemess(buf, filemess(buf,
@ -2525,7 +2524,7 @@ int buf_write(buf_T *buf, char *fname, char *sfname, linenr_T start, linenr_T en
#endif #endif
(char_u *)"", 0); // show that we are busy (char_u *)"", 0); // show that we are busy
} }
msg_scroll = FALSE; // always overwrite the file message now msg_scroll = false; // always overwrite the file message now
buffer = verbose_try_malloc(BUFSIZE); buffer = verbose_try_malloc(BUFSIZE);
// can't allocate big buffer, use small one (to be able to write when out of // can't allocate big buffer, use small one (to be able to write when out of
@ -2558,8 +2557,8 @@ int buf_write(buf_T *buf, char *fname, char *sfname, linenr_T start, linenr_T en
} }
/* It's a device of some kind (or a fifo) which we can write to /* It's a device of some kind (or a fifo) which we can write to
* but for which we can't make a backup. */ * but for which we can't make a backup. */
device = TRUE; device = true;
newfile = TRUE; newfile = true;
perm = -1; perm = -1;
} }
} }
@ -2571,8 +2570,8 @@ int buf_write(buf_T *buf, char *fname, char *sfname, linenr_T start, linenr_T en
goto fail; goto fail;
} }
if (c == NODE_WRITABLE) { if (c == NODE_WRITABLE) {
device = TRUE; device = true;
newfile = TRUE; newfile = true;
perm = -1; perm = -1;
} else { } else {
perm = os_getperm((const char *)fname); perm = os_getperm((const char *)fname);
@ -2638,7 +2637,7 @@ int buf_write(buf_T *buf, char *fname, char *sfname, linenr_T start, linenr_T en
* abort it. * abort it.
*/ */
prev_got_int = got_int; prev_got_int = got_int;
got_int = FALSE; got_int = false;
// Mark the buffer as 'being saved' to prevent changed buffer warnings // Mark the buffer as 'being saved' to prevent changed buffer warnings
buf->b_saving = true; buf->b_saving = true;
@ -2656,7 +2655,7 @@ int buf_write(buf_T *buf, char *fname, char *sfname, linenr_T start, linenr_T en
const bool no_prepend_dot = false; const bool no_prepend_dot = false;
if ((bkc & BKC_YES) || append) { // "yes" if ((bkc & BKC_YES) || append) { // "yes"
backup_copy = TRUE; backup_copy = true;
} else if ((bkc & BKC_AUTO)) { // "auto" } else if ((bkc & BKC_AUTO)) { // "auto"
int i; int i;
@ -2669,7 +2668,7 @@ int buf_write(buf_T *buf, char *fname, char *sfname, linenr_T start, linenr_T en
if (os_fileinfo_hardlinks(&file_info_old) > 1 if (os_fileinfo_hardlinks(&file_info_old) > 1
|| !os_fileinfo_link(fname, &file_info) || !os_fileinfo_link(fname, &file_info)
|| !os_fileinfo_id_equal(&file_info, &file_info_old)) { || !os_fileinfo_id_equal(&file_info, &file_info_old)) {
backup_copy = TRUE; backup_copy = true;
} else { } else {
/* /*
* Check if we can create a file and set the owner/group to * Check if we can create a file and set the owner/group to
@ -2689,7 +2688,7 @@ int buf_write(buf_T *buf, char *fname, char *sfname, linenr_T start, linenr_T en
fd = os_open((char *)IObuff, fd = os_open((char *)IObuff,
O_CREAT|O_WRONLY|O_EXCL|O_NOFOLLOW, (int)perm); O_CREAT|O_WRONLY|O_EXCL|O_NOFOLLOW, (int)perm);
if (fd < 0) { // can't write in directory if (fd < 0) { // can't write in directory
backup_copy = TRUE; backup_copy = true;
} else { } else {
#ifdef UNIX #ifdef UNIX
os_fchown(fd, (uv_uid_t)file_info_old.stat.st_uid, (uv_gid_t)file_info_old.stat.st_gid); os_fchown(fd, (uv_uid_t)file_info_old.stat.st_uid, (uv_gid_t)file_info_old.stat.st_gid);
@ -2697,7 +2696,7 @@ int buf_write(buf_T *buf, char *fname, char *sfname, linenr_T start, linenr_T en
|| file_info.stat.st_uid != file_info_old.stat.st_uid || file_info.stat.st_uid != file_info_old.stat.st_uid
|| file_info.stat.st_gid != file_info_old.stat.st_gid || file_info.stat.st_gid != file_info_old.stat.st_gid
|| (long)file_info.stat.st_mode != perm) { || (long)file_info.stat.st_mode != perm) {
backup_copy = TRUE; backup_copy = true;
} }
#endif #endif
/* Close the file before removing it, on MS-Windows we /* Close the file before removing it, on MS-Windows we
@ -2719,7 +2718,7 @@ int buf_write(buf_T *buf, char *fname, char *sfname, linenr_T start, linenr_T en
if ((bkc & BKC_BREAKSYMLINK) if ((bkc & BKC_BREAKSYMLINK)
&& file_info_link_ok && file_info_link_ok
&& !os_fileinfo_id_equal(&file_info, &file_info_old)) { && !os_fileinfo_id_equal(&file_info, &file_info_old)) {
backup_copy = FALSE; backup_copy = false;
} }
// Hardlinks. // Hardlinks.
@ -2727,7 +2726,7 @@ int buf_write(buf_T *buf, char *fname, char *sfname, linenr_T start, linenr_T en
&& os_fileinfo_hardlinks(&file_info_old) > 1 && os_fileinfo_hardlinks(&file_info_old) > 1
&& (!file_info_link_ok && (!file_info_link_ok
|| os_fileinfo_id_equal(&file_info, &file_info_old))) { || os_fileinfo_id_equal(&file_info, &file_info_old))) {
backup_copy = FALSE; backup_copy = false;
} }
#endif #endif
} }
@ -2789,7 +2788,7 @@ int buf_write(buf_T *buf, char *fname, char *sfname, linenr_T start, linenr_T en
rootname = (char *)get_file_in_dir((char_u *)fname, IObuff); rootname = (char *)get_file_in_dir((char_u *)fname, IObuff);
if (rootname == NULL) { if (rootname == NULL) {
some_error = TRUE; // out of memory some_error = true; // out of memory
goto nobackup; goto nobackup;
} }
@ -2804,7 +2803,7 @@ int buf_write(buf_T *buf, char *fname, char *sfname, linenr_T start, linenr_T en
if (backup == NULL) { if (backup == NULL) {
xfree(rootname); xfree(rootname);
some_error = TRUE; // out of memory some_error = true; // out of memory
goto nobackup; goto nobackup;
} }
@ -2889,7 +2888,7 @@ nobackup:
if (backup == NULL && errmsg == NULL) { if (backup == NULL && errmsg == NULL) {
SET_ERRMSG(_("E509: Cannot create backup file (add ! to override)")); SET_ERRMSG(_("E509: Cannot create backup file (add ! to override)"));
} }
// Ignore errors when forceit is TRUE. // Ignore errors when forceit is true.
if ((some_error || errmsg != NULL) && !forceit) { if ((some_error || errmsg != NULL) && !forceit) {
retval = FAIL; retval = FAIL;
goto fail; goto fail;
@ -3089,8 +3088,8 @@ nobackup:
if (!write_info.bw_conv_buf) { if (!write_info.bw_conv_buf) {
end = 0; end = 0;
} }
write_info.bw_first = TRUE; write_info.bw_first = true;
} else } else {
#endif #endif
/* /*
@ -3106,6 +3105,11 @@ nobackup:
} }
} }
} }
#ifdef HAVE_ICONV
}
#endif
if (converted && wb_flags == 0 if (converted && wb_flags == 0
#ifdef HAVE_ICONV #ifdef HAVE_ICONV
&& write_info.bw_iconv_fd == (iconv_t)-1 && write_info.bw_iconv_fd == (iconv_t)-1
@ -3115,7 +3119,7 @@ nobackup:
SET_ERRMSG(_("E213: Cannot convert (add ! to write without conversion)")); SET_ERRMSG(_("E213: Cannot convert (add ! to write without conversion)"));
goto restore_backup; goto restore_backup;
} }
notconverted = TRUE; notconverted = true;
} }
// If conversion is taking place, we may first pretend to write and check // If conversion is taking place, we may first pretend to write and check
@ -3137,12 +3141,12 @@ nobackup:
} else { } else {
// Open the file "wfname" for writing. // Open the file "wfname" for writing.
// We may try to open the file twice: If we can't write to the file // We may try to open the file twice: If we can't write to the file
// and forceit is TRUE we delete the existing file and try to // and forceit is true we delete the existing file and try to
// create a new one. If this still fails we may have lost the // create a new one. If this still fails we may have lost the
// original file! (this may happen when the user reached his // original file! (this may happen when the user reached his
// quotum for number of files). // quotum for number of files).
// Appending will fail if the file does not exist and forceit is // Appending will fail if the file does not exist and forceit is
// FALSE. // false.
while ((fd = os_open(wfname, while ((fd = os_open(wfname,
O_WRONLY | O_WRONLY |
(append ? (append ?
@ -3366,7 +3370,7 @@ restore_backup:
// been written to disk and we don't lose it. // been written to disk and we don't lose it.
// For a device do try the fsync() but don't complain if it does not work // For a device do try the fsync() but don't complain if it does not work
// (could be a pipe). // (could be a pipe).
// If the 'fsync' option is FALSE, don't fsync(). Useful for laptops. // If the 'fsync' option is false, don't fsync(). Useful for laptops.
int error; int error;
if (p_fs && (error = os_fsync(fd)) != 0 && !device if (p_fs && (error = os_fsync(fd)) != 0 && !device
// fsync not supported on this storage. // fsync not supported on this storage.
@ -3495,32 +3499,32 @@ restore_backup:
c = false; c = false;
if (write_info.bw_conv_error) { if (write_info.bw_conv_error) {
STRCAT(IObuff, _(" CONVERSION ERROR")); STRCAT(IObuff, _(" CONVERSION ERROR"));
c = TRUE; c = true;
if (write_info.bw_conv_error_lnum != 0) { if (write_info.bw_conv_error_lnum != 0) {
vim_snprintf_add((char *)IObuff, IOSIZE, _(" in line %" PRId64 ";"), vim_snprintf_add((char *)IObuff, IOSIZE, _(" in line %" PRId64 ";"),
(int64_t)write_info.bw_conv_error_lnum); (int64_t)write_info.bw_conv_error_lnum);
} }
} else if (notconverted) { } else if (notconverted) {
STRCAT(IObuff, _("[NOT converted]")); STRCAT(IObuff, _("[NOT converted]"));
c = TRUE; c = true;
} else if (converted) { } else if (converted) {
STRCAT(IObuff, _("[converted]")); STRCAT(IObuff, _("[converted]"));
c = TRUE; c = true;
} }
if (device) { if (device) {
STRCAT(IObuff, _("[Device]")); STRCAT(IObuff, _("[Device]"));
c = TRUE; c = true;
} else if (newfile) { } else if (newfile) {
STRCAT(IObuff, new_file_message()); STRCAT(IObuff, new_file_message());
c = true; c = true;
} }
if (no_eol) { if (no_eol) {
msg_add_eol(); msg_add_eol();
c = TRUE; c = true;
} }
// may add [unix/dos/mac] // may add [unix/dos/mac]
if (msg_add_fileformat(fileformat)) { if (msg_add_fileformat(fileformat)) {
c = TRUE; c = true;
} }
msg_add_lines(c, (long)lnum, nchars); // add line/char count msg_add_lines(c, (long)lnum, nchars); // add line/char count
if (!shortmess(SHM_WRITE)) { if (!shortmess(SHM_WRITE)) {
@ -3711,23 +3715,23 @@ nofail:
if (append) { if (append) {
apply_autocmds_exarg(EVENT_FILEAPPENDPOST, fname, fname, apply_autocmds_exarg(EVENT_FILEAPPENDPOST, fname, fname,
FALSE, curbuf, eap); false, curbuf, eap);
} else if (filtering) { } else if (filtering) {
apply_autocmds_exarg(EVENT_FILTERWRITEPOST, NULL, fname, apply_autocmds_exarg(EVENT_FILTERWRITEPOST, NULL, fname,
FALSE, curbuf, eap); false, curbuf, eap);
} else if (reset_changed && whole) { } else if (reset_changed && whole) {
apply_autocmds_exarg(EVENT_BUFWRITEPOST, fname, fname, apply_autocmds_exarg(EVENT_BUFWRITEPOST, fname, fname,
FALSE, curbuf, eap); false, curbuf, eap);
} else { } else {
apply_autocmds_exarg(EVENT_FILEWRITEPOST, fname, fname, apply_autocmds_exarg(EVENT_FILEWRITEPOST, fname, fname,
FALSE, curbuf, eap); false, curbuf, eap);
} }
// restore curwin/curbuf and a few other things // restore curwin/curbuf and a few other things
aucmd_restbuf(&aco); aucmd_restbuf(&aco);
if (aborting()) { // autocmds may abort script processing if (aborting()) { // autocmds may abort script processing
retval = FALSE; retval = false;
} }
} }
@ -3994,7 +3998,7 @@ static int buf_write_bytes(struct bw_info *ip)
} }
if (ucs2bytes(c, &p, flags) && !ip->bw_conv_error) { if (ucs2bytes(c, &p, flags) && !ip->bw_conv_error) {
ip->bw_conv_error = TRUE; ip->bw_conv_error = true;
ip->bw_conv_error_lnum = ip->bw_start_lnum; ip->bw_conv_error_lnum = ip->bw_start_lnum;
} }
if (c == NL) { if (c == NL) {
@ -4049,7 +4053,7 @@ static int buf_write_bytes(struct bw_info *ip)
to = (char *)ip->bw_conv_buf; to = (char *)ip->bw_conv_buf;
tolen = save_len; tolen = save_len;
} }
ip->bw_first = FALSE; ip->bw_first = false;
} }
/* /*
@ -4058,7 +4062,7 @@ static int buf_write_bytes(struct bw_info *ip)
if ((iconv(ip->bw_iconv_fd, (void *)&from, &fromlen, &to, &tolen) if ((iconv(ip->bw_iconv_fd, (void *)&from, &fromlen, &to, &tolen)
== (size_t)-1 && ICONV_ERRNO != ICONV_EINVAL) == (size_t)-1 && ICONV_ERRNO != ICONV_EINVAL)
|| fromlen > CONV_RESTLEN) { || fromlen > CONV_RESTLEN) {
ip->bw_conv_error = TRUE; ip->bw_conv_error = true;
return FAIL; return FAIL;
} }
@ -4163,7 +4167,7 @@ static bool need_conversion(const char_u *fenc)
int fenc_flags; int fenc_flags;
if (*fenc == NUL || STRCMP(p_enc, fenc) == 0) { if (*fenc == NUL || STRCMP(p_enc, fenc) == 0) {
same_encoding = TRUE; same_encoding = true;
fenc_flags = 0; fenc_flags = 0;
} else { } else {
// Ignore difference between "ansi" and "latin1", "ucs-4" and // Ignore difference between "ansi" and "latin1", "ucs-4" and
@ -4296,10 +4300,10 @@ static int make_bom(char_u *buf, char_u *name)
/// Shorten filename of a buffer. /// Shorten filename of a buffer.
/// ///
/// @param force when TRUE: Use full path from now on for files currently being /// @param force when true: Use full path from now on for files currently being
/// edited, both for file name and swap file name. Try to shorten the file /// edited, both for file name and swap file name. Try to shorten the file
/// names a bit, if safe to do so. /// names a bit, if safe to do so.
/// when FALSE: Only try to shorten absolute file names. /// when false: Only try to shorten absolute file names.
/// ///
/// For buffers that have buftype "nofile" or "scratch": never change the file /// For buffers that have buftype "nofile" or "scratch": never change the file
/// name. /// name.
@ -4386,7 +4390,7 @@ char *modname(const char *fname, const char *ext, bool prepend_dot)
} }
add_pathsep(retval); add_pathsep(retval);
fnamelen = strlen(retval); fnamelen = strlen(retval);
prepend_dot = FALSE; // nothing to prepend a dot to prepend_dot = false; // nothing to prepend a dot to
} else { } else {
fnamelen = strlen(fname); fnamelen = strlen(fname);
retval = xmalloc(fnamelen + extlen + 3); retval = xmalloc(fnamelen + extlen + 3);
@ -4769,7 +4773,7 @@ int vim_rename(const char_u *from, const char_u *to)
return 0; return 0;
} }
static int already_warned = FALSE; static int already_warned = false;
/// Check if any not hidden buffer has been changed. /// Check if any not hidden buffer has been changed.
/// Postpone the check if there are characters in the stuff buffer, a global /// Postpone the check if there are characters in the stuff buffer, a global
@ -4778,7 +4782,7 @@ static int already_warned = FALSE;
/// ///
/// @param focus called for GUI focus event /// @param focus called for GUI focus event
/// ///
/// @return TRUE if some message was written (screen should be redrawn and cursor positioned). /// @return true if some message was written (screen should be redrawn and cursor positioned).
int check_timestamps(int focus) int check_timestamps(int focus)
{ {
int didit = 0; int didit = 0;
@ -4786,15 +4790,15 @@ int check_timestamps(int focus)
// Don't check timestamps while system() or another low-level function may // Don't check timestamps while system() or another low-level function may
// cause us to lose and gain focus. // cause us to lose and gain focus.
if (no_check_timestamps > 0) { if (no_check_timestamps > 0) {
return FALSE; return false;
} }
// Avoid doing a check twice. The OK/Reload dialog can cause a focus // Avoid doing a check twice. The OK/Reload dialog can cause a focus
// event and we would keep on checking if the file is steadily growing. // event and we would keep on checking if the file is steadily growing.
// Do check again after typing something. // Do check again after typing something.
if (focus && did_check_timestamps) { if (focus && did_check_timestamps) {
need_check_timestamps = TRUE; need_check_timestamps = true;
return FALSE; return false;
} }
if (!stuff_empty() || global_busy || !typebuf_typed() if (!stuff_empty() || global_busy || !typebuf_typed()
@ -5075,7 +5079,7 @@ int buf_check_timestamp(buf_T *buf)
redraw_cmdline = false; redraw_cmdline = false;
} }
} }
already_warned = TRUE; already_warned = true;
} }
xfree(path); xfree(path);
@ -5606,8 +5610,8 @@ bool match_file_list(char_u *list, char_u *sfname, char_u *ffname)
/// Convert the given pattern "pat" which has shell style wildcards in it, into /// Convert the given pattern "pat" which has shell style wildcards in it, into
/// a regular expression, and return the result in allocated memory. If there /// a regular expression, and return the result in allocated memory. If there
/// is a directory path separator to be matched, then TRUE is put in /// is a directory path separator to be matched, then true is put in
/// allow_dirs, otherwise FALSE is put there -- webb. /// allow_dirs, otherwise false is put there -- webb.
/// Handle backslashes before special characters, like "\*" and "\ ". /// Handle backslashes before special characters, like "\*" and "\ ".
/// ///
/// @param pat_end first char after pattern or NULL /// @param pat_end first char after pattern or NULL
@ -5625,7 +5629,7 @@ char *file_pat_to_reg_pat(const char *pat, const char *pat_end, char *allow_dirs
bool add_dollar = true; bool add_dollar = true;
if (allow_dirs != NULL) { if (allow_dirs != NULL) {
*allow_dirs = FALSE; *allow_dirs = false;
} }
if (pat_end == NULL) { if (pat_end == NULL) {
pat_end = pat + STRLEN(pat); pat_end = pat + STRLEN(pat);
@ -5711,7 +5715,7 @@ char *file_pat_to_reg_pat(const char *pat, const char *pat_end, char *allow_dirs
reg_pat[i++] = '/'; reg_pat[i++] = '/';
reg_pat[i++] = ']'; reg_pat[i++] = ']';
if (allow_dirs != NULL) { if (allow_dirs != NULL) {
*allow_dirs = TRUE; *allow_dirs = true;
} }
break; break;
} }
@ -5745,7 +5749,7 @@ char *file_pat_to_reg_pat(const char *pat, const char *pat_end, char *allow_dirs
&& (!no_bslash || *p != '\\') && (!no_bslash || *p != '\\')
#endif #endif
) { ) {
*allow_dirs = TRUE; *allow_dirs = true;
} }
reg_pat[i++] = '\\'; reg_pat[i++] = '\\';
reg_pat[i++] = *p; reg_pat[i++] = *p;
@ -5758,7 +5762,7 @@ char *file_pat_to_reg_pat(const char *pat, const char *pat_end, char *allow_dirs
reg_pat[i++] = '/'; reg_pat[i++] = '/';
reg_pat[i++] = ']'; reg_pat[i++] = ']';
if (allow_dirs != NULL) { if (allow_dirs != NULL) {
*allow_dirs = TRUE; *allow_dirs = true;
} }
break; break;
#endif #endif

48
src/nvim/getchar.c
View File

@ -81,11 +81,9 @@ static buffheader_T readbuf2 = { { NULL, { NUL } }, NULL, 0, 0 };
static int typeahead_char = 0; // typeahead char that's not flushed static int typeahead_char = 0; // typeahead char that's not flushed
/* // when block_redo is true redo buffer will not be changed
* when block_redo is TRUE redo buffer will not be changed // used by edit() to repeat insertions and 'V' command for redoing
* used by edit() to repeat insertions and 'V' command for redoing static int block_redo = false;
*/
static int block_redo = FALSE;
static int KeyNoremap = 0; // remapping flags static int KeyNoremap = 0; // remapping flags
@ -179,7 +177,7 @@ char_u *get_recorded(void)
char_u *p; char_u *p;
size_t len; size_t len;
p = get_buffcont(&recordbuff, TRUE); p = get_buffcont(&recordbuff, true);
free_buff(&recordbuff); free_buff(&recordbuff);
/* /*
@ -207,7 +205,7 @@ char_u *get_recorded(void)
/// K_SPECIAL in the returned string is escaped. /// K_SPECIAL in the returned string is escaped.
char_u *get_inserted(void) char_u *get_inserted(void)
{ {
return get_buffcont(&redobuff, FALSE); return get_buffcont(&redobuff, false);
} }
/// Add string after the current block of the given buffer /// Add string after the current block of the given buffer
@ -319,7 +317,7 @@ static void add_char_buff(buffheader_T *buf, int c)
/// Get one byte from the read buffers. Use readbuf1 one first, use readbuf2 /// Get one byte from the read buffers. Use readbuf1 one first, use readbuf2
/// if that one is empty. /// if that one is empty.
/// If advance == TRUE go to the next char. /// If advance == true go to the next char.
/// No translation is done K_SPECIAL is escaped. /// No translation is done K_SPECIAL is escaped.
static int read_readbuffers(int advance) static int read_readbuffers(int advance)
{ {
@ -368,19 +366,15 @@ static void start_stuff(void)
} }
} }
/* /// Return true if the stuff buffer is empty.
* Return TRUE if the stuff buffer is empty.
*/
int stuff_empty(void) int stuff_empty(void)
FUNC_ATTR_PURE FUNC_ATTR_PURE
{ {
return (readbuf1.bh_first.b_next == NULL && readbuf2.bh_first.b_next == NULL); return (readbuf1.bh_first.b_next == NULL && readbuf2.bh_first.b_next == NULL);
} }
/* /// Return true if readbuf1 is empty. There may still be redo characters in
* Return TRUE if readbuf1 is empty. There may still be redo characters in /// redbuf2.
* redbuf2.
*/
int readbuf1_empty(void) int readbuf1_empty(void)
FUNC_ATTR_PURE FUNC_ATTR_PURE
{ {
@ -793,7 +787,7 @@ int start_redo_ins(void)
void stop_redo_ins(void) void stop_redo_ins(void)
{ {
block_redo = FALSE; block_redo = false;
} }
/* /*
@ -970,7 +964,7 @@ int ins_char_typebuf(int c, int modifiers)
return (int)len; return (int)len;
} }
/// Return TRUE if the typeahead buffer was changed (while waiting for a /// Return true if the typeahead buffer was changed (while waiting for a
/// character to arrive). Happens when a message was received from a client or /// character to arrive). Happens when a message was received from a client or
/// from feedkeys(). /// from feedkeys().
/// But check in a more generic way to avoid trouble: When "typebuf.tb_buf" /// But check in a more generic way to avoid trouble: When "typebuf.tb_buf"
@ -986,10 +980,8 @@ bool typebuf_changed(int tb_change_cnt)
|| typebuf_was_filled); || typebuf_was_filled);
} }
/* /// Return true if there are no characters in the typeahead buffer that have
* Return TRUE if there are no characters in the typeahead buffer that have /// not been typed (result from a mapping or come from ":normal").
* not been typed (result from a mapping or come from ":normal").
*/
int typebuf_typed(void) int typebuf_typed(void)
FUNC_ATTR_PURE FUNC_ATTR_PURE
{ {
@ -1353,9 +1345,7 @@ void close_all_scripts(void)
#endif #endif
/* /// Return true when reading keys from a script file.
* Return TRUE when reading keys from a script file.
*/
int using_script(void) int using_script(void)
FUNC_ATTR_PURE FUNC_ATTR_PURE
{ {
@ -1686,7 +1676,7 @@ int vpeekc_any(void)
/* /*
* Call vpeekc() without causing anything to be mapped. * Call vpeekc() without causing anything to be mapped.
* Return TRUE if a character is available, FALSE otherwise. * Return true if a character is available, false otherwise.
*/ */
int char_avail(void) int char_avail(void)
{ {
@ -2363,8 +2353,8 @@ void check_end_reg_executing(bool advance)
/// ///
/// if "advance" is true (vgetc()): /// if "advance" is true (vgetc()):
/// Really get the character. /// Really get the character.
/// KeyTyped is set to TRUE in the case the user typed the key. /// KeyTyped is set to true in the case the user typed the key.
/// KeyStuffed is TRUE if the character comes from the stuff buffer. /// KeyStuffed is true if the character comes from the stuff buffer.
/// if "advance" is false (vpeekc()): /// if "advance" is false (vpeekc()):
/// Just look whether there is a character available. /// Just look whether there is a character available.
/// Return NUL if not. /// Return NUL if not.
@ -2451,7 +2441,7 @@ static int vgetorpeek(bool advance)
// flush all input // flush all input
c = inchar(typebuf.tb_buf, typebuf.tb_buflen - 1, 0L); c = inchar(typebuf.tb_buf, typebuf.tb_buflen - 1, 0L);
// If inchar() returns TRUE (script file was active) or we // If inchar() returns true (script file was active) or we
// are inside a mapping, get out of Insert mode. // are inside a mapping, get out of Insert mode.
// Otherwise we behave like having gotten a CTRL-C. // Otherwise we behave like having gotten a CTRL-C.
// As a result typing CTRL-C in insert mode will // As a result typing CTRL-C in insert mode will
@ -2865,7 +2855,7 @@ int inchar(char_u *buf, int maxlen, long wait_time)
if (read_size <= 0) { // Did not get a character from script. if (read_size <= 0) { // Did not get a character from script.
// If we got an interrupt, skip all previously typed characters and // If we got an interrupt, skip all previously typed characters and
// return TRUE if quit reading script file. // return true if quit reading script file.
// Stop reading typeahead when a single CTRL-C was read, // Stop reading typeahead when a single CTRL-C was read,
// fill_input_buf() returns this when not able to read from stdin. // fill_input_buf() returns this when not able to read from stdin.
// Don't use buf[] here, closescript() may have freed typebuf.tb_buf[] // Don't use buf[] here, closescript() may have freed typebuf.tb_buf[]

6
src/nvim/grid.c
View File

@ -475,9 +475,9 @@ static int grid_char_needs_redraw(ScreenGrid *grid, size_t off_from, size_t off_
/// "endcol" gives the columns where valid characters are. /// "endcol" gives the columns where valid characters are.
/// "clear_width" is the width of the window. It's > 0 if the rest of the line /// "clear_width" is the width of the window. It's > 0 if the rest of the line
/// needs to be cleared, negative otherwise. /// needs to be cleared, negative otherwise.
/// "rlflag" is TRUE in a rightleft window: /// "rlflag" is true in a rightleft window:
/// When TRUE and "clear_width" > 0, clear columns 0 to "endcol" /// When true and "clear_width" > 0, clear columns 0 to "endcol"
/// When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" /// When false and "clear_width" > 0, clear columns "endcol" to "clear_width"
/// If "wrap" is true, then hint to the UI that "row" contains a line /// If "wrap" is true, then hint to the UI that "row" contains a line
/// which has wrapped into the next row. /// which has wrapped into the next row.
void grid_put_linebuf(ScreenGrid *grid, int row, int coloff, int endcol, int clear_width, void grid_put_linebuf(ScreenGrid *grid, int row, int coloff, int endcol, int clear_width,

95
src/nvim/hardcopy.c
View File

@ -51,20 +51,20 @@
* *
* int mch_print_begin(prt_settings_T *settings) * int mch_print_begin(prt_settings_T *settings)
* Called to start the print job. * Called to start the print job.
* Return FALSE to abort. * Return false to abort.
* *
* int mch_print_begin_page(char_u *msg) * int mch_print_begin_page(char_u *msg)
* Called at the start of each page. * Called at the start of each page.
* "msg" indicates the progress of the print job, can be NULL. * "msg" indicates the progress of the print job, can be NULL.
* Return FALSE to abort. * Return false to abort.
* *
* int mch_print_end_page() * int mch_print_end_page()
* Called at the end of each page. * Called at the end of each page.
* Return FALSE to abort. * Return false to abort.
* *
* int mch_print_blank_page() * int mch_print_blank_page()
* Called to generate a blank page for collated, duplex, multiple copy * Called to generate a blank page for collated, duplex, multiple copy
* document. Return FALSE to abort. * document. Return false to abort.
* *
* void mch_print_end(prt_settings_T *psettings) * void mch_print_end(prt_settings_T *psettings)
* Called at normal end of print job. * Called at normal end of print job.
@ -87,36 +87,33 @@
* *
* mch_print_start_line(int margin, int page_line) * mch_print_start_line(int margin, int page_line)
* Sets the current position at the start of line "page_line". * Sets the current position at the start of line "page_line".
* If margin is TRUE start in the left margin (for header and line number). * If margin is true start in the left margin (for header and line number).
* *
* int mch_print_text_out(char_u *p, size_t len); * int mch_print_text_out(char_u *p, size_t len);
* Output one character of text p[len] at the current position. * Output one character of text p[len] at the current position.
* Return TRUE if there is no room for another character in the same line. * Return true if there is no room for another character in the same line.
* *
* Note that the generic code has no idea of margins. The machine code should * Note that the generic code has no idea of margins. The machine code should
* simply make the page look smaller! The header and the line numbers are * simply make the page look smaller! The header and the line numbers are
* printed in the margin. * printed in the margin.
*/ */
static option_table_T printer_opts[OPT_PRINT_NUM_OPTIONS] static option_table_T printer_opts[OPT_PRINT_NUM_OPTIONS] = {
= { "top", true, 0, NULL, 0, false },
{ { "bottom", true, 0, NULL, 0, false },
{ "top", TRUE, 0, NULL, 0, FALSE }, { "left", true, 0, NULL, 0, false },
{ "bottom", TRUE, 0, NULL, 0, FALSE }, { "right", true, 0, NULL, 0, false },
{ "left", TRUE, 0, NULL, 0, FALSE }, { "header", true, 0, NULL, 0, false },
{ "right", TRUE, 0, NULL, 0, FALSE }, { "syntax", false, 0, NULL, 0, false },
{ "header", TRUE, 0, NULL, 0, FALSE }, { "number", false, 0, NULL, 0, false },
{ "syntax", FALSE, 0, NULL, 0, FALSE }, { "wrap", false, 0, NULL, 0, false },
{ "number", FALSE, 0, NULL, 0, FALSE }, { "duplex", false, 0, NULL, 0, false },
{ "wrap", FALSE, 0, NULL, 0, FALSE }, { "portrait", false, 0, NULL, 0, false },
{ "duplex", FALSE, 0, NULL, 0, FALSE }, { "paper", false, 0, NULL, 0, false },
{ "portrait", FALSE, 0, NULL, 0, FALSE }, { "collate", false, 0, NULL, 0, false },
{ "paper", FALSE, 0, NULL, 0, FALSE }, { "jobsplit", false, 0, NULL, 0, false },
{ "collate", FALSE, 0, NULL, 0, FALSE }, { "formfeed", false, 0, NULL, 0, false },
{ "jobsplit", FALSE, 0, NULL, 0, FALSE }, };
{ "formfeed", FALSE, 0, NULL, 0, FALSE },
}
;
static const uint32_t cterm_color_8[8] = { static const uint32_t cterm_color_8[8] = {
0x000000, 0xff0000, 0x00ff00, 0xffff00, 0x000000, 0xff0000, 0x00ff00, 0xffff00,
@ -152,12 +149,12 @@ static int page_count;
static option_table_T mbfont_opts[OPT_MBFONT_NUM_OPTIONS] = static option_table_T mbfont_opts[OPT_MBFONT_NUM_OPTIONS] =
{ {
{ "c", FALSE, 0, NULL, 0, FALSE }, { "c", false, 0, NULL, 0, false },
{ "a", FALSE, 0, NULL, 0, FALSE }, { "a", false, 0, NULL, 0, false },
{ "r", FALSE, 0, NULL, 0, FALSE }, { "r", false, 0, NULL, 0, false },
{ "b", FALSE, 0, NULL, 0, FALSE }, { "b", false, 0, NULL, 0, false },
{ "i", FALSE, 0, NULL, 0, FALSE }, { "i", false, 0, NULL, 0, false },
{ "o", FALSE, 0, NULL, 0, FALSE }, { "o", false, 0, NULL, 0, false },
}; };
/* /*
@ -506,9 +503,7 @@ int prt_header_height(void)
return 2; return 2;
} }
/* // Return true if using a line number for printing.
* Return TRUE if using a line number for printing.
*/
int prt_use_number(void) int prt_use_number(void)
{ {
return printer_opts[OPT_PRINT_NUMBER].present return printer_opts[OPT_PRINT_NUMBER].present
@ -552,7 +547,7 @@ static void prt_header(prt_settings_T *const psettings, const int pagenum, const
if (*p_header != NUL) { if (*p_header != NUL) {
linenr_T tmp_lnum, tmp_topline, tmp_botline; linenr_T tmp_lnum, tmp_topline, tmp_botline;
int use_sandbox = FALSE; int use_sandbox = false;
/* /*
* Need to (temporarily) set current line number and first/last line * Need to (temporarily) set current line number and first/last line
@ -669,7 +664,7 @@ void ex_hardcopy(exarg_T *eap)
settings.modec = 'c'; settings.modec = 'c';
if (!syntax_present(curwin)) { if (!syntax_present(curwin)) {
settings.do_syntax = FALSE; settings.do_syntax = false;
} else if (printer_opts[OPT_PRINT_SYNTAX].present } else if (printer_opts[OPT_PRINT_SYNTAX].present
&& TOLOWER_ASC(printer_opts[OPT_PRINT_SYNTAX].string[0]) != 'a') { && TOLOWER_ASC(printer_opts[OPT_PRINT_SYNTAX].string[0]) != 'a') {
settings.do_syntax = settings.do_syntax =
@ -866,7 +861,7 @@ static colnr_T hardcopy_line(prt_settings_T *psettings, int page_line, prt_pos_T
{ {
colnr_T col; colnr_T col;
char_u *line; char_u *line;
int need_break = FALSE; int need_break = false;
int outputlen; int outputlen;
int tab_spaces; int tab_spaces;
int print_pos; int print_pos;
@ -879,7 +874,7 @@ static colnr_T hardcopy_line(prt_settings_T *psettings, int page_line, prt_pos_T
if (!ppos->ff && prt_use_number()) { if (!ppos->ff && prt_use_number()) {
prt_line_number(psettings, page_line, ppos->file_line); prt_line_number(psettings, page_line, ppos->file_line);
} }
ppos->ff = FALSE; ppos->ff = false;
} else { } else {
// left over from wrap halfway through a tab // left over from wrap halfway through a tab
print_pos = ppos->print_pos; print_pos = ppos->print_pos;
@ -942,7 +937,7 @@ static colnr_T hardcopy_line(prt_settings_T *psettings, int page_line, prt_pos_T
&& printer_opts[OPT_PRINT_FORMFEED].present && printer_opts[OPT_PRINT_FORMFEED].present
&& TOLOWER_ASC(printer_opts[OPT_PRINT_FORMFEED].string[0]) && TOLOWER_ASC(printer_opts[OPT_PRINT_FORMFEED].string[0])
== 'y') { == 'y') {
ppos->ff = TRUE; ppos->ff = true;
need_break = 1; need_break = 1;
} else { } else {
need_break = mch_print_text_out(line + col, (size_t)outputlen); need_break = mch_print_text_out(line + col, (size_t)outputlen);
@ -1984,7 +1979,7 @@ void mch_print_cleanup(void)
if (prt_do_conv) { if (prt_do_conv) {
convert_setup(&prt_conv, NULL, NULL); convert_setup(&prt_conv, NULL, NULL);
prt_do_conv = FALSE; prt_do_conv = false;
} }
if (prt_ps_fd != NULL) { if (prt_ps_fd != NULL) {
fclose(prt_ps_fd); fclose(prt_ps_fd);
@ -2116,11 +2111,11 @@ static int prt_match_encoding(char *p_encoding, struct prt_ps_mbfont_S *p_cmap,
for (mbenc = 0; mbenc < p_cmap->num_encodings; mbenc++) { for (mbenc = 0; mbenc < p_cmap->num_encodings; mbenc++) {
if (STRNICMP(p_mbenc->encoding, p_encoding, enc_len) == 0) { if (STRNICMP(p_mbenc->encoding, p_encoding, enc_len) == 0) {
*pp_mbenc = p_mbenc; *pp_mbenc = p_mbenc;
return TRUE; return true;
} }
p_mbenc++; p_mbenc++;
} }
return FALSE; return false;
} }
static int prt_match_charset(char *p_charset, struct prt_ps_mbfont_S *p_cmap, static int prt_match_charset(char *p_charset, struct prt_ps_mbfont_S *p_cmap,
@ -2139,11 +2134,11 @@ static int prt_match_charset(char *p_charset, struct prt_ps_mbfont_S *p_cmap,
for (mbchar = 0; mbchar < p_cmap->num_charsets; mbchar++) { for (mbchar = 0; mbchar < p_cmap->num_charsets; mbchar++) {
if (STRNICMP(p_mbchar->charset, p_charset, char_len) == 0) { if (STRNICMP(p_mbchar->charset, p_charset, char_len) == 0) {
*pp_mbchar = p_mbchar; *pp_mbchar = p_mbchar;
return TRUE; return true;
} }
p_mbchar++; p_mbchar++;
} }
return FALSE; return false;
} }
int mch_print_init(prt_settings_T *psettings, char_u *jobname, int forceit) int mch_print_init(prt_settings_T *psettings, char_u *jobname, int forceit)
@ -2277,7 +2272,7 @@ int mch_print_init(prt_settings_T *psettings, char_u *jobname, int forceit)
prt_ps_font = &prt_ps_mb_font; prt_ps_font = &prt_ps_mb_font;
} else { } else {
prt_use_courier = FALSE; prt_use_courier = false;
prt_ps_font = &prt_ps_courier_font; prt_ps_font = &prt_ps_courier_font;
} }
@ -2379,16 +2374,16 @@ int mch_print_init(prt_settings_T *psettings, char_u *jobname, int forceit)
* Set up printer duplex and tumble based on Duplex option setting - default * Set up printer duplex and tumble based on Duplex option setting - default
* is long sided duplex printing (i.e. no tumble). * is long sided duplex printing (i.e. no tumble).
*/ */
prt_duplex = TRUE; prt_duplex = true;
prt_tumble = FALSE; prt_tumble = false;
psettings->duplex = 1; psettings->duplex = 1;
if (printer_opts[OPT_PRINT_DUPLEX].present) { if (printer_opts[OPT_PRINT_DUPLEX].present) {
if (STRNICMP(printer_opts[OPT_PRINT_DUPLEX].string, "off", 3) == 0) { if (STRNICMP(printer_opts[OPT_PRINT_DUPLEX].string, "off", 3) == 0) {
prt_duplex = FALSE; prt_duplex = false;
psettings->duplex = 0; psettings->duplex = 0;
} else if (STRNICMP(printer_opts[OPT_PRINT_DUPLEX].string, "short", 5) } else if (STRNICMP(printer_opts[OPT_PRINT_DUPLEX].string, "short", 5)
== 0) { == 0) {
prt_tumble = TRUE; prt_tumble = true;
} }
} }
@ -2941,7 +2936,7 @@ int mch_print_begin_page(char_u *str)
int mch_print_blank_page(void) int mch_print_blank_page(void)
{ {
return mch_print_begin_page(NULL) ? (mch_print_end_page()) : FALSE; return mch_print_begin_page(NULL) ? (mch_print_end_page()) : false;
} }
static double prt_pos_x = 0; static double prt_pos_x = 0;

6
src/nvim/highlight_group.c
View File

@ -640,7 +640,7 @@ static int color_numbers_8[28] = { 0, 4, 2, 6,
// Lookup the "cterm" value to be used for color with index "idx" in // Lookup the "cterm" value to be used for color with index "idx" in
// color_names[]. // color_names[].
// "boldp" will be set to TRUE or FALSE for a foreground color when using 8 // "boldp" will be set to kTrue or kFalse for a foreground color when using 8
// colors, otherwise it will be unchanged. // colors, otherwise it will be unchanged.
int lookup_color(const int idx, const bool foreground, TriState *const boldp) int lookup_color(const int idx, const bool foreground, TriState *const boldp)
{ {
@ -1321,7 +1321,7 @@ void restore_cterm_colors(void)
/// @param check_link if true also check for an existing link. /// @param check_link if true also check for an existing link.
/// ///
/// @return TRUE if highlight group "idx" has any settings. /// @return true if highlight group "idx" has any settings.
static int hl_has_settings(int idx, bool check_link) static int hl_has_settings(int idx, bool check_link)
{ {
return hl_table[idx].sg_cleared == 0 return hl_table[idx].sg_cleared == 0
@ -1701,7 +1701,7 @@ int syn_name2attr(const char_u *name)
return 0; return 0;
} }
/// Return TRUE if highlight group "name" exists. /// Return true if highlight group "name" exists.
int highlight_exists(const char *name) int highlight_exists(const char *name)
{ {
return syn_name2id(name) > 0; return syn_name2id(name) > 0;

20
src/nvim/if_cscope.c
View File

@ -203,19 +203,19 @@ static void do_cscope_general(exarg_T *eap, int make_split)
/// Implementation of ":cscope" and ":lcscope" /// Implementation of ":cscope" and ":lcscope"
void ex_cscope(exarg_T *eap) void ex_cscope(exarg_T *eap)
{ {
do_cscope_general(eap, FALSE); do_cscope_general(eap, false);
} }
/// Implementation of ":scscope". Same as ex_cscope(), but splits window, too. /// Implementation of ":scscope". Same as ex_cscope(), but splits window, too.
void ex_scscope(exarg_T *eap) void ex_scscope(exarg_T *eap)
{ {
do_cscope_general(eap, TRUE); do_cscope_general(eap, true);
} }
/// Implementation of ":cstag" /// Implementation of ":cstag"
void ex_cstag(exarg_T *eap) void ex_cstag(exarg_T *eap)
{ {
int ret = FALSE; int ret = false;
if (*eap->arg == NUL) { if (*eap->arg == NUL) {
(void)emsg(_("E562: Usage: cstag <ident>")); (void)emsg(_("E562: Usage: cstag <ident>"));
@ -278,7 +278,7 @@ void ex_cstag(exarg_T *eap)
/// This simulates a vim_fgets(), but for cscope, returns the next line /// This simulates a vim_fgets(), but for cscope, returns the next line
/// from the cscope output. should only be called from find_tags() /// from the cscope output. should only be called from find_tags()
/// ///
/// @return true if eof, FALSE otherwise /// @return true if eof, false otherwise
bool cs_fgets(char_u *buf, int size) bool cs_fgets(char_u *buf, int size)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {
@ -839,7 +839,7 @@ err_closing:
si.hStdOutput = stdout_wr; si.hStdOutput = stdout_wr;
si.hStdError = stdout_wr; si.hStdError = stdout_wr;
si.hStdInput = stdin_rd; si.hStdInput = stdin_rd;
created = CreateProcess(NULL, cmd, NULL, NULL, TRUE, CREATE_NEW_CONSOLE, created = CreateProcess(NULL, cmd, NULL, NULL, true, CREATE_NEW_CONSOLE,
NULL, NULL, &si, &pi); NULL, NULL, &si, &pi);
xfree(prog); xfree(prog);
xfree(cmd); xfree(cmd);
@ -875,7 +875,7 @@ err_closing:
/// Query cscope using command line interface. Parse the output and use tselect /// Query cscope using command line interface. Parse the output and use tselect
/// to allow choices. Like Nvi, creates a pipe to send to/from query/cscope. /// to allow choices. Like Nvi, creates a pipe to send to/from query/cscope.
/// ///
/// @return TRUE if we jump to a tag or abort, FALSE if not. /// @return true if we jump to a tag or abort, false if not.
static int cs_find(exarg_T *eap) static int cs_find(exarg_T *eap)
{ {
char *opt, *pat; char *opt, *pat;
@ -1106,7 +1106,7 @@ static int cs_help(exarg_T *eap)
cmdp++; cmdp++;
} }
wait_return(TRUE); wait_return(true);
return CSCOPE_SUCCESS; return CSCOPE_SUCCESS;
} }
@ -1280,7 +1280,7 @@ static void cs_kill_execute(size_t i, char *cname)
(void)smsg_attr(HL_ATTR(HLF_R) | MSG_HIST, (void)smsg_attr(HL_ATTR(HLF_R) | MSG_HIST,
_("cscope connection %s closed"), cname); _("cscope connection %s closed"), cname);
} }
cs_release_csp(i, TRUE); cs_release_csp(i, true);
} }
/// Convert the cscope output into a ctags style entry (as might be found /// Convert the cscope output into a ctags style entry (as might be found
@ -1932,7 +1932,7 @@ static int cs_reset(exarg_T *eap)
pplist[i] = csinfo[i].ppath; pplist[i] = csinfo[i].ppath;
fllist[i] = csinfo[i].flags; fllist[i] = csinfo[i].flags;
if (csinfo[i].fname != NULL) { if (csinfo[i].fname != NULL) {
cs_release_csp(i, FALSE); cs_release_csp(i, false);
} }
} }
@ -2035,7 +2035,7 @@ static int cs_show(exarg_T *eap)
} }
} }
wait_return(TRUE); wait_return(true);
return CSCOPE_SUCCESS; return CSCOPE_SUCCESS;
} }

80
src/nvim/indent_c.c
View File

@ -275,10 +275,8 @@ static const char_u *cin_skipcomment(const char_u *s)
return s; return s;
} }
/* /// Return true if there is no code at *s. White space and comments are
* Return TRUE if there is no code at *s. White space and comments are /// not considered code.
* not considered code.
*/
static int cin_nocode(const char_u *s) static int cin_nocode(const char_u *s)
{ {
return *cin_skipcomment(s) == NUL; return *cin_skipcomment(s) == NUL;
@ -403,7 +401,7 @@ bool cin_islabel(void) // XXX
} }
curwin->w_cursor = cursor_save; curwin->w_cursor = cursor_save;
if (cin_isterminated(line, TRUE, FALSE) if (cin_isterminated(line, true, false)
|| cin_isscopedecl(line) || cin_isscopedecl(line)
|| cin_iscase(line, true) || cin_iscase(line, true)
|| (cin_islabel_skip(&line) && cin_nocode(line))) { || (cin_islabel_skip(&line) && cin_nocode(line))) {
@ -455,7 +453,7 @@ static int cin_isinit(void)
return true; return true;
} }
return FALSE; return false;
} }
/// Recognize a switch label: "case .*:" or "default:". /// Recognize a switch label: "case .*:" or "default:".
@ -769,10 +767,10 @@ static int cin_ispreproc(const char_u *s)
if (*skipwhite((char *)s) == '#') { if (*skipwhite((char *)s) == '#') {
return true; return true;
} }
return FALSE; return false;
} }
/// Return TRUE if line "*pp" at "*lnump" is a preprocessor statement or a /// Return true if line "*pp" at "*lnump" is a preprocessor statement or a
/// continuation line of a preprocessor statement. Decrease "*lnump" to the /// continuation line of a preprocessor statement. Decrease "*lnump" to the
/// start and return the line in "*pp". /// start and return the line in "*pp".
/// Put the amount of indent in "*amount". /// Put the amount of indent in "*amount".
@ -789,7 +787,7 @@ static int cin_ispreproc_cont(const char_u **pp, linenr_T *lnump, int *amount)
for (;;) { for (;;) {
if (cin_ispreproc(line)) { if (cin_ispreproc(line)) {
retval = TRUE; retval = true;
*lnump = lnum; *lnump = lnum;
break; break;
} }
@ -842,7 +840,7 @@ static char_u cin_isterminated(const char_u *s, int incl_open, int incl_comma)
{ {
char_u found_start = 0; char_u found_start = 0;
unsigned n_open = 0; unsigned n_open = 0;
int is_else = FALSE; int is_else = false;
s = cin_skipcomment(s); s = cin_skipcomment(s);
@ -1095,14 +1093,12 @@ probablyFound:
return 0; return 0;
} }
/* /// Return true if we are at the end of a do-while.
* Return TRUE if we are at the end of a do-while. /// do
* do /// nothing;
* nothing; /// while (foo
* while (foo /// && bar); <-- here
* && bar); <-- here /// Adjust the cursor to the line with "while".
* Adjust the cursor to the line with "while".
*/
static int cin_iswhileofdo_end(int terminated) static int cin_iswhileofdo_end(int terminated)
{ {
const char_u *line; const char_u *line;
@ -1133,7 +1129,7 @@ static int cin_iswhileofdo_end(int terminated)
} }
if (cin_starts_with(s, "while")) { if (cin_starts_with(s, "while")) {
curwin->w_cursor.lnum = trypos->lnum; curwin->w_cursor.lnum = trypos->lnum;
return TRUE; return true;
} }
} }
@ -1146,7 +1142,7 @@ static int cin_iswhileofdo_end(int terminated)
p++; p++;
} }
} }
return FALSE; return false;
} }
static int cin_isbreak(const char_u *p) static int cin_isbreak(const char_u *p)
@ -1190,7 +1186,7 @@ static int cin_is_cpp_baseclass(cpp_baseclass_cache_T *cached)
return false; return false;
} }
cpp_base_class = lookfor_ctor_init = class_or_struct = FALSE; cpp_base_class = lookfor_ctor_init = class_or_struct = false;
/* Search for a line starting with '#', empty, ending in ';' or containing /* Search for a line starting with '#', empty, ending in ';' or containing
* '{' or '}' and start below it. This handles the following situations: * '{' or '}' and start below it. This handles the following situations:
@ -1256,7 +1252,7 @@ static int cin_is_cpp_baseclass(cpp_baseclass_cache_T *cached)
if (s[1] == ':') { if (s[1] == ':') {
/* skip double colon. It can't be a constructor /* skip double colon. It can't be a constructor
* initialization any more */ * initialization any more */
lookfor_ctor_init = FALSE; lookfor_ctor_init = false;
s = cin_skipcomment(s + 2); s = cin_skipcomment(s + 2);
} else if (lookfor_ctor_init || class_or_struct) { } else if (lookfor_ctor_init || class_or_struct) {
/* we have something found, that looks like the start of /* we have something found, that looks like the start of
@ -1270,8 +1266,8 @@ static int cin_is_cpp_baseclass(cpp_baseclass_cache_T *cached)
} }
} else if ((STRNCMP(s, "class", 5) == 0 && !vim_isIDc(s[5])) } else if ((STRNCMP(s, "class", 5) == 0 && !vim_isIDc(s[5]))
|| (STRNCMP(s, "struct", 6) == 0 && !vim_isIDc(s[6]))) { || (STRNCMP(s, "struct", 6) == 0 && !vim_isIDc(s[6]))) {
class_or_struct = TRUE; class_or_struct = true;
lookfor_ctor_init = FALSE; lookfor_ctor_init = false;
if (*s == 'c') { if (*s == 'c') {
s = cin_skipcomment(s + 5); s = cin_skipcomment(s + 5);
@ -1280,12 +1276,12 @@ static int cin_is_cpp_baseclass(cpp_baseclass_cache_T *cached)
} }
} else { } else {
if (s[0] == '{' || s[0] == '}' || s[0] == ';') { if (s[0] == '{' || s[0] == '}' || s[0] == ';') {
cpp_base_class = lookfor_ctor_init = class_or_struct = FALSE; cpp_base_class = lookfor_ctor_init = class_or_struct = false;
} else if (s[0] == ')') { } else if (s[0] == ')') {
/* Constructor-initialization is assumed if we come across /* Constructor-initialization is assumed if we come across
* something like "):" */ * something like "):" */
class_or_struct = FALSE; class_or_struct = false;
lookfor_ctor_init = TRUE; lookfor_ctor_init = true;
} else if (s[0] == '?') { } else if (s[0] == '?') {
// Avoid seeing '() :' after '?' as constructor init. // Avoid seeing '() :' after '?' as constructor init.
return false; return false;
@ -1345,11 +1341,9 @@ static int get_baseclass_amount(int col)
return amount; return amount;
} }
/* /// Return true if string "s" ends with the string "find", possibly followed by
* Return TRUE if string "s" ends with the string "find", possibly followed by /// white space and comments. Skip strings and comments.
* white space and comments. Skip strings and comments. /// Ignore "ignore" after "find" if it's not NULL.
* Ignore "ignore" after "find" if it's not NULL.
*/
static int cin_ends_in(const char_u *s, const char_u *find, const char_u *ignore) static int cin_ends_in(const char_u *s, const char_u *find, const char_u *ignore)
{ {
const char_u *p = s; const char_u *p = s;
@ -1371,12 +1365,10 @@ static int cin_ends_in(const char_u *s, const char_u *find, const char_u *ignore
p++; p++;
} }
} }
return FALSE; return false;
} }
/* /// Return true when "s" starts with "word" and then a non-ID character.
* Return TRUE when "s" starts with "word" and then a non-ID character.
*/
static int cin_starts_with(const char_u *s, const char *word) static int cin_starts_with(const char_u *s, const char *word)
{ {
int l = (int)STRLEN(word); int l = (int)STRLEN(word);
@ -1573,7 +1565,7 @@ static int corr_ind_maxparen(pos_T *startpos)
static int find_last_paren(const char_u *l, int start, int end) static int find_last_paren(const char_u *l, int start, int end)
{ {
int i; int i;
int retval = FALSE; int retval = false;
int open_count = 0; int open_count = 0;
curwin->w_cursor.col = 0; // default is start of line curwin->w_cursor.col = 0; // default is start of line
@ -1588,7 +1580,7 @@ static int find_last_paren(const char_u *l, int start, int end)
open_count--; open_count--;
} else { } else {
curwin->w_cursor.col = i; curwin->w_cursor.col = i;
retval = TRUE; retval = true;
} }
} }
} }
@ -2055,7 +2047,7 @@ int get_c_indent(void)
char *p; char *p;
int start_align = 0; int start_align = 0;
int start_off = 0; int start_off = 0;
int done = FALSE; int done = false;
// find how indented the line beginning the comment is // find how indented the line beginning the comment is
getvcol(curwin, comment_pos, &col, NULL, NULL); getvcol(curwin, comment_pos, &col, NULL, NULL);
@ -2098,7 +2090,7 @@ int get_c_indent(void)
* up with the comment opener per the 'comments' option. */ * up with the comment opener per the 'comments' option. */
if (STRNCMP(theline, lead_middle, lead_middle_len) == 0 if (STRNCMP(theline, lead_middle, lead_middle_len) == 0
&& STRNCMP(theline, lead_end, STRLEN(lead_end)) != 0) { && STRNCMP(theline, lead_end, STRLEN(lead_end)) != 0) {
done = TRUE; done = true;
if (curwin->w_cursor.lnum > 1) { if (curwin->w_cursor.lnum > 1) {
/* If the start comment string matches in the previous /* If the start comment string matches in the previous
* line, use the indent of that line plus offset. If * line, use the indent of that line plus offset. If
@ -2562,7 +2554,7 @@ int get_c_indent(void)
} }
} }
lookfor_break = FALSE; lookfor_break = false;
if (cin_iscase(theline, false)) { // it's a switch() label if (cin_iscase(theline, false)) { // it's a switch() label
lookfor = LOOKFOR_CASE; // find a previous switch() label lookfor = LOOKFOR_CASE; // find a previous switch() label
@ -2646,7 +2638,7 @@ int get_c_indent(void)
continue; continue;
} }
terminated = cin_isterminated(l, FALSE, TRUE); terminated = cin_isterminated(l, false, true);
/* /*
* If we are at top level and the line looks like a * If we are at top level and the line looks like a
@ -2660,7 +2652,7 @@ int get_c_indent(void)
* don't add extra indent. * don't add extra indent.
* TODO: does not work, if a function * TODO: does not work, if a function
* declaration is split over multiple lines: * declaration is split over multiple lines:
* cin_isfuncdecl returns FALSE then. * cin_isfuncdecl returns false then.
*/ */
if (terminated == ',') { if (terminated == ',') {
break; break;
@ -2971,7 +2963,7 @@ int get_c_indent(void)
* initialisation (not indented) or a variable declaration * initialisation (not indented) or a variable declaration
* (indented). * (indented).
*/ */
terminated = cin_isterminated(l, FALSE, TRUE); terminated = cin_isterminated(l, false, true);
if (js_cur_has_key) { if (js_cur_has_key) {
js_cur_has_key = false; // only check the first line js_cur_has_key = false; // only check the first line

2
src/nvim/macros.h
View File

@ -31,7 +31,7 @@
/// @return `s, sizeof(s) - 1` /// @return `s, sizeof(s) - 1`
#define S_LEN(s) (s), (sizeof(s) - 1) #define S_LEN(s) (s), (sizeof(s) - 1)
/// LINEEMPTY() - return TRUE if the line is empty /// LINEEMPTY() - return true if the line is empty
#define LINEEMPTY(p) (*ml_get(p) == NUL) #define LINEEMPTY(p) (*ml_get(p) == NUL)
// toupper() and tolower() that use the current locale. // toupper() and tolower() that use the current locale.

26
src/nvim/main.c
View File

@ -508,7 +508,7 @@ int main(int argc, char **argv)
// When started with "-q errorfile" jump to first error now. // When started with "-q errorfile" jump to first error now.
if (params.edit_type == EDIT_QF) { if (params.edit_type == EDIT_QF) {
qf_jump(NULL, 0, 0, FALSE); qf_jump(NULL, 0, 0, false);
TIME_MSG("jump to first error"); TIME_MSG("jump to first error");
} }
@ -520,7 +520,7 @@ int main(int argc, char **argv)
if (params.diff_mode) { if (params.diff_mode) {
// set options in each window for "nvim -d". // set options in each window for "nvim -d".
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) { FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
diff_win_options(wp, TRUE); diff_win_options(wp, true);
} }
} }
@ -713,8 +713,8 @@ void getout(int exitval)
if (did_emsg) { if (did_emsg) {
// give the user a chance to read the (error) message // give the user a chance to read the (error) message
no_wait_return = FALSE; no_wait_return = false;
wait_return(FALSE); wait_return(false);
} }
// Position the cursor again, the autocommands may have moved it // Position the cursor again, the autocommands may have moved it
@ -1638,7 +1638,7 @@ static void create_windows(mparm_T *parmp)
} }
curwin = curwin->w_next; curwin = curwin->w_next;
} }
dorewind = FALSE; dorewind = false;
curbuf = curwin->w_buffer; curbuf = curwin->w_buffer;
if (curbuf->b_ml.ml_mfp == NULL) { if (curbuf->b_ml.ml_mfp == NULL) {
// Set 'foldlevel' to 'foldlevelstart' if it's not negative.. // Set 'foldlevel' to 'foldlevelstart' if it's not negative..
@ -1647,15 +1647,15 @@ static void create_windows(mparm_T *parmp)
} }
// When getting the ATTENTION prompt here, use a dialog. // When getting the ATTENTION prompt here, use a dialog.
swap_exists_action = SEA_DIALOG; swap_exists_action = SEA_DIALOG;
set_buflisted(TRUE); set_buflisted(true);
// create memfile, read file // create memfile, read file
(void)open_buffer(FALSE, NULL, 0); (void)open_buffer(false, NULL, 0);
if (swap_exists_action == SEA_QUIT) { if (swap_exists_action == SEA_QUIT) {
if (got_int || only_one_window()) { if (got_int || only_one_window()) {
// abort selected or quit and only one window // abort selected or quit and only one window
did_emsg = FALSE; // avoid hit-enter prompt did_emsg = false; // avoid hit-enter prompt
getout(1); getout(1);
} }
// We can't close the window, it would disturb what // We can't close the window, it would disturb what
@ -1667,7 +1667,7 @@ static void create_windows(mparm_T *parmp)
} else { } else {
handle_swap_exists(NULL); handle_swap_exists(NULL);
} }
dorewind = TRUE; // start again dorewind = true; // start again
} }
os_breakcheck(); os_breakcheck();
if (got_int) { if (got_int) {
@ -1760,7 +1760,7 @@ static void edit_buffers(mparm_T *parmp, char_u *cwd)
// abort or quit selected // abort or quit selected
if (got_int || only_one_window()) { if (got_int || only_one_window()) {
// abort selected and only one window // abort selected and only one window
did_emsg = FALSE; // avoid hit-enter prompt did_emsg = false; // avoid hit-enter prompt
getout(1); getout(1);
} }
win_close(curwin, true, false); win_close(curwin, true, false);
@ -1841,7 +1841,7 @@ static void exe_commands(mparm_T *parmp)
* pattern on line 1. But don't move the cursor when an autocommand * pattern on line 1. But don't move the cursor when an autocommand
* with g`" was used. * with g`" was used.
*/ */
msg_scroll = TRUE; msg_scroll = true;
if (parmp->tagname == NULL && curwin->w_cursor.lnum <= 1) { if (parmp->tagname == NULL && curwin->w_cursor.lnum <= 1) {
curwin->w_cursor.lnum = 0; curwin->w_cursor.lnum = 0;
} }
@ -1861,12 +1861,12 @@ static void exe_commands(mparm_T *parmp)
} }
if (!exmode_active) { if (!exmode_active) {
msg_scroll = FALSE; msg_scroll = false;
} }
// When started with "-q errorfile" jump to first error again. // When started with "-q errorfile" jump to first error again.
if (parmp->edit_type == EDIT_QF) { if (parmp->edit_type == EDIT_QF) {
qf_jump(NULL, 0, 0, FALSE); qf_jump(NULL, 0, 0, false);
} }
TIME_MSG("executing command arguments"); TIME_MSG("executing command arguments");
} }

80
src/nvim/memline.c
View File

@ -552,7 +552,7 @@ void check_need_swap(bool newfile)
/// Close memline for buffer 'buf'. /// Close memline for buffer 'buf'.
/// ///
/// @param del_file if TRUE, delete the swap file /// @param del_file if true, delete the swap file
void ml_close(buf_T *buf, int del_file) void ml_close(buf_T *buf, int del_file)
{ {
if (buf->b_ml.ml_mfp == NULL) { // not open if (buf->b_ml.ml_mfp == NULL) { // not open
@ -590,7 +590,7 @@ void ml_close_notmod(void)
{ {
FOR_ALL_BUFFERS(buf) { FOR_ALL_BUFFERS(buf) {
if (!bufIsChanged(buf)) { if (!bufIsChanged(buf)) {
ml_close(buf, TRUE); // close all not-modified buffers ml_close(buf, true); // close all not-modified buffers
} }
} }
} }
@ -764,7 +764,7 @@ void ml_recover(bool checkext)
int attr; int attr;
int orig_file_status = NOTDONE; int orig_file_status = NOTDONE;
recoverymode = TRUE; recoverymode = true;
called_from_main = (curbuf->b_ml.ml_mfp == NULL); called_from_main = (curbuf->b_ml.ml_mfp == NULL);
attr = HL_ATTR(HLF_E); attr = HL_ATTR(HLF_E);
@ -785,7 +785,7 @@ void ml_recover(bool checkext)
directly = false; directly = false;
// count the number of matching swap files // count the number of matching swap files
len = recover_names(fname, FALSE, 0, NULL); len = recover_names(fname, false, 0, NULL);
if (len == 0) { // no swap files found if (len == 0) { // no swap files found
semsg(_("E305: No swap file found for %s"), fname); semsg(_("E305: No swap file found for %s"), fname);
goto theend; goto theend;
@ -794,16 +794,16 @@ void ml_recover(bool checkext)
i = 1; i = 1;
} else { // several swap files found, choose } else { // several swap files found, choose
// list the names of the swap files // list the names of the swap files
(void)recover_names(fname, TRUE, 0, NULL); (void)recover_names(fname, true, 0, NULL);
msg_putchar('\n'); msg_putchar('\n');
msg_puts(_("Enter number of swap file to use (0 to quit): ")); msg_puts(_("Enter number of swap file to use (0 to quit): "));
i = get_number(FALSE, NULL); i = get_number(false, NULL);
if (i < 1 || i > len) { if (i < 1 || i > len) {
goto theend; goto theend;
} }
} }
// get the swap file name that will be used // get the swap file name that will be used
(void)recover_names(fname, FALSE, i, &fname_used); (void)recover_names(fname, false, i, &fname_used);
} }
if (fname_used == NULL) { if (fname_used == NULL) {
goto theend; // user chose invalid number. goto theend; // user chose invalid number.
@ -1201,7 +1201,7 @@ void ml_recover(bool checkext)
curbuf->b_flags |= BF_RECOVERED; curbuf->b_flags |= BF_RECOVERED;
check_cursor(); check_cursor();
recoverymode = FALSE; recoverymode = false;
if (got_int) { if (got_int) {
emsg(_("E311: Recovery Interrupted")); emsg(_("E311: Recovery Interrupted"));
} else if (error) { } else if (error) {
@ -1226,7 +1226,7 @@ void ml_recover(bool checkext)
theend: theend:
xfree(fname_used); xfree(fname_used);
recoverymode = FALSE; recoverymode = false;
if (mfp != NULL) { if (mfp != NULL) {
if (hp != NULL) { if (hp != NULL) {
mf_put(mfp, hp, false, false); mf_put(mfp, hp, false, false);
@ -1238,7 +1238,7 @@ theend:
xfree(buf); xfree(buf);
} }
if (serious_error && called_from_main) { if (serious_error && called_from_main) {
ml_close(curbuf, TRUE); ml_close(curbuf, true);
} else { } else {
apply_autocmds(EVENT_BUFREADPOST, NULL, curbuf->b_fname, false, curbuf); apply_autocmds(EVENT_BUFREADPOST, NULL, curbuf->b_fname, false, curbuf);
apply_autocmds(EVENT_BUFWINENTER, NULL, curbuf->b_fname, false, curbuf); apply_autocmds(EVENT_BUFWINENTER, NULL, curbuf->b_fname, false, curbuf);
@ -1255,7 +1255,7 @@ theend:
/// - find the name of the n'th swap file when recovering /// - find the name of the n'th swap file when recovering
/// ///
/// @param fname base for swap file name /// @param fname base for swap file name
/// @param list when TRUE, list the swap file names /// @param list when true, list the swap file names
/// @param nr when non-zero, return nr'th swap file name /// @param nr when non-zero, return nr'th swap file name
/// @param fname_out result when "nr" > 0 /// @param fname_out result when "nr" > 0
int recover_names(char_u *fname, int list, int nr, char_u **fname_out) int recover_names(char_u *fname, int list, int nr, char_u **fname_out)
@ -1310,7 +1310,7 @@ int recover_names(char_u *fname, int list, int nr, char_u **fname_out)
names[2] = xstrdup(".sw?"); names[2] = xstrdup(".sw?");
num_names = 3; num_names = 3;
} else { } else {
num_names = recov_file_names(names, fname_res, TRUE); num_names = recov_file_names(names, fname_res, true);
} }
} else { // check directory dir_name } else { // check directory dir_name
if (fname == NULL) { if (fname == NULL) {
@ -1333,7 +1333,7 @@ int recover_names(char_u *fname, int list, int nr, char_u **fname_out)
tail = (char_u *)path_tail((char *)fname_res); tail = (char_u *)path_tail((char *)fname_res);
tail = (char_u *)concat_fnames((char *)dir_name, (char *)tail, true); tail = (char_u *)concat_fnames((char *)dir_name, (char *)tail, true);
} }
num_names = recov_file_names(names, tail, FALSE); num_names = recov_file_names(names, tail, false);
xfree(tail); xfree(tail);
} }
} }
@ -1447,7 +1447,7 @@ char *make_percent_swname(const char *dir, const char *name)
*d = '%'; *d = '%';
} }
} }
d = concat_fnames(dir, s, TRUE); d = concat_fnames(dir, s, true);
xfree(s); xfree(s);
xfree(f); xfree(f);
} }
@ -1668,8 +1668,8 @@ static int recov_file_names(char **names, char_u *path, int prepend_dot)
/// sync all memlines /// sync all memlines
/// ///
/// @param check_file if TRUE, check if original file exists and was not changed. /// @param check_file if true, check if original file exists and was not changed.
/// @param check_char if TRUE, stop syncing when character becomes available, but /// @param check_char if true, stop syncing when character becomes available, but
/// ///
/// always sync at least one block. /// always sync at least one block.
void ml_sync_all(int check_file, int check_char, bool do_fsync) void ml_sync_all(int check_file, int check_char, bool do_fsync)
@ -1714,7 +1714,7 @@ void ml_sync_all(int check_file, int check_char, bool do_fsync)
/// Used for the :preserve command and when the original file has been /// Used for the :preserve command and when the original file has been
/// changed or deleted. /// changed or deleted.
/// ///
/// @param message if TRUE, the success of preserving is reported. /// @param message if true, the success of preserving is reported.
void ml_preserve(buf_T *buf, int message, bool do_fsync) void ml_preserve(buf_T *buf, int message, bool do_fsync)
{ {
bhdr_T *hp; bhdr_T *hp;
@ -1908,7 +1908,7 @@ int ml_line_alloced(void)
/// "line" does not need to be allocated, but can't be another line in a /// "line" does not need to be allocated, but can't be another line in a
/// buffer, unlocking may make it invalid. /// buffer, unlocking may make it invalid.
/// ///
/// newfile: TRUE when starting to edit a new file, meaning that pe_old_lnum /// newfile: true when starting to edit a new file, meaning that pe_old_lnum
/// will be set for recovery /// will be set for recovery
/// Check: The caller of this function should probably also call /// Check: The caller of this function should probably also call
/// appended_lines(). /// appended_lines().
@ -1922,7 +1922,7 @@ int ml_line_alloced(void)
int ml_append(linenr_T lnum, char *line, colnr_T len, bool newfile) int ml_append(linenr_T lnum, char *line, colnr_T len, bool newfile)
{ {
// When starting up, we might still need to create the memfile // When starting up, we might still need to create the memfile
if (curbuf->b_ml.ml_mfp == NULL && open_buffer(FALSE, NULL, 0) == FAIL) { if (curbuf->b_ml.ml_mfp == NULL && open_buffer(false, NULL, 0) == FAIL) {
return FAIL; return FAIL;
} }
@ -1949,7 +1949,7 @@ int ml_append_buf(buf_T *buf, linenr_T lnum, char_u *line, colnr_T len, bool new
if (buf->b_ml.ml_line_lnum != 0) { if (buf->b_ml.ml_line_lnum != 0) {
ml_flush_line(buf); ml_flush_line(buf);
} }
return ml_append_int(buf, lnum, line, len, newfile, FALSE); return ml_append_int(buf, lnum, line, len, newfile, false);
} }
/// @param lnum append after this line (can be 0) /// @param lnum append after this line (can be 0)
@ -3040,7 +3040,7 @@ static bhdr_T *ml_find_line(buf_T *buf, linenr_T lnum, int action)
if (bnum != bnum2) { if (bnum != bnum2) {
bnum = bnum2; bnum = bnum2;
pp->pb_pointer[idx].pe_bnum = bnum; pp->pb_pointer[idx].pe_bnum = bnum;
dirty = TRUE; dirty = true;
} }
} }
@ -3058,10 +3058,10 @@ static bhdr_T *ml_find_line(buf_T *buf, linenr_T lnum, int action)
} }
if (action == ML_DELETE) { if (action == ML_DELETE) {
pp->pb_pointer[idx].pe_line_count--; pp->pb_pointer[idx].pe_line_count--;
dirty = TRUE; dirty = true;
} else if (action == ML_INSERT) { } else if (action == ML_INSERT) {
pp->pb_pointer[idx].pe_line_count++; pp->pb_pointer[idx].pe_line_count++;
dirty = TRUE; dirty = true;
} }
mf_put(mfp, hp, dirty, false); mf_put(mfp, hp, dirty, false);
} }
@ -3203,7 +3203,7 @@ int resolve_symlink(const char_u *fname, char_u *buf)
* be consistent even when opening a relative symlink from different * be consistent even when opening a relative symlink from different
* working directories. * working directories.
*/ */
return vim_FullName((char *)tmp, (char *)buf, MAXPATHL, TRUE); return vim_FullName((char *)tmp, (char *)buf, MAXPATHL, true);
} }
#endif #endif
@ -3275,7 +3275,7 @@ char_u *get_file_in_dir(char_u *fname, char_u *dname)
retval = vim_strsave(fname); retval = vim_strsave(fname);
} else if (dname[0] == '.' && vim_ispathsep(dname[1])) { } else if (dname[0] == '.' && vim_ispathsep(dname[1])) {
if (tail == fname) { // no path before file name if (tail == fname) { // no path before file name
retval = (char_u *)concat_fnames((char *)dname + 2, (char *)tail, TRUE); retval = (char_u *)concat_fnames((char *)dname + 2, (char *)tail, true);
} else { } else {
save_char = *tail; save_char = *tail;
*tail = NUL; *tail = NUL;
@ -3285,7 +3285,7 @@ char_u *get_file_in_dir(char_u *fname, char_u *dname)
xfree(t); xfree(t);
} }
} else { } else {
retval = (char_u *)concat_fnames((char *)dname, (char *)tail, TRUE); retval = (char_u *)concat_fnames((char *)dname, (char *)tail, true);
} }
return retval; return retval;
@ -3455,7 +3455,7 @@ static char *findswapname(buf_T *buf, char **dirp, char *old_fname, bool *found_
&& !buf->b_help && !(buf->b_flags & BF_DUMMY)) { && !buf->b_help && !(buf->b_flags & BF_DUMMY)) {
int fd; int fd;
struct block0 b0; struct block0 b0;
int differ = FALSE; int differ = false;
// Try to read block 0 from the swap file to get the original // Try to read block 0 from the swap file to get the original
// file name (and inode number). // file name (and inode number).
@ -3475,7 +3475,7 @@ static char *findswapname(buf_T *buf, char **dirp, char *old_fname, bool *found_
expand_env(b0.b0_fname, NameBuff, MAXPATHL); expand_env(b0.b0_fname, NameBuff, MAXPATHL);
if (fnamecmp_ino((char_u *)buf->b_ffname, NameBuff, if (fnamecmp_ino((char_u *)buf->b_ffname, NameBuff,
char_to_long(b0.b0_ino))) { char_to_long(b0.b0_ino))) {
differ = TRUE; differ = true;
} }
} }
} else { } else {
@ -3484,7 +3484,7 @@ static char *findswapname(buf_T *buf, char **dirp, char *old_fname, bool *found_
expand_env(b0.b0_fname, NameBuff, MAXPATHL); expand_env(b0.b0_fname, NameBuff, MAXPATHL);
if (fnamecmp_ino((char_u *)buf->b_ffname, NameBuff, if (fnamecmp_ino((char_u *)buf->b_ffname, NameBuff,
char_to_long(b0.b0_ino))) { char_to_long(b0.b0_ino))) {
differ = TRUE; differ = true;
} }
} }
} }
@ -3564,7 +3564,7 @@ static char *findswapname(buf_T *buf, char **dirp, char *old_fname, bool *found_
if (choice > 0) { if (choice > 0) {
switch (choice) { switch (choice) {
case 1: case 1:
buf->b_p_ro = TRUE; buf->b_p_ro = true;
break; break;
case 2: case 2:
break; break;
@ -3579,7 +3579,7 @@ static char *findswapname(buf_T *buf, char **dirp, char *old_fname, bool *found_
break; break;
case 6: case 6:
swap_exists_action = SEA_QUIT; swap_exists_action = SEA_QUIT;
got_int = TRUE; got_int = true;
break; break;
} }
@ -3667,18 +3667,18 @@ static int b0_magic_wrong(ZERO_BL *b0p)
/// ///
/// current file doesn't exist, file for swap file exist, file name(s) not /// current file doesn't exist, file for swap file exist, file name(s) not
/// available -> probably different /// available -> probably different
/// == 0 != 0 FAIL X TRUE /// == 0 != 0 FAIL X true
/// == 0 != 0 X FAIL TRUE /// == 0 != 0 X FAIL true
/// ///
/// current file exists, inode for swap unknown, file name(s) not /// current file exists, inode for swap unknown, file name(s) not
/// available -> probably different /// available -> probably different
/// != 0 == 0 FAIL X TRUE /// != 0 == 0 FAIL X true
/// != 0 == 0 X FAIL TRUE /// != 0 == 0 X FAIL true
/// ///
/// current file doesn't exist, inode for swap unknown, one file name not /// current file doesn't exist, inode for swap unknown, one file name not
/// available -> probably different /// available -> probably different
/// == 0 == 0 FAIL OK TRUE /// == 0 == 0 FAIL OK true
/// == 0 == 0 OK FAIL TRUE /// == 0 == 0 OK FAIL true
/// ///
/// current file doesn't exist, inode for swap unknown, both file names not /// current file doesn't exist, inode for swap unknown, both file names not
/// available -> compare file names /// available -> compare file names
@ -3722,8 +3722,8 @@ static bool fnamecmp_ino(char_u *fname_c, char_u *fname_s, long ino_block0)
* One of the inode numbers is unknown, try a forced vim_FullName() and * One of the inode numbers is unknown, try a forced vim_FullName() and
* compare the file names. * compare the file names.
*/ */
retval_c = vim_FullName((char *)fname_c, (char *)buf_c, MAXPATHL, TRUE); retval_c = vim_FullName((char *)fname_c, (char *)buf_c, MAXPATHL, true);
retval_s = vim_FullName((char *)fname_s, (char *)buf_s, MAXPATHL, TRUE); retval_s = vim_FullName((char *)fname_s, (char *)buf_s, MAXPATHL, true);
if (retval_c == OK && retval_s == OK) { if (retval_c == OK && retval_s == OK) {
return STRCMP(buf_c, buf_s) != 0; return STRCMP(buf_c, buf_s) != 0;
} }
@ -4163,7 +4163,7 @@ void goto_byte(long cnt)
curwin->w_cursor.lnum = lnum; curwin->w_cursor.lnum = lnum;
curwin->w_cursor.col = (colnr_T)boff; curwin->w_cursor.col = (colnr_T)boff;
curwin->w_cursor.coladd = 0; curwin->w_cursor.coladd = 0;
curwin->w_set_curswant = TRUE; curwin->w_set_curswant = true;
} }
check_cursor(); check_cursor();

16
src/nvim/menu.c
View File

@ -914,7 +914,7 @@ static void show_menus_recursive(vimmenu_T *menu, int modes, int depth)
*/ */
static vimmenu_T *expand_menu = NULL; static vimmenu_T *expand_menu = NULL;
static int expand_modes = 0x0; static int expand_modes = 0x0;
static int expand_emenu; // TRUE for ":emenu" command static int expand_emenu; // true for ":emenu" command
/* /*
* Work out what to complete when doing command line completion of menu names. * Work out what to complete when doing command line completion of menu names.
@ -1056,7 +1056,7 @@ char *get_menu_name(expand_T *xp, int idx)
} else { } else {
str = menu->dname; str = menu->dname;
if (menu->en_dname == NULL) { if (menu->en_dname == NULL) {
should_advance = TRUE; should_advance = true;
} }
} }
} else { } else {
@ -1163,10 +1163,8 @@ char *menu_name_skip(char *const name)
return p; return p;
} }
/* /// Return true when "name" matches with menu "menu". The name is compared in
* Return TRUE when "name" matches with menu "menu". The name is compared in /// two ways: raw menu name and menu name without '&'. ignore part after a TAB.
* two ways: raw menu name and menu name without '&'. ignore part after a TAB.
*/
static bool menu_name_equal(const char *const name, const vimmenu_T *const menu) static bool menu_name_equal(const char *const name, const vimmenu_T *const menu)
{ {
if (menu->en_name != NULL if (menu->en_name != NULL
@ -1405,10 +1403,8 @@ bool menu_is_toolbar(const char *const name)
return STRNCMP(name, "ToolBar", 7) == 0; return STRNCMP(name, "ToolBar", 7) == 0;
} }
/* /// Return true if the name is a menu separator identifier: Starts and ends
* Return TRUE if the name is a menu separator identifier: Starts and ends /// with '-'
* with '-'
*/
int menu_is_separator(char *name) int menu_is_separator(char *name)
{ {
return name[0] == '-' && name[STRLEN(name) - 1] == '-'; return name[0] == '-' && name[STRLEN(name) - 1] == '-';

74
src/nvim/message.c
View File

@ -56,7 +56,7 @@ typedef struct msgchunk_S msgchunk_T;
struct msgchunk_S { struct msgchunk_S {
msgchunk_T *sb_next; msgchunk_T *sb_next;
msgchunk_T *sb_prev; msgchunk_T *sb_prev;
char sb_eol; // TRUE when line ends after this text char sb_eol; // true when line ends after this text
int sb_msg_col; // column in which text starts int sb_msg_col; // column in which text starts
int sb_attr; // text attributes int sb_attr; // text attributes
char_u sb_text[1]; // text to be displayed, actually longer char_u sb_text[1]; // text to be displayed, actually longer
@ -66,7 +66,7 @@ struct msgchunk_S {
#define DLG_BUTTON_SEP '\n' #define DLG_BUTTON_SEP '\n'
#define DLG_HOTKEY_CHAR '&' #define DLG_HOTKEY_CHAR '&'
static int confirm_msg_used = FALSE; // displaying confirm_msg static int confirm_msg_used = false; // displaying confirm_msg
#ifdef INCLUDE_GENERATED_DECLARATIONS #ifdef INCLUDE_GENERATED_DECLARATIONS
# include "message.c.generated.h" # include "message.c.generated.h"
#endif #endif
@ -78,7 +78,7 @@ MessageHistoryEntry *last_msg_hist = NULL;
static int msg_hist_len = 0; static int msg_hist_len = 0;
static FILE *verbose_fd = NULL; static FILE *verbose_fd = NULL;
static int verbose_did_open = FALSE; static int verbose_did_open = false;
bool keep_msg_more = false; // keep_msg was set by msgmore() bool keep_msg_more = false; // keep_msg was set by msgmore()
@ -102,7 +102,7 @@ bool keep_msg_more = false; // keep_msg was set by msgmore()
* msg_scrolled How many lines the screen has been scrolled (because of * msg_scrolled How many lines the screen has been scrolled (because of
* messages). Used in update_screen() to scroll the screen * messages). Used in update_screen() to scroll the screen
* back. Incremented each time the screen scrolls a line. * back. Incremented each time the screen scrolls a line.
* msg_scrolled_ign TRUE when msg_scrolled is non-zero and msg_puts_attr() * msg_scrolled_ign true when msg_scrolled is non-zero and msg_puts_attr()
* writes something without scrolling should not make * writes something without scrolling should not make
* need_wait_return to be set. This is a hack to make ":ts" * need_wait_return to be set. This is a hack to make ":ts"
* work without an extra prompt. * work without an extra prompt.
@ -215,7 +215,7 @@ void msg_grid_validate(void)
/// Displays the string 's' on the status line /// Displays the string 's' on the status line
/// When terminal not initialized (yet) mch_errmsg(..) is used. /// When terminal not initialized (yet) mch_errmsg(..) is used.
/// ///
/// @return TRUE if wait_return not called /// @return true if wait_return not called
int msg(char *s) int msg(char *s)
{ {
return msg_attr_keep(s, 0, false, false); return msg_attr_keep(s, 0, false, false);
@ -319,7 +319,7 @@ bool msg_attr_keep(const char *s, int attr, bool keep, bool multiline)
* break this loop, limit the recursiveness to 3 levels. * break this loop, limit the recursiveness to 3 levels.
*/ */
if (entered >= 3) { if (entered >= 3) {
return TRUE; return true;
} }
entered++; entered++;
@ -335,7 +335,7 @@ bool msg_attr_keep(const char *s, int attr, bool keep, bool multiline)
// Truncate the message if needed. // Truncate the message if needed.
msg_start(); msg_start();
buf = msg_strtrunc((char_u *)s, FALSE); buf = msg_strtrunc((char_u *)s, false);
if (buf != NULL) { if (buf != NULL) {
s = (const char *)buf; s = (const char *)buf;
} }
@ -634,7 +634,7 @@ void msg_source(int attr)
recursive = false; recursive = false;
} }
/// @return TRUE if not giving error messages right now: /// @return true if not giving error messages right now:
/// If "emsg_off" is set: no error messages at the moment. /// If "emsg_off" is set: no error messages at the moment.
/// If "msg" is in 'debug': do error message but without side effects. /// If "msg" is in 'debug': do error message but without side effects.
/// If "emsg_skip" is set: never do error messages. /// If "emsg_skip" is set: never do error messages.
@ -643,9 +643,9 @@ int emsg_not_now(void)
if ((emsg_off > 0 && vim_strchr((char *)p_debug, 'm') == NULL if ((emsg_off > 0 && vim_strchr((char *)p_debug, 'm') == NULL
&& vim_strchr((char *)p_debug, 't') == NULL) && vim_strchr((char *)p_debug, 't') == NULL)
|| emsg_skip > 0) { || emsg_skip > 0) {
return TRUE; return true;
} }
return FALSE; return false;
} }
static bool emsg_multiline(const char *s, bool multiline) static bool emsg_multiline(const char *s, bool multiline)
@ -1177,12 +1177,12 @@ void wait_return(int redraw)
oldState = State; oldState = State;
if (quit_more) { if (quit_more) {
c = CAR; // just pretend CR was hit c = CAR; // just pretend CR was hit
quit_more = FALSE; quit_more = false;
got_int = FALSE; got_int = false;
} else if (exmode_active) { } else if (exmode_active) {
msg_puts(" "); // make sure the cursor is on the right line msg_puts(" "); // make sure the cursor is on the right line
c = CAR; // no need for a return in ex mode c = CAR; // no need for a return in ex mode
got_int = FALSE; got_int = false;
} else { } else {
// Make sure the hit-return prompt is on screen when 'guioptions' was // Make sure the hit-return prompt is on screen when 'guioptions' was
// just changed. // just changed.
@ -1247,8 +1247,8 @@ void wait_return(int redraw)
} }
if (quit_more) { if (quit_more) {
c = CAR; // just pretend CR was hit c = CAR; // just pretend CR was hit
quit_more = FALSE; quit_more = false;
got_int = FALSE; got_int = false;
} else if (c != K_IGNORE) { } else if (c != K_IGNORE) {
c = K_IGNORE; c = K_IGNORE;
hit_return_msg(); hit_return_msg();
@ -1653,7 +1653,7 @@ void msg_make(char_u *arg)
/// If K_SPECIAL is encountered, then it is taken in conjunction with the /// If K_SPECIAL is encountered, then it is taken in conjunction with the
/// following character and shown as <F1>, <S-Up> etc. Any other character /// following character and shown as <F1>, <S-Up> etc. Any other character
/// which is not printable shown in <> form. /// which is not printable shown in <> form.
/// If 'from' is TRUE (lhs of a mapping), a space is shown as <Space>. /// If 'from' is true (lhs of a mapping), a space is shown as <Space>.
/// If a character is displayed in one of these special ways, is also /// If a character is displayed in one of these special ways, is also
/// highlighted (its highlight name is '8' in the p_hl variable). /// highlighted (its highlight name is '8' in the p_hl variable).
/// Otherwise characters are not highlighted. /// Otherwise characters are not highlighted.
@ -2557,7 +2557,7 @@ static void store_sb_text(char **sb_str, char *s, int attr, int *sb_col, int fin
} }
mp->sb_next = NULL; mp->sb_next = NULL;
} else if (finish && last_msgchunk != NULL) { } else if (finish && last_msgchunk != NULL) {
last_msgchunk->sb_eol = TRUE; last_msgchunk->sb_eol = true;
} }
*sb_str = s; *sb_str = s;
@ -2614,7 +2614,7 @@ void sb_text_end_cmdline(void)
} }
/// Clear any text remembered for scrolling back. /// Clear any text remembered for scrolling back.
/// When "all" is FALSE keep the last line. /// When "all" is false keep the last line.
/// Called when redrawing the screen. /// Called when redrawing the screen.
void clear_sb_text(int all) void clear_sb_text(int all)
{ {
@ -2649,7 +2649,7 @@ void show_sb_text(void)
vim_beep(BO_MESS); vim_beep(BO_MESS);
} else { } else {
do_more_prompt('G'); do_more_prompt('G');
wait_return(FALSE); wait_return(false);
} }
} }
@ -2668,7 +2668,7 @@ static msgchunk_T *msg_sb_start(msgchunk_T *mps)
void msg_sb_eol(void) void msg_sb_eol(void)
{ {
if (last_msgchunk != NULL) { if (last_msgchunk != NULL) {
last_msgchunk->sb_eol = TRUE; last_msgchunk->sb_eol = true;
} }
} }
@ -2687,7 +2687,7 @@ static msgchunk_T *disp_sb_line(int row, msgchunk_T *smp)
if (*p == '\n') { // don't display the line break if (*p == '\n') { // don't display the line break
p++; p++;
} }
msg_puts_display(p, -1, mp->sb_attr, TRUE); msg_puts_display(p, -1, mp->sb_attr, true);
if (mp->sb_eol || mp->sb_next == NULL) { if (mp->sb_eol || mp->sb_next == NULL) {
break; break;
} }
@ -2718,7 +2718,7 @@ static void t_puts(int *t_col, const char_u *t_s, const char_u *s, int attr)
} }
} }
/// @return TRUE when messages should be printed to stdout/stderr: /// @return true when messages should be printed to stdout/stderr:
/// - "batch mode" ("silent mode", -es/-Es) /// - "batch mode" ("silent mode", -es/-Es)
/// - no UI and not embedded /// - no UI and not embedded
int msg_use_printf(void) int msg_use_printf(void)
@ -2786,14 +2786,14 @@ static void msg_puts_printf(const char *str, const ptrdiff_t maxlen)
/// When at hit-enter prompt "typed_char" is the already typed character, /// When at hit-enter prompt "typed_char" is the already typed character,
/// otherwise it's NUL. /// otherwise it's NUL.
/// ///
/// @return TRUE when jumping ahead to "confirm_msg_tail". /// @return true when jumping ahead to "confirm_msg_tail".
static int do_more_prompt(int typed_char) static int do_more_prompt(int typed_char)
{ {
static bool entered = false; static bool entered = false;
int used_typed_char = typed_char; int used_typed_char = typed_char;
int oldState = State; int oldState = State;
int c; int c;
int retval = FALSE; int retval = false;
int toscroll; int toscroll;
bool to_redraw = false; bool to_redraw = false;
msgchunk_T *mp_last = NULL; msgchunk_T *mp_last = NULL;
@ -2825,7 +2825,7 @@ static int do_more_prompt(int typed_char)
State = MODE_ASKMORE; State = MODE_ASKMORE;
setmouse(); setmouse();
if (typed_char == NUL) { if (typed_char == NUL) {
msg_moremsg(FALSE); msg_moremsg(false);
} }
for (;;) { for (;;) {
/* /*
@ -2898,10 +2898,10 @@ static int do_more_prompt(int typed_char)
case ESC: case ESC:
if (confirm_msg_used) { if (confirm_msg_used) {
// Jump to the choices of the dialog. // Jump to the choices of the dialog.
retval = TRUE; retval = true;
} else { } else {
got_int = TRUE; got_int = true;
quit_more = TRUE; quit_more = true;
} }
// When there is some more output (wrapping line) display that // When there is some more output (wrapping line) display that
// without another prompt. // without another prompt.
@ -2917,7 +2917,7 @@ static int do_more_prompt(int typed_char)
break; break;
default: // no valid response default: // no valid response
msg_moremsg(TRUE); msg_moremsg(true);
continue; continue;
} }
@ -3168,7 +3168,7 @@ void msg_clr_cmdline(void)
/// end putting a message on the screen /// end putting a message on the screen
/// call wait_return if the message does not fit in the available space /// call wait_return if the message does not fit in the available space
/// ///
/// @return TRUE if wait_return not called. /// @return true if wait_return not called.
int msg_end(void) int msg_end(void)
{ {
/* /*
@ -3391,7 +3391,7 @@ void verbose_enter_scroll(void)
msg_silent++; msg_silent++;
} else { } else {
// always scroll up, don't overwrite // always scroll up, don't overwrite
msg_scroll = TRUE; msg_scroll = true;
} }
} }
@ -3414,7 +3414,7 @@ void verbose_stop(void)
fclose(verbose_fd); fclose(verbose_fd);
verbose_fd = NULL; verbose_fd = NULL;
} }
verbose_did_open = FALSE; verbose_did_open = false;
} }
/// Open the file 'verbosefile'. /// Open the file 'verbosefile'.
@ -3424,7 +3424,7 @@ int verbose_open(void)
{ {
if (verbose_fd == NULL && !verbose_did_open) { if (verbose_fd == NULL && !verbose_did_open) {
// Only give the error message once. // Only give the error message once.
verbose_did_open = TRUE; verbose_did_open = true;
verbose_fd = os_fopen((char *)p_vfile, "a"); verbose_fd = os_fopen((char *)p_vfile, "a");
if (verbose_fd == NULL) { if (verbose_fd == NULL) {
@ -3523,7 +3523,7 @@ void msg_advance(int col)
/// different letter. /// different letter.
/// ///
/// @param textfiel IObuff for inputdialog(), NULL otherwise /// @param textfiel IObuff for inputdialog(), NULL otherwise
/// @param ex_cmd when TRUE pressing : accepts default and starts Ex command /// @param ex_cmd when true pressing : accepts default and starts Ex command
/// @returns 0 if cancelled, otherwise the nth button (1-indexed). /// @returns 0 if cancelled, otherwise the nth button (1-indexed).
int do_dialog(int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, int do_dialog(int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton,
char_u *textfield, int ex_cmd) char_u *textfield, int ex_cmd)
@ -3799,7 +3799,7 @@ int vim_dialog_yesno(int type, char_u *title, char_u *message, int dflt)
if (do_dialog(type, if (do_dialog(type,
title == NULL ? (char_u *)_("Question") : title, title == NULL ? (char_u *)_("Question") : title,
message, message,
(char_u *)_("&Yes\n&No"), dflt, NULL, FALSE) == 1) { (char_u *)_("&Yes\n&No"), dflt, NULL, false) == 1) {
return VIM_YES; return VIM_YES;
} }
return VIM_NO; return VIM_NO;
@ -3810,7 +3810,7 @@ int vim_dialog_yesnocancel(int type, char_u *title, char_u *message, int dflt)
switch (do_dialog(type, switch (do_dialog(type,
title == NULL ? (char_u *)_("Question") : title, title == NULL ? (char_u *)_("Question") : title,
message, message,
(char_u *)_("&Yes\n&No\n&Cancel"), dflt, NULL, FALSE)) { (char_u *)_("&Yes\n&No\n&Cancel"), dflt, NULL, false)) {
case 1: case 1:
return VIM_YES; return VIM_YES;
case 2: case 2:
@ -3825,7 +3825,7 @@ int vim_dialog_yesnoallcancel(int type, char_u *title, char_u *message, int dflt
title == NULL ? (char_u *)"Question" : title, title == NULL ? (char_u *)"Question" : title,
message, message,
(char_u *)_("&Yes\n&No\nSave &All\n&Discard All\n&Cancel"), (char_u *)_("&Yes\n&No\nSave &All\n&Discard All\n&Cancel"),
dflt, NULL, FALSE)) { dflt, NULL, false)) {
case 1: case 1:
return VIM_YES; return VIM_YES;
case 2: case 2:

2
src/nvim/mouse.h
View File

@ -36,7 +36,7 @@
#define MOUSE_X2 0x400 // Mouse-button X2 #define MOUSE_X2 0x400 // Mouse-button X2
// Direction for nv_mousescroll() and ins_mousescroll() // Direction for nv_mousescroll() and ins_mousescroll()
#define MSCR_DOWN 0 // DOWN must be FALSE #define MSCR_DOWN 0 // DOWN must be false
#define MSCR_UP 1 #define MSCR_UP 1
#define MSCR_LEFT (-1) #define MSCR_LEFT (-1)
#define MSCR_RIGHT (-2) #define MSCR_RIGHT (-2)

82
src/nvim/ops.c
View File

@ -78,9 +78,9 @@ struct block_def {
colnr_T textcol; // index of chars (partially) in block colnr_T textcol; // index of chars (partially) in block
colnr_T start_vcol; // start col of 1st char wholly inside block colnr_T start_vcol; // start col of 1st char wholly inside block
colnr_T end_vcol; // start col of 1st char wholly after block colnr_T end_vcol; // start col of 1st char wholly after block
int is_short; // TRUE if line is too short to fit in block int is_short; // true if line is too short to fit in block
int is_MAX; // TRUE if curswant==MAXCOL when starting int is_MAX; // true if curswant==MAXCOL when starting
int is_oneChar; // TRUE if block within one character int is_oneChar; // true if block within one character
int pre_whitesp; // screen cols of ws before block int pre_whitesp; // screen cols of ws before block
int pre_whitesp_c; // chars of ws before block int pre_whitesp_c; // chars of ws before block
colnr_T end_char_vcols; // number of vcols of post-block char colnr_T end_char_vcols; // number of vcols of post-block char
@ -181,13 +181,13 @@ int get_op_type(int char1, int char2)
return i; return i;
} }
/// @return TRUE if operator "op" always works on whole lines. /// @return true if operator "op" always works on whole lines.
int op_on_lines(int op) int op_on_lines(int op)
{ {
return opchars[op][2] & OPF_LINES; return opchars[op][2] & OPF_LINES;
} }
/// @return TRUE if operator "op" changes text. /// @return true if operator "op" changes text.
int op_is_change(int op) int op_is_change(int op)
{ {
return opchars[op][2] & OPF_CHANGE; return opchars[op][2] & OPF_CHANGE;
@ -2090,7 +2090,7 @@ void op_tilde(oparg_T *oap)
{ {
pos_T pos; pos_T pos;
struct block_def bd; struct block_def bd;
int did_change = FALSE; int did_change = false;
if (u_save((linenr_T)(oap->start.lnum - 1), if (u_save((linenr_T)(oap->start.lnum - 1),
(linenr_T)(oap->end.lnum + 1)) == FAIL) { (linenr_T)(oap->end.lnum + 1)) == FAIL) {
@ -2165,7 +2165,7 @@ void op_tilde(oparg_T *oap)
/// @param length is rounded up to include the whole last multi-byte character. /// @param length is rounded up to include the whole last multi-byte character.
/// Also works correctly when the number of bytes changes. /// Also works correctly when the number of bytes changes.
/// ///
/// @return TRUE if some character was changed. /// @return true if some character was changed.
static int swapchars(int op_type, pos_T *pos, int length) static int swapchars(int op_type, pos_T *pos, int length)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {
@ -2303,7 +2303,7 @@ void op_insert(oparg_T *oap, long count1)
if (oap->motion_type == kMTBlockWise if (oap->motion_type == kMTBlockWise
&& curwin->w_cursor.coladd == 0) { && curwin->w_cursor.coladd == 0) {
// Move the cursor to the character right of the block. // Move the cursor to the character right of the block.
curwin->w_set_curswant = TRUE; curwin->w_set_curswant = true;
while (*get_cursor_pos_ptr() != NUL while (*get_cursor_pos_ptr() != NUL
&& (curwin->w_cursor.col < bd.textcol + bd.textlen)) { && (curwin->w_cursor.col < bd.textcol + bd.textlen)) {
curwin->w_cursor.col++; curwin->w_cursor.col++;
@ -2463,7 +2463,7 @@ void op_insert(oparg_T *oap, long count1)
/// handle a change operation /// handle a change operation
/// ///
/// @return TRUE if edit() returns because of a CTRL-O command /// @return true if edit() returns because of a CTRL-O command
int op_change(oparg_T *oap) int op_change(oparg_T *oap)
{ {
colnr_T l; colnr_T l;
@ -2489,10 +2489,10 @@ int op_change(oparg_T *oap)
// save for undo // save for undo
if (curbuf->b_ml.ml_flags & ML_EMPTY) { if (curbuf->b_ml.ml_flags & ML_EMPTY) {
if (u_save_cursor() == FAIL) { if (u_save_cursor() == FAIL) {
return FALSE; return false;
} }
} else if (op_delete(oap) == FAIL) { } else if (op_delete(oap) == FAIL) {
return FALSE; return false;
} }
if ((l > curwin->w_cursor.col) && !LINEEMPTY(curwin->w_cursor.lnum) if ((l > curwin->w_cursor.col) && !LINEEMPTY(curwin->w_cursor.lnum)
@ -2518,7 +2518,7 @@ int op_change(oparg_T *oap)
fix_indent(); fix_indent();
} }
retval = edit(NUL, FALSE, (linenr_T)1); retval = edit(NUL, false, (linenr_T)1);
/* /*
* In Visual block mode, handle copying the new text to all lines of the * In Visual block mode, handle copying the new text to all lines of the
@ -3708,7 +3708,7 @@ error:
} }
msgmore(nr_lines); msgmore(nr_lines);
curwin->w_set_curswant = TRUE; curwin->w_set_curswant = true;
end: end:
if (cmdmod.cmod_flags & CMOD_LOCKMARKS) { if (cmdmod.cmod_flags & CMOD_LOCKMARKS) {
@ -3722,7 +3722,7 @@ end:
xfree(y_array); xfree(y_array);
} }
VIsual_active = FALSE; VIsual_active = false;
// If the cursor is past the end of the line put it at the end. // If the cursor is past the end of the line put it at the end.
adjust_cursor_eol(); adjust_cursor_eol();
@ -3751,7 +3751,7 @@ void adjust_cursor_eol(void)
} }
} }
/// @return TRUE if lines starting with '#' should be left aligned. /// @return true if lines starting with '#' should be left aligned.
int preprocs_left(void) int preprocs_left(void)
{ {
return ((curbuf->b_p_si && !curbuf->b_p_cin) return ((curbuf->b_p_si && !curbuf->b_p_cin)
@ -4011,8 +4011,8 @@ char_u *skip_comment(char_u *line, bool process, bool include_space, bool *is_co
} }
/// @param count number of lines (minimal 2) to join at cursor position. /// @param count number of lines (minimal 2) to join at cursor position.
/// @param save_undo when TRUE, save lines for undo first. /// @param save_undo when true, save lines for undo first.
/// @param use_formatoptions set to FALSE when e.g. processing backspace and comment /// @param use_formatoptions set to false when e.g. processing backspace and comment
/// leaders should not be removed. /// leaders should not be removed.
/// @param setmark when true, sets the '[ and '] mark, else, the caller is expected /// @param setmark when true, sets the '[ and '] mark, else, the caller is expected
/// to set those marks. /// to set those marks.
@ -4033,7 +4033,7 @@ int do_join(size_t count, int insert_space, int save_undo, int use_formatoptions
colnr_T col = 0; colnr_T col = 0;
int ret = OK; int ret = OK;
int *comments = NULL; int *comments = NULL;
int remove_comments = (use_formatoptions == TRUE) int remove_comments = (use_formatoptions == true)
&& has_format_option(FO_REMOVE_COMS); && has_format_option(FO_REMOVE_COMS);
bool prev_was_comment = false; bool prev_was_comment = false;
assert(count >= 1); assert(count >= 1);
@ -4208,7 +4208,7 @@ int do_join(size_t count, int insert_space, int save_undo, int use_formatoptions
check_cursor_col(); check_cursor_col();
curwin->w_cursor.coladd = 0; curwin->w_cursor.coladd = 0;
curwin->w_set_curswant = TRUE; curwin->w_set_curswant = true;
theend: theend:
xfree(spaces); xfree(spaces);
@ -4218,7 +4218,7 @@ theend:
return ret; return ret;
} }
/// @return TRUE if the two comment leaders given are the same. /// @return true if the two comment leaders given are the same.
/// ///
/// @param lnum The first line. White-space is ignored. /// @param lnum The first line. White-space is ignored.
/// ///
@ -4248,21 +4248,21 @@ static int same_leader(linenr_T lnum, int leader1_len, char_u *leader1_flags, in
return leader2_len == 0; return leader2_len == 0;
} }
if (*p == COM_END) { if (*p == COM_END) {
return FALSE; return false;
} }
if (*p == COM_START) { if (*p == COM_START) {
if (*(ml_get(lnum) + leader1_len) == NUL) { if (*(ml_get(lnum) + leader1_len) == NUL) {
return FALSE; return false;
} }
if (leader2_flags == NULL || leader2_len == 0) { if (leader2_flags == NULL || leader2_len == 0) {
return FALSE; return false;
} }
for (p = leader2_flags; *p && *p != ':'; p++) { for (p = leader2_flags; *p && *p != ':'; p++) {
if (*p == COM_MIDDLE) { if (*p == COM_MIDDLE) {
return TRUE; return true;
} }
} }
return FALSE; return false;
} }
} }
} }
@ -4588,7 +4588,7 @@ void format_lines(linenr_T line_count, int avoid_fex)
// do the formatting, without 'showmode' // do the formatting, without 'showmode'
State = MODE_INSERT; // for open_line() State = MODE_INSERT; // for open_line()
smd_save = p_smd; smd_save = p_smd;
p_smd = FALSE; p_smd = false;
insertchar(NUL, INSCHAR_FORMAT insertchar(NUL, INSCHAR_FORMAT
+ (do_comments ? INSCHAR_DO_COM : 0) + (do_comments ? INSCHAR_DO_COM : 0)
+ (do_comments && do_comments_list + (do_comments && do_comments_list
@ -4635,7 +4635,7 @@ void format_lines(linenr_T line_count, int avoid_fex)
} }
} }
curwin->w_cursor.lnum--; curwin->w_cursor.lnum--;
if (do_join(2, TRUE, FALSE, FALSE, false) == FAIL) { if (do_join(2, true, false, false, false) == FAIL) {
beep_flush(); beep_flush();
break; break;
} }
@ -4652,22 +4652,22 @@ void format_lines(linenr_T line_count, int avoid_fex)
} }
} }
/// @return TRUE if line "lnum" ends in a white character. /// @return true if line "lnum" ends in a white character.
static int ends_in_white(linenr_T lnum) static int ends_in_white(linenr_T lnum)
{ {
char_u *s = ml_get(lnum); char_u *s = ml_get(lnum);
size_t l; size_t l;
if (*s == NUL) { if (*s == NUL) {
return FALSE; return false;
} }
l = STRLEN(s) - 1; l = STRLEN(s) - 1;
return ascii_iswhite(s[l]); return ascii_iswhite(s[l]);
} }
/// Blank lines, and lines containing only the comment leader, are left /// Blank lines, and lines containing only the comment leader, are left
/// untouched by the formatting. The function returns TRUE in this /// untouched by the formatting. The function returns true in this
/// case. It also returns TRUE when a line starts with the end of a comment /// case. It also returns true when a line starts with the end of a comment
/// ('e' in comment flags), so that this line is skipped, and not joined to the /// ('e' in comment flags), so that this line is skipped, and not joined to the
/// previous line. A new paragraph starts after a blank line, or when the /// previous line. A new paragraph starts after a blank line, or when the
/// comment leader changes. /// comment leader changes.
@ -4695,13 +4695,13 @@ static int fmt_check_par(linenr_T lnum, int *leader_len, char_u **leader_flags,
return *skipwhite((char *)ptr + *leader_len) == NUL return *skipwhite((char *)ptr + *leader_len) == NUL
|| (*leader_len > 0 && *flags == COM_END) || (*leader_len > 0 && *flags == COM_END)
|| startPS(lnum, NUL, FALSE); || startPS(lnum, NUL, false);
} }
/// Used for auto-formatting. /// Used for auto-formatting.
/// ///
/// @return TRUE when a paragraph starts in line "lnum". /// @return true when a paragraph starts in line "lnum".
/// FALSE when the previous line is in the same paragraph. /// false when the previous line is in the same paragraph.
int paragraph_start(linenr_T lnum) int paragraph_start(linenr_T lnum)
{ {
char_u *p; char_u *p;
@ -4711,11 +4711,11 @@ int paragraph_start(linenr_T lnum)
char_u *next_leader_flags = NULL; // flags for leader of next line char_u *next_leader_flags = NULL; // flags for leader of next line
if (lnum <= 1) { if (lnum <= 1) {
return TRUE; // start of the file return true; // start of the file
} }
p = ml_get(lnum - 1); p = ml_get(lnum - 1);
if (*p == NUL) { if (*p == NUL) {
return TRUE; // after empty line return true; // after empty line
} }
const bool do_comments = has_format_option(FO_Q_COMS); // format comments const bool do_comments = has_format_option(FO_Q_COMS); // format comments
if (fmt_check_par(lnum - 1, &leader_len, &leader_flags, do_comments)) { if (fmt_check_par(lnum - 1, &leader_len, &leader_flags, do_comments)) {
@ -4727,16 +4727,16 @@ int paragraph_start(linenr_T lnum)
} }
if (has_format_option(FO_WHITE_PAR) && !ends_in_white(lnum - 1)) { if (has_format_option(FO_WHITE_PAR) && !ends_in_white(lnum - 1)) {
return TRUE; // missing trailing space in previous line. return true; // missing trailing space in previous line.
} }
if (has_format_option(FO_Q_NUMBER) && (get_number_indent(lnum) > 0)) { if (has_format_option(FO_Q_NUMBER) && (get_number_indent(lnum) > 0)) {
return TRUE; // numbered item starts in "lnum". return true; // numbered item starts in "lnum".
} }
if (!same_leader(lnum - 1, leader_len, leader_flags, if (!same_leader(lnum - 1, leader_len, leader_flags,
next_leader_len, next_leader_flags)) { next_leader_len, next_leader_flags)) {
return TRUE; // change of comment leader. return true; // change of comment leader.
} }
return FALSE; return false;
} }
/// prepare a few things for block mode yank/delete/tilde /// prepare a few things for block mode yank/delete/tilde
@ -5606,7 +5606,7 @@ void write_reg_contents_ex(int name, const char_u *str, ssize_t len, bool must_a
// Special case: '/' search pattern // Special case: '/' search pattern
if (name == '/') { if (name == '/') {
set_last_search_pat(str, RE_SEARCH, TRUE, TRUE); set_last_search_pat(str, RE_SEARCH, true, true);
return; return;
} }

66
src/nvim/path.c
View File

@ -233,10 +233,8 @@ char_u *get_past_head(const char_u *path)
return (char_u *)retval; return (char_u *)retval;
} }
/* /// Return true if 'c' is a path separator.
* Return TRUE if 'c' is a path separator. /// Note that for MS-Windows this includes the colon.
* Note that for MS-Windows this includes the colon.
*/
int vim_ispathsep(int c) int vim_ispathsep(int c)
{ {
#ifdef UNIX #ifdef UNIX
@ -262,9 +260,7 @@ int vim_ispathsep_nocolon(int c)
; ;
} }
/* /// return true if 'c' is a path list separator.
* return TRUE if 'c' is a path list separator.
*/
int vim_ispathlistsep(int c) int vim_ispathlistsep(int c)
{ {
#ifdef UNIX #ifdef UNIX
@ -319,11 +315,9 @@ void shorten_dir(char_u *str)
shorten_dir_len(str, 1); shorten_dir_len(str, 1);
} }
/* /// Return true if the directory of "fname" exists, false otherwise.
* Return TRUE if the directory of "fname" exists, FALSE otherwise. /// Also returns true if there is no directory name.
* Also returns TRUE if there is no directory name. /// "fname" must be writable!.
* "fname" must be writable!.
*/
bool dir_of_file_exists(char_u *fname) bool dir_of_file_exists(char_u *fname)
{ {
char *p = path_tail_with_sep((char *)fname); char *p = path_tail_with_sep((char *)fname);
@ -806,10 +800,8 @@ static int find_previous_pathsep(char_u *path, char_u **psep)
return FAIL; return FAIL;
} }
/* /// Returns true if "maybe_unique" is unique wrt other_paths in "gap".
* Returns TRUE if "maybe_unique" is unique wrt other_paths in "gap". /// "maybe_unique" is the end portion of "((char_u **)gap->ga_data)[i]".
* "maybe_unique" is the end portion of "((char_u **)gap->ga_data)[i]".
*/
static bool is_unique(char_u *maybe_unique, garray_T *gap, int i) static bool is_unique(char_u *maybe_unique, garray_T *gap, int i)
{ {
char_u **other_paths = (char_u **)gap->ga_data; char_u **other_paths = (char_u **)gap->ga_data;
@ -1149,10 +1141,8 @@ static int expand_in_path(garray_T *const gap, char_u *const pattern, const int
return gap->ga_len; return gap->ga_len;
} }
/* /// Return true if "p" contains what looks like an environment variable.
* Return TRUE if "p" contains what looks like an environment variable. /// Allowing for escaping.
* Allowing for escaping.
*/
static bool has_env_var(char_u *p) static bool has_env_var(char_u *p)
{ {
for (; *p; MB_PTR_ADV(p)) { for (; *p; MB_PTR_ADV(p)) {
@ -1167,7 +1157,7 @@ static bool has_env_var(char_u *p)
#ifdef SPECIAL_WILDCHAR #ifdef SPECIAL_WILDCHAR
// Return TRUE if "p" contains a special wildcard character, one that Vim // Return true if "p" contains a special wildcard character, one that Vim
// cannot expand, requires using a shell. // cannot expand, requires using a shell.
static bool has_special_wildchar(char_u *p) static bool has_special_wildchar(char_u *p)
{ {
@ -1365,9 +1355,7 @@ void FreeWild(int count, char **files)
xfree(files); xfree(files);
} }
/* /// Return true if we can expand this backtick thing here.
* Return TRUE if we can expand this backtick thing here.
*/
static int vim_backtick(char_u *p) static int vim_backtick(char_u *p)
{ {
return *p == '`' && *(p + 1) != NUL && *(p + STRLEN(p) - 1) == '`'; return *p == '`' && *(p + 1) != NUL && *(p + STRLEN(p) - 1) == '`';
@ -1726,7 +1714,7 @@ char_u *find_file_name_in_path(char_u *ptr, size_t len, int options, long count,
ptr = tofree; ptr = tofree;
len = STRLEN(ptr); len = STRLEN(ptr);
file_name = find_file_in_path(ptr, len, options & ~FNAME_MESS, file_name = find_file_in_path(ptr, len, options & ~FNAME_MESS,
TRUE, rel_fname); true, rel_fname);
} }
} }
if (file_name == NULL && (options & FNAME_MESS)) { if (file_name == NULL && (options & FNAME_MESS)) {
@ -1740,7 +1728,7 @@ char_u *find_file_name_in_path(char_u *ptr, size_t len, int options, long count,
* appears several times in the path. */ * appears several times in the path. */
while (file_name != NULL && --count > 0) { while (file_name != NULL && --count > 0) {
xfree(file_name); xfree(file_name);
file_name = find_file_in_path(ptr, len, options, FALSE, rel_fname); file_name = find_file_in_path(ptr, len, options, false, rel_fname);
} }
} else { } else {
file_name = vim_strnsave(ptr, len); file_name = vim_strnsave(ptr, len);
@ -1820,9 +1808,7 @@ bool path_with_extension(const char *path, const char *extension)
return strcmp(last_dot + 1, extension) == 0; return strcmp(last_dot + 1, extension) == 0;
} }
/* /// Return true if "name" is a full (absolute) path name or URL.
* Return TRUE if "name" is a full (absolute) path name or URL.
*/
bool vim_isAbsName(char_u *name) bool vim_isAbsName(char_u *name)
{ {
return path_with_url((char *)name) != 0 || path_is_absolute(name); return path_with_url((char *)name) != 0 || path_is_absolute(name);
@ -1959,21 +1945,17 @@ void path_fix_case(char *name)
os_closedir(&dir); os_closedir(&dir);
} }
/* /// Return true if "p" points to just after a path separator.
* Return TRUE if "p" points to just after a path separator. /// Takes care of multi-byte characters.
* Takes care of multi-byte characters. /// "b" must point to the start of the file name
* "b" must point to the start of the file name
*/
int after_pathsep(const char *b, const char *p) int after_pathsep(const char *b, const char *p)
{ {
return p > b && vim_ispathsep(p[-1]) return p > b && vim_ispathsep(p[-1])
&& utf_head_off((char_u *)b, (char_u *)p - 1) == 0; && utf_head_off((char_u *)b, (char_u *)p - 1) == 0;
} }
/* /// Return true if file names "f1" and "f2" are in the same directory.
* Return TRUE if file names "f1" and "f2" are in the same directory. /// "f1" may be a short name, "f2" must be a full path.
* "f1" may be a short name, "f2" must be a full path.
*/
bool same_directory(char_u *f1, char_u *f2) bool same_directory(char_u *f1, char_u *f2)
{ {
char ffname[MAXPATHL]; char ffname[MAXPATHL];
@ -1985,7 +1967,7 @@ bool same_directory(char_u *f1, char_u *f2)
return false; return false;
} }
(void)vim_FullName((char *)f1, (char *)ffname, MAXPATHL, FALSE); (void)vim_FullName((char *)f1, (char *)ffname, MAXPATHL, false);
t1 = path_tail_with_sep(ffname); t1 = path_tail_with_sep(ffname);
t2 = path_tail_with_sep((char *)f2); t2 = path_tail_with_sep((char *)f2);
return t1 - ffname == (char_u *)t2 - f2 return t1 - ffname == (char_u *)t2 - f2
@ -2252,9 +2234,7 @@ int expand_wildcards(int num_pat, char **pat, int *num_files, char ***files, int
return retval; return retval;
} }
/* /// Return true if "fname" matches with an entry in 'suffixes'.
* Return TRUE if "fname" matches with an entry in 'suffixes'.
*/
int match_suffix(char_u *fname) int match_suffix(char_u *fname)
{ {
#define MAXSUFLEN 30 // maximum length of a file suffix #define MAXSUFLEN 30 // maximum length of a file suffix
@ -2417,7 +2397,7 @@ static int path_to_absolute(const char_u *fname, char_u *buf, size_t len, int fo
/// Check if file `fname` is a full (absolute) path. /// Check if file `fname` is a full (absolute) path.
/// ///
/// @return `TRUE` if "fname" is absolute. /// @return `true` if "fname" is absolute.
int path_is_absolute(const char_u *fname) int path_is_absolute(const char_u *fname)
{ {
#ifdef WIN32 #ifdef WIN32

22
src/nvim/quickfix.c
View File

@ -67,9 +67,9 @@ struct qfline_S {
char *qf_module; ///< module name for this error char *qf_module; ///< module name for this error
char *qf_pattern; ///< search pattern for the error char *qf_pattern; ///< search pattern for the error
char *qf_text; ///< description of the error char *qf_text; ///< description of the error
char qf_viscol; ///< set to TRUE if qf_col and qf_end_col is char qf_viscol; ///< set to true if qf_col and qf_end_col is
// screen column // screen column
char qf_cleared; ///< set to TRUE if line has been deleted char qf_cleared; ///< set to true if line has been deleted
char qf_type; ///< type of the error (mostly 'E'); 1 for :helpgrep char qf_type; ///< type of the error (mostly 'E'); 1 for :helpgrep
char qf_valid; ///< valid error message detected char qf_valid; ///< valid error message detected
}; };
@ -100,7 +100,7 @@ typedef struct qf_list_S {
qfline_T *qf_ptr; ///< pointer to the current error qfline_T *qf_ptr; ///< pointer to the current error
int qf_count; ///< number of errors (0 means empty list) int qf_count; ///< number of errors (0 means empty list)
int qf_index; ///< current index in the error list int qf_index; ///< current index in the error list
int qf_nonevalid; ///< TRUE if not a single valid entry found int qf_nonevalid; ///< true if not a single valid entry found
char *qf_title; ///< title derived from the command that created char *qf_title; ///< title derived from the command that created
///< the error list or set by setqflist ///< the error list or set by setqflist
typval_T *qf_ctx; ///< context set by setqflist/setloclist typval_T *qf_ctx; ///< context set by setqflist/setloclist
@ -1891,7 +1891,7 @@ static qf_info_T *ll_get_or_alloc_list(win_T *wp)
/// Get the quickfix/location list stack to use for the specified Ex command. /// Get the quickfix/location list stack to use for the specified Ex command.
/// For a location list command, returns the stack for the current window. If /// For a location list command, returns the stack for the current window. If
/// the location list is not found, then returns NULL and prints an error /// the location list is not found, then returns NULL and prints an error
/// message if 'print_emsg' is TRUE. /// message if 'print_emsg' is true.
static qf_info_T *qf_cmd_get_stack(exarg_T *eap, int print_emsg) static qf_info_T *qf_cmd_get_stack(exarg_T *eap, int print_emsg)
{ {
qf_info_T *qi = &ql_info; qf_info_T *qi = &ql_info;
@ -2511,7 +2511,7 @@ static win_T *qf_find_win_with_normal_buf(void)
} }
// Go to a window in any tabpage containing the specified file. Returns true // Go to a window in any tabpage containing the specified file. Returns true
// if successfully jumped to the window. Otherwise returns FALSE. // if successfully jumped to the window. Otherwise returns false.
static bool qf_goto_tabwin_with_file(int fnum) static bool qf_goto_tabwin_with_file(int fnum)
{ {
FOR_ALL_TAB_WINDOWS(tp, wp) { FOR_ALL_TAB_WINDOWS(tp, wp) {
@ -3393,7 +3393,7 @@ bool qf_mark_adjust(win_T *wp, linenr_T line1, linenr_T line2, linenr_T amount,
found_one = true; found_one = true;
if (qfp->qf_lnum >= line1 && qfp->qf_lnum <= line2) { if (qfp->qf_lnum >= line1 && qfp->qf_lnum <= line2) {
if (amount == MAXLNUM) { if (amount == MAXLNUM) {
qfp->qf_cleared = TRUE; qfp->qf_cleared = true;
} else { } else {
qfp->qf_lnum += amount; qfp->qf_lnum += amount;
} }
@ -3747,7 +3747,7 @@ linenr_T qf_current_entry(win_T *wp)
} }
/// Update the cursor position in the quickfix window to the current error. /// Update the cursor position in the quickfix window to the current error.
/// Return TRUE if there is a quickfix window. /// Return true if there is a quickfix window.
/// ///
/// @param old_qf_index previous qf_index or zero /// @param old_qf_index previous qf_index or zero
static bool qf_win_pos_update(qf_info_T *qi, int old_qf_index) static bool qf_win_pos_update(qf_info_T *qi, int old_qf_index)
@ -4175,7 +4175,7 @@ static void qf_jump_first(qf_info_T *qi, unsigned save_qfid, int forceit)
} }
} }
// Return TRUE when using ":vimgrep" for ":grep". // Return true when using ":vimgrep" for ":grep".
int grep_internal(cmdidx_T cmdidx) int grep_internal(cmdidx_T cmdidx)
{ {
return (cmdidx == CMD_grep return (cmdidx == CMD_grep
@ -4832,7 +4832,7 @@ static void qf_get_nth_below_entry(qfline_T *entry_arg, linenr_T n, bool linewis
} }
/// Get the nth quickfix entry above the specified entry. Searches backwards in /// Get the nth quickfix entry above the specified entry. Searches backwards in
/// the list. If linewise is TRUE, then treat multiple entries on a single line /// the list. If linewise is true, then treat multiple entries on a single line
/// as one. /// as one.
static void qf_get_nth_above_entry(qfline_T *entry, linenr_T n, bool linewise, int *errornr) static void qf_get_nth_above_entry(qfline_T *entry, linenr_T n, bool linewise, int *errornr)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
@ -5609,7 +5609,7 @@ static buf_T *load_dummy_buffer(char *fname, char *dirname_start, char *resultin
if (readfile_result == OK if (readfile_result == OK
&& !got_int && !got_int
&& !(curbuf->b_flags & BF_NEW)) { && !(curbuf->b_flags & BF_NEW)) {
failed = FALSE; failed = false;
if (curbuf != newbuf) { if (curbuf != newbuf) {
// Bloody autocommands changed the buffer! Can happen when // Bloody autocommands changed the buffer! Can happen when
// using netrw and editing a remote file. Use the current // using netrw and editing a remote file. Use the current
@ -5677,7 +5677,7 @@ static void wipe_dummy_buffer(buf_T *buf, char *dirname_start)
cleanup_T cs; cleanup_T cs;
// Reset the error/interrupt/exception state here so that aborting() // Reset the error/interrupt/exception state here so that aborting()
// returns FALSE when wiping out the buffer. Otherwise it doesn't // returns false when wiping out the buffer. Otherwise it doesn't
// work when got_int is set. // work when got_int is set.
enter_cleanup(&cs); enter_cleanup(&cs);

144
src/nvim/search.c
View File

@ -354,10 +354,8 @@ char_u *last_search_pattern(void)
return spats[RE_SEARCH].pat; return spats[RE_SEARCH].pat;
} }
/* /// Return true when case should be ignored for search pattern "pat".
* Return TRUE when case should be ignored for search pattern "pat". /// Uses the 'ignorecase' and 'smartcase' options.
* Uses the 'ignorecase' and 'smartcase' options.
*/
int ignorecase(char_u *pat) int ignorecase(char_u *pat)
{ {
return ignorecase_opt(pat, p_ic, p_scs); return ignorecase_opt(pat, p_ic, p_scs);
@ -423,7 +421,7 @@ int last_csearch_forward(void)
int last_csearch_until(void) int last_csearch_until(void)
{ {
return last_t_cmd == TRUE; return last_t_cmd == true;
} }
void set_last_csearch(int c, char_u *s, int len) void set_last_csearch(int c, char_u *s, int len)
@ -480,8 +478,8 @@ void set_last_search_pat(const char_u *s, int idx, int magic, int setlast)
spats[idx].no_scs = false; spats[idx].no_scs = false;
spats[idx].off.dir = '/'; spats[idx].off.dir = '/';
set_vv_searchforward(); set_vv_searchforward();
spats[idx].off.line = FALSE; spats[idx].off.line = false;
spats[idx].off.end = FALSE; spats[idx].off.end = false;
spats[idx].off.off = 0; spats[idx].off.off = 0;
if (setlast) { if (setlast) {
last_idx = idx; last_idx = idx;
@ -610,11 +608,11 @@ int searchit(win_T *win, buf_T *buf, pos_T *pos, pos_T *end_pos, Direction dir,
start_pos = *pos; // remember start pos for detecting no match start_pos = *pos; // remember start pos for detecting no match
found = 0; // default: not found found = 0; // default: not found
at_first_line = TRUE; // default: start in first line at_first_line = true; // default: start in first line
if (pos->lnum == 0) { // correct lnum for when starting in line 0 if (pos->lnum == 0) { // correct lnum for when starting in line 0
pos->lnum = 1; pos->lnum = 1;
pos->col = 0; pos->col = 0;
at_first_line = FALSE; // not in first line now at_first_line = false; // not in first line now
} }
/* /*
@ -627,14 +625,14 @@ int searchit(win_T *win, buf_T *buf, pos_T *pos, pos_T *end_pos, Direction dir,
if (dir == BACKWARD && start_pos.col == 0 if (dir == BACKWARD && start_pos.col == 0
&& (options & SEARCH_START) == 0) { && (options & SEARCH_START) == 0) {
lnum = pos->lnum - 1; lnum = pos->lnum - 1;
at_first_line = FALSE; at_first_line = false;
} else { } else {
lnum = pos->lnum; lnum = pos->lnum;
} }
for (loop = 0; loop <= 1; loop++) { // loop twice if 'wrapscan' set for (loop = 0; loop <= 1; loop++) { // loop twice if 'wrapscan' set
for (; lnum > 0 && lnum <= buf->b_ml.ml_line_count; for (; lnum > 0 && lnum <= buf->b_ml.ml_line_count;
lnum += dir, at_first_line = FALSE) { lnum += dir, at_first_line = false) {
// Stop after checking "stop_lnum", if it's set. // Stop after checking "stop_lnum", if it's set.
if (stop_lnum != 0 && (dir == FORWARD if (stop_lnum != 0 && (dir == FORWARD
? lnum > stop_lnum : lnum < stop_lnum)) { ? lnum > stop_lnum : lnum < stop_lnum)) {
@ -901,7 +899,7 @@ int searchit(win_T *win, buf_T *buf, pos_T *pos, pos_T *end_pos, Direction dir,
break; // if second loop, stop where started break; // if second loop, stop where started
} }
} }
at_first_line = FALSE; at_first_line = false;
// vim_regexec_multi() may clear "regprog" // vim_regexec_multi() may clear "regprog"
if (regmatch.regprog == NULL) { if (regmatch.regprog == NULL) {
@ -1006,22 +1004,22 @@ static int first_submatch(regmmatch_T *rp)
/// Highest level string search function. /// Highest level string search function.
/// Search for the 'count'th occurrence of pattern 'pat' in direction 'dirc' /// Search for the 'count'th occurrence of pattern 'pat' in direction 'dirc'
/// ///
/// Careful: If spats[0].off.line == TRUE and spats[0].off.off == 0 this /// Careful: If spats[0].off.line == true and spats[0].off.off == 0 this
/// makes the movement linewise without moving the match position. /// makes the movement linewise without moving the match position.
/// ///
/// @param dirc if 0: use previous dir. /// @param dirc if 0: use previous dir.
/// @param pat NULL or empty : use previous string. /// @param pat NULL or empty : use previous string.
/// @param options if TRUE and /// @param options if true and
/// SEARCH_REV == TRUE : go in reverse of previous dir. /// SEARCH_REV == true : go in reverse of previous dir.
/// SEARCH_ECHO == TRUE : echo the search command and handle options /// SEARCH_ECHO == true : echo the search command and handle options
/// SEARCH_MSG == TRUE : may give error message /// SEARCH_MSG == true : may give error message
/// SEARCH_OPT == TRUE : interpret optional flags /// SEARCH_OPT == true : interpret optional flags
/// SEARCH_HIS == TRUE : put search pattern in history /// SEARCH_HIS == true : put search pattern in history
/// SEARCH_NOOF == TRUE : don't add offset to position /// SEARCH_NOOF == true : don't add offset to position
/// SEARCH_MARK == TRUE : set previous context mark /// SEARCH_MARK == true : set previous context mark
/// SEARCH_KEEP == TRUE : keep previous search pattern /// SEARCH_KEEP == true : keep previous search pattern
/// SEARCH_START == TRUE : accept match at curpos itself /// SEARCH_START == true : accept match at curpos itself
/// SEARCH_PEEK == TRUE : check for typed char, cancel search /// SEARCH_PEEK == true : check for typed char, cancel search
/// @param oap can be NULL /// @param oap can be NULL
/// @param dirc '/' or '?' /// @param dirc '/' or '?'
/// @param search_delim delimiter for search, e.g. '%' in s%regex%replacement /// @param search_delim delimiter for search, e.g. '%' in s%regex%replacement
@ -1137,8 +1135,8 @@ int do_search(oparg_T *oap, int dirc, int search_delim, char_u *pat, long count,
dircp = p; // remember where we put the NUL dircp = p; // remember where we put the NUL
*p++ = NUL; *p++ = NUL;
} }
spats[0].off.line = FALSE; spats[0].off.line = false;
spats[0].off.end = FALSE; spats[0].off.end = false;
spats[0].off.off = 0; spats[0].off.off = 0;
// Check for a line offset or a character offset. // Check for a line offset or a character offset.
// For get_address (echo off) we don't check for a character // For get_address (echo off) we don't check for a character
@ -1435,7 +1433,7 @@ int do_search(oparg_T *oap, int dirc, int search_delim, char_u *pat, long count,
setpcmark(); setpcmark();
} }
curwin->w_cursor = pos; curwin->w_cursor = pos;
curwin->w_set_curswant = TRUE; curwin->w_set_curswant = true;
end_do_search: end_do_search:
if ((options & SEARCH_KEEP) || (cmdmod.cmod_flags & CMOD_KEEPPATTERNS)) { if ((options & SEARCH_KEEP) || (cmdmod.cmod_flags & CMOD_KEEPPATTERNS)) {
@ -1519,12 +1517,10 @@ int search_for_exact_line(buf_T *buf, pos_T *pos, Direction dir, char_u *pat)
* Character Searches * Character Searches
*/ */
/* /// Search for a character in a line. If "t_cmd" is false, move to the
* Search for a character in a line. If "t_cmd" is FALSE, move to the /// position of the character, otherwise move to just before the char.
* position of the character, otherwise move to just before the char. /// Do this "cap->count1" times.
* Do this "cap->count1" times. /// Return FAIL or OK.
* Return FAIL or OK.
*/
int searchc(cmdarg_T *cap, int t_cmd) int searchc(cmdarg_T *cap, int t_cmd)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {
@ -2520,7 +2516,7 @@ int findsent(Direction dir, long count)
for (;;) { // find end of sentence for (;;) { // find end of sentence
c = gchar_pos(&pos); c = gchar_pos(&pos);
if (c == NUL || (pos.col == 0 && startPS(pos.lnum, NUL, FALSE))) { if (c == NUL || (pos.col == 0 && startPS(pos.lnum, NUL, false))) {
if (dir == BACKWARD && pos.lnum != startlnum) { if (dir == BACKWARD && pos.lnum != startlnum) {
pos.lnum++; pos.lnum++;
} }
@ -2581,11 +2577,11 @@ found:
/// Paragraphs are currently supposed to be separated by empty lines. /// Paragraphs are currently supposed to be separated by empty lines.
/// If 'what' is NUL we go to the next paragraph. /// If 'what' is NUL we go to the next paragraph.
/// If 'what' is '{' or '}' we go to the next section. /// If 'what' is '{' or '}' we go to the next section.
/// If 'both' is TRUE also stop at '}'. /// If 'both' is true also stop at '}'.
/// ///
/// @param pincl Return: true if last char is to be included /// @param pincl Return: true if last char is to be included
/// ///
/// @return TRUE if the next paragraph or section was found. /// @return true if the next paragraph or section was found.
bool findpar(bool *pincl, int dir, long count, int what, int both) bool findpar(bool *pincl, int dir, long count, int what, int both)
{ {
linenr_T curr; linenr_T curr;
@ -2676,11 +2672,9 @@ static int inmacro(char_u *opt, char_u *s)
return macro[0] != NUL; return macro[0] != NUL;
} }
/* /// startPS: return true if line 'lnum' is the start of a section or paragraph.
* startPS: return TRUE if line 'lnum' is the start of a section or paragraph. /// If 'para' is '{' or '}' only check for sections.
* If 'para' is '{' or '}' only check for sections. /// If 'both' is true also stop at '}'
* If 'both' is TRUE also stop at '}'
*/
int startPS(linenr_T lnum, int para, int both) int startPS(linenr_T lnum, int para, int both)
{ {
char_u *s; char_u *s;
@ -2712,12 +2706,12 @@ int startPS(linenr_T lnum, int para, int both)
* 2 or higher - keyword characters (letters, digits and underscore) * 2 or higher - keyword characters (letters, digits and underscore)
*/ */
static int cls_bigword; // TRUE for "W", "B" or "E" static int cls_bigword; // true for "W", "B" or "E"
/* /*
* cls() - returns the class of character at curwin->w_cursor * cls() - returns the class of character at curwin->w_cursor
* *
* If a 'W', 'B', or 'E' motion is being done (cls_bigword == TRUE), chars * If a 'W', 'B', or 'E' motion is being done (cls_bigword == true), chars
* from class 2 and higher are reported as class 1 since only white space * from class 2 and higher are reported as class 1 since only white space
* boundaries are of interest. * boundaries are of interest.
*/ */
@ -2732,7 +2726,7 @@ static int cls(void)
c = utf_class(c); c = utf_class(c);
// If cls_bigword is TRUE, report all non-blanks as class 1. // If cls_bigword is true, report all non-blanks as class 1.
if (c != 0 && cls_bigword) { if (c != 0 && cls_bigword) {
return 1; return 1;
} }
@ -2742,7 +2736,7 @@ static int cls(void)
/// fwd_word(count, type, eol) - move forward one word /// fwd_word(count, type, eol) - move forward one word
/// ///
/// @return FAIL if the cursor was already at the end of the file. /// @return FAIL if the cursor was already at the end of the file.
/// If eol is TRUE, last word stops at end of line (for operators). /// If eol is true, last word stops at end of line (for operators).
/// ///
/// @param bigword "W", "E" or "B" /// @param bigword "W", "E" or "B"
int fwd_word(long count, int bigword, int eol) int fwd_word(long count, int bigword, int eol)
@ -2809,7 +2803,7 @@ int fwd_word(long count, int bigword, int eol)
/* /*
* bck_word() - move backward 'count' words * bck_word() - move backward 'count' words
* *
* If stop is TRUE and we are already on the start of a word, move one less. * If stop is true and we are already on the start of a word, move one less.
* *
* Returns FAIL if top of the file was reached. * Returns FAIL if top of the file was reached.
*/ */
@ -2855,7 +2849,7 @@ int bck_word(long count, int bigword, int stop)
inc_cursor(); // overshot - forward one inc_cursor(); // overshot - forward one
finished: finished:
stop = FALSE; stop = false;
} }
return OK; return OK;
} }
@ -2872,8 +2866,8 @@ finished:
* *
* Returns FAIL if end of the file was reached. * Returns FAIL if end of the file was reached.
* *
* If stop is TRUE and we are already on the end of a word, move one less. * If stop is true and we are already on the end of a word, move one less.
* If empty is TRUE stop on an empty line. * If empty is true stop on an empty line.
*/ */
int end_word(long count, int bigword, int stop, int empty) int end_word(long count, int bigword, int stop, int empty)
{ {
@ -2906,7 +2900,7 @@ int end_word(long count, int bigword, int stop, int empty)
} else if (!stop || sclass == 0) { } else if (!stop || sclass == 0) {
/* /*
* We were at the end of a word. Go to the end of the next word. * We were at the end of a word. Go to the end of the next word.
* First skip white space, if 'empty' is TRUE, stop at empty line. * First skip white space, if 'empty' is true, stop at empty line.
*/ */
while (cls() == 0) { while (cls() == 0) {
if (empty && curwin->w_cursor.col == 0 if (empty && curwin->w_cursor.col == 0
@ -2927,14 +2921,14 @@ int end_word(long count, int bigword, int stop, int empty)
} }
dec_cursor(); // overshot - one char backward dec_cursor(); // overshot - one char backward
finished: finished:
stop = FALSE; // we move only one word less stop = false; // we move only one word less
} }
return OK; return OK;
} }
/// Move back to the end of the word. /// Move back to the end of the word.
/// ///
/// @param bigword TRUE for "B" /// @param bigword true for "B"
/// @param eol if true, then stop at end of line. /// @param eol if true, then stop at end of line.
/// ///
/// @return FAIL if start of the file was reached. /// @return FAIL if start of the file was reached.
@ -3046,14 +3040,14 @@ static void findsent_forward(long count, bool at_start_sent)
/// Find word under cursor, cursor at end. /// Find word under cursor, cursor at end.
/// Used while an operator is pending, and in Visual mode. /// Used while an operator is pending, and in Visual mode.
/// ///
/// @param include TRUE: include word and white space /// @param include true: include word and white space
/// @param bigword FALSE == word, TRUE == WORD /// @param bigword false == word, true == WORD
int current_word(oparg_T *oap, long count, int include, int bigword) int current_word(oparg_T *oap, long count, int include, int bigword)
{ {
pos_T start_pos; pos_T start_pos;
pos_T pos; pos_T pos;
bool inclusive = true; bool inclusive = true;
int include_white = FALSE; int include_white = false;
cls_bigword = bigword; cls_bigword = bigword;
clearpos(&start_pos); clearpos(&start_pos);
@ -3080,7 +3074,7 @@ int current_word(oparg_T *oap, long count, int include, int bigword)
* not be included ("word"), find end of word. * not be included ("word"), find end of word.
*/ */
if ((cls() == 0) == include) { if ((cls() == 0) == include) {
if (end_word(1L, bigword, TRUE, TRUE) == FAIL) { if (end_word(1L, bigword, true, true) == FAIL) {
return FAIL; return FAIL;
} }
} else { } else {
@ -3091,7 +3085,7 @@ int current_word(oparg_T *oap, long count, int include, int bigword)
* If we end up in the first column of the next line (single char * If we end up in the first column of the next line (single char
* word) back up to end of the line. * word) back up to end of the line.
*/ */
fwd_word(1L, bigword, TRUE); fwd_word(1L, bigword, true);
if (curwin->w_cursor.col == 0) { if (curwin->w_cursor.col == 0) {
decl(&curwin->w_cursor); decl(&curwin->w_cursor);
} else { } else {
@ -3099,7 +3093,7 @@ int current_word(oparg_T *oap, long count, int include, int bigword)
} }
if (include) { if (include) {
include_white = TRUE; include_white = true;
} }
} }
@ -3127,7 +3121,7 @@ int current_word(oparg_T *oap, long count, int include, int bigword)
return FAIL; return FAIL;
} }
if (include != (cls() != 0)) { if (include != (cls() != 0)) {
if (bck_word(1L, bigword, TRUE) == FAIL) { if (bck_word(1L, bigword, true) == FAIL) {
return FAIL; return FAIL;
} }
} else { } else {
@ -3144,7 +3138,7 @@ int current_word(oparg_T *oap, long count, int include, int bigword)
return FAIL; return FAIL;
} }
if (include != (cls() == 0)) { if (include != (cls() == 0)) {
if (fwd_word(1L, bigword, TRUE) == FAIL && count > 1) { if (fwd_word(1L, bigword, true) == FAIL && count > 1) {
return FAIL; return FAIL;
} }
/* /*
@ -3156,7 +3150,7 @@ int current_word(oparg_T *oap, long count, int include, int bigword)
inclusive = false; inclusive = false;
} }
} else { } else {
if (end_word(1L, bigword, TRUE, TRUE) == FAIL) { if (end_word(1L, bigword, true, true) == FAIL) {
return FAIL; return FAIL;
} }
} }
@ -3378,7 +3372,7 @@ extend:
/// Find block under the cursor, cursor at end. /// Find block under the cursor, cursor at end.
/// "what" and "other" are two matching parenthesis/brace/etc. /// "what" and "other" are two matching parenthesis/brace/etc.
/// ///
/// @param include TRUE == include white space /// @param include true == include white space
/// @param what '(', '{', etc. /// @param what '(', '{', etc.
/// @param other ')', '}', etc. /// @param other ')', '}', etc.
int current_block(oparg_T *oap, long count, int include, int what, int other) int current_block(oparg_T *oap, long count, int include, int what, int other)
@ -3453,7 +3447,7 @@ int current_block(oparg_T *oap, long count, int include, int what, int other)
} }
curwin->w_cursor = *end_pos; curwin->w_cursor = *end_pos;
// Try to exclude the '(', '{', ')', '}', etc. when "include" is FALSE. // Try to exclude the '(', '{', ')', '}', etc. when "include" is false.
// If the ending '}', ')' or ']' is only preceded by indent, skip that // If the ending '}', ')' or ']' is only preceded by indent, skip that
// indent. But only if the resulting area is not smaller than what we // indent. But only if the resulting area is not smaller than what we
// started with. // started with.
@ -3764,7 +3758,7 @@ theend:
return retval; return retval;
} }
/// @param include TRUE == include white space /// @param include true == include white space
/// @param type 'p' for paragraph, 'S' for section /// @param type 'p' for paragraph, 'S' for section
int current_par(oparg_T *oap, long count, int include, int type) int current_par(oparg_T *oap, long count, int include, int type)
{ {
@ -3775,7 +3769,7 @@ int current_par(oparg_T *oap, long count, int include, int type)
int start_is_white; int start_is_white;
int prev_start_is_white; int prev_start_is_white;
int retval = OK; int retval = OK;
int do_white = FALSE; int do_white = false;
int t; int t;
int i; int i;
@ -4394,7 +4388,7 @@ int current_search(long count, bool forward)
/// If move is true, check from the beginning of the buffer, /// If move is true, check from the beginning of the buffer,
/// else from position "cur". /// else from position "cur".
/// "direction" is FORWARD or BACKWARD. /// "direction" is FORWARD or BACKWARD.
/// Returns TRUE, FALSE or -1 for failure. /// Returns true, false or -1 for failure.
static int is_zero_width(char_u *pattern, int move, pos_T *cur, Direction direction) static int is_zero_width(char_u *pattern, int move, pos_T *cur, Direction direction)
{ {
regmmatch_T regmatch; regmmatch_T regmatch;
@ -4451,9 +4445,7 @@ static int is_zero_width(char_u *pattern, int move, pos_T *cur, Direction direct
return result; return result;
} }
/* /// return true if line 'lnum' is empty or has white chars only.
* return TRUE if line 'lnum' is empty or has white chars only.
*/
int linewhite(linenr_T lnum) int linewhite(linenr_T lnum)
{ {
char_u *p; char_u *p;
@ -5377,7 +5369,7 @@ void find_pattern_in_path(char_u *ptr, Direction dir, size_t len, bool whole, bo
if (incl_regmatch.regprog == NULL) { if (incl_regmatch.regprog == NULL) {
goto fpip_end; goto fpip_end;
} }
incl_regmatch.rm_ic = FALSE; // don't ignore case in incl. pat. incl_regmatch.rm_ic = false; // don't ignore case in incl. pat.
} }
if (type == FIND_DEFINE && (*curbuf->b_p_def != NUL || *p_def != NUL)) { if (type == FIND_DEFINE && (*curbuf->b_p_def != NUL || *p_def != NUL)) {
def_regmatch.regprog = vim_regcomp(*curbuf->b_p_def == NUL def_regmatch.regprog = vim_regcomp(*curbuf->b_p_def == NUL
@ -5386,7 +5378,7 @@ void find_pattern_in_path(char_u *ptr, Direction dir, size_t len, bool whole, bo
if (def_regmatch.regprog == NULL) { if (def_regmatch.regprog == NULL) {
goto fpip_end; goto fpip_end;
} }
def_regmatch.rm_ic = FALSE; // don't ignore case in define pat. def_regmatch.rm_ic = false; // don't ignore case in define pat.
} }
files = xcalloc((size_t)max_path_depth, sizeof(SearchedFile)); files = xcalloc((size_t)max_path_depth, sizeof(SearchedFile));
old_files = max_path_depth; old_files = max_path_depth;
@ -5419,7 +5411,7 @@ void find_pattern_in_path(char_u *ptr, Direction dir, size_t len, bool whole, bo
new_fname = file_name_in_line(incl_regmatch.endp[0], 0, new_fname = file_name_in_line(incl_regmatch.endp[0], 0,
FNAME_EXP|FNAME_INCL|FNAME_REL, 1L, p_fname, NULL); FNAME_EXP|FNAME_INCL|FNAME_REL, 1L, p_fname, NULL);
} }
already_searched = FALSE; already_searched = false;
if (new_fname != NULL) { if (new_fname != NULL) {
// Check whether we have already searched in this file // Check whether we have already searched in this file
for (i = 0;; i++) { for (i = 0;; i++) {
@ -5539,7 +5531,7 @@ void find_pattern_in_path(char_u *ptr, Direction dir, size_t len, bool whole, bo
bigger[i].fp = NULL; bigger[i].fp = NULL;
bigger[i].name = NULL; bigger[i].name = NULL;
bigger[i].lnum = 0; bigger[i].lnum = 0;
bigger[i].matched = FALSE; bigger[i].matched = false;
} }
for (i = old_files; i < max_path_depth; i++) { for (i = old_files; i < max_path_depth; i++) {
bigger[i + max_path_depth] = files[i]; bigger[i + max_path_depth] = files[i];
@ -5560,7 +5552,7 @@ void find_pattern_in_path(char_u *ptr, Direction dir, size_t len, bool whole, bo
} }
files[depth].name = curr_fname = new_fname; files[depth].name = curr_fname = new_fname;
files[depth].lnum = 0; files[depth].lnum = 0;
files[depth].matched = FALSE; files[depth].matched = false;
if (action == ACTION_EXPAND) { if (action == ACTION_EXPAND) {
msg_hist_off = true; // reset in msg_trunc_attr() msg_hist_off = true; // reset in msg_trunc_attr()
vim_snprintf((char *)IObuff, IOSIZE, vim_snprintf((char *)IObuff, IOSIZE,
@ -5814,7 +5806,7 @@ search_line:
} }
if (action != ACTION_SHOW) { if (action != ACTION_SHOW) {
curwin->w_cursor.col = (colnr_T)(startp - line); curwin->w_cursor.col = (colnr_T)(startp - line);
curwin->w_set_curswant = TRUE; curwin->w_set_curswant = true;
} }
if (l_g_do_tagpreview != 0 if (l_g_do_tagpreview != 0
@ -5957,7 +5949,7 @@ static void show_pat_in_path(char_u *line, int type, bool did_show, int action,
msg_puts_attr((const char *)IObuff, HL_ATTR(HLF_N)); msg_puts_attr((const char *)IObuff, HL_ATTR(HLF_N));
msg_puts(" "); msg_puts(" ");
} }
msg_prt_line(line, FALSE); msg_prt_line(line, false);
ui_flush(); // show one line at a time ui_flush(); // show one line at a time
// Definition continues until line that doesn't end with '\' // Definition continues until line that doesn't end with '\'

8
src/nvim/spellfile.c
View File

@ -440,7 +440,7 @@ typedef struct spellinfo_S {
sblock_T *si_blocks; // memory blocks used sblock_T *si_blocks; // memory blocks used
long si_blocks_cnt; // memory blocks allocated long si_blocks_cnt; // memory blocks allocated
int si_did_emsg; // TRUE when ran out of memory int si_did_emsg; // true when ran out of memory
long si_compress_cnt; // words to add before lowering long si_compress_cnt; // words to add before lowering
// compression limit // compression limit
@ -454,7 +454,7 @@ typedef struct spellinfo_S {
int si_ascii; // handling only ASCII words int si_ascii; // handling only ASCII words
int si_add; // addition file int si_add; // addition file
int si_clear_chartab; // when TRUE clear char tables int si_clear_chartab; // when true clear char tables
int si_region; // region mask int si_region; // region mask
vimconv_T si_conv; // for conversion to 'encoding' vimconv_T si_conv; // for conversion to 'encoding'
int si_memtot; // runtime memory used int si_memtot; // runtime memory used
@ -1924,7 +1924,7 @@ static void spell_clear_flags(wordnode_T *node)
wordnode_T *np; wordnode_T *np;
for (np = node; np != NULL; np = np->wn_sibling) { for (np = node; np != NULL; np = np->wn_sibling) {
np->wn_u1.index = FALSE; np->wn_u1.index = false;
spell_clear_flags(np->wn_child); spell_clear_flags(np->wn_child);
} }
} }
@ -1940,7 +1940,7 @@ static void spell_print_node(wordnode_T *node, int depth)
msg((char_u *)line2); msg((char_u *)line2);
msg((char_u *)line3); msg((char_u *)line3);
} else { } else {
node->wn_u1.index = TRUE; node->wn_u1.index = true;
if (node->wn_byte != NUL) { if (node->wn_byte != NUL) {
if (node->wn_child != NULL) { if (node->wn_child != NULL) {

96
src/nvim/syntax.c
View File

@ -812,9 +812,7 @@ static void restore_chartab(char_u *chartab)
} }
} }
/* /// Return true if the line-continuation pattern matches in line "lnum".
* Return TRUE if the line-continuation pattern matches in line "lnum".
*/
static int syn_match_linecont(linenr_T lnum) static int syn_match_linecont(linenr_T lnum)
{ {
if (syn_block->b_syn_linecont_prog != NULL) { if (syn_block->b_syn_linecont_prog != NULL) {
@ -832,7 +830,7 @@ static int syn_match_linecont(linenr_T lnum)
restore_chartab(buf_chartab); restore_chartab(buf_chartab);
return r; return r;
} }
return FALSE; return false;
} }
/* /*
@ -878,7 +876,7 @@ static void syn_update_ends(bool startofline)
cur_si->si_m_endpos.lnum = 0; cur_si->si_m_endpos.lnum = 0;
cur_si->si_m_endpos.col = 0; cur_si->si_m_endpos.col = 0;
cur_si->si_h_endpos = cur_si->si_m_endpos; cur_si->si_h_endpos = cur_si->si_m_endpos;
cur_si->si_ends = TRUE; cur_si->si_ends = true;
} }
} }
} }
@ -1345,7 +1343,7 @@ static void load_current_state(synstate_T *from)
if (keepend_level < 0 && (CUR_STATE(i).si_flags & HL_KEEPEND)) { if (keepend_level < 0 && (CUR_STATE(i).si_flags & HL_KEEPEND)) {
keepend_level = i; keepend_level = i;
} }
CUR_STATE(i).si_ends = FALSE; CUR_STATE(i).si_ends = false;
CUR_STATE(i).si_m_lnum = 0; CUR_STATE(i).si_m_lnum = 0;
if (CUR_STATE(i).si_idx >= 0) { if (CUR_STATE(i).si_idx >= 0) {
CUR_STATE(i).si_next_list = CUR_STATE(i).si_next_list =
@ -1551,7 +1549,7 @@ static bool syn_finish_line(const bool syncing)
/// "col" is normally 0 for the first use in a line, and increments by one each /// "col" is normally 0 for the first use in a line, and increments by one each
/// time. It's allowed to skip characters and to stop before the end of the /// time. It's allowed to skip characters and to stop before the end of the
/// line. But only a "col" after a previously used column is allowed. /// line. But only a "col" after a previously used column is allowed.
/// When "can_spell" is not NULL set it to TRUE when spell-checking should be /// When "can_spell" is not NULL set it to true when spell-checking should be
/// done. /// done.
/// ///
/// @param keep_state keep state of char at "col" /// @param keep_state keep state of char at "col"
@ -1732,7 +1730,7 @@ static int syn_current_attr(const bool syncing, const bool displaying, bool *con
cur_si->si_m_endpos.col = endcol; cur_si->si_m_endpos.col = endcol;
cur_si->si_h_endpos.lnum = current_lnum; cur_si->si_h_endpos.lnum = current_lnum;
cur_si->si_h_endpos.col = endcol; cur_si->si_h_endpos.col = endcol;
cur_si->si_ends = TRUE; cur_si->si_ends = true;
cur_si->si_end_idx = 0; cur_si->si_end_idx = 0;
cur_si->si_flags = flags; cur_si->si_flags = flags;
cur_si->si_seqnr = next_seqnr++; cur_si->si_seqnr = next_seqnr++;
@ -2046,10 +2044,8 @@ static int syn_current_attr(const bool syncing, const bool displaying, bool *con
if (can_spell != NULL) { if (can_spell != NULL) {
struct sp_syn sps; struct sp_syn sps;
/* // set "can_spell" to true if spell checking is supposed to be
* set "can_spell" to TRUE if spell checking is supposed to be // done in the current item.
* done in the current item.
*/
if (syn_block->b_spell_cluster_id == 0) { if (syn_block->b_spell_cluster_id == 0) {
// There is no @Spell cluster: Do spelling for items without // There is no @Spell cluster: Do spelling for items without
// @NoSpell cluster. // @NoSpell cluster.
@ -2192,7 +2188,7 @@ static stateitem_T *push_next_match(void)
} else { } else {
cur_si->si_m_endpos = next_match_m_endpos; cur_si->si_m_endpos = next_match_m_endpos;
cur_si->si_h_endpos = next_match_h_endpos; cur_si->si_h_endpos = next_match_h_endpos;
cur_si->si_ends = TRUE; cur_si->si_ends = true;
cur_si->si_flags |= next_match_flags; cur_si->si_flags |= next_match_flags;
cur_si->si_eoe_pos = next_match_eoe_pos; cur_si->si_eoe_pos = next_match_eoe_pos;
cur_si->si_end_idx = next_match_end_idx; cur_si->si_end_idx = next_match_end_idx;
@ -2216,7 +2212,7 @@ static stateitem_T *push_next_match(void)
cur_si->si_m_lnum = current_lnum; cur_si->si_m_lnum = current_lnum;
cur_si->si_m_endpos = next_match_eos_pos; cur_si->si_m_endpos = next_match_eos_pos;
cur_si->si_h_endpos = next_match_eos_pos; cur_si->si_h_endpos = next_match_eos_pos;
cur_si->si_ends = TRUE; cur_si->si_ends = true;
cur_si->si_end_idx = 0; cur_si->si_end_idx = 0;
cur_si->si_flags = HL_MATCH; cur_si->si_flags = HL_MATCH;
cur_si->si_seqnr = next_seqnr++; cur_si->si_seqnr = next_seqnr++;
@ -2422,7 +2418,7 @@ static void check_keepend(void)
limit_pos_zero(&sip->si_m_endpos, &maxpos); limit_pos_zero(&sip->si_m_endpos, &maxpos);
limit_pos_zero(&sip->si_h_endpos, &maxpos_h); limit_pos_zero(&sip->si_h_endpos, &maxpos_h);
limit_pos_zero(&sip->si_eoe_pos, &maxpos); limit_pos_zero(&sip->si_eoe_pos, &maxpos);
sip->si_ends = TRUE; sip->si_ends = true;
} }
if (sip->si_ends && (sip->si_flags & HL_KEEPEND)) { if (sip->si_ends && (sip->si_flags & HL_KEEPEND)) {
if (maxpos.lnum == 0 if (maxpos.lnum == 0
@ -2482,12 +2478,12 @@ static void update_si_end(stateitem_T *sip, int startcol, bool force)
// No end pattern matched. // No end pattern matched.
if (SYN_ITEMS(syn_block)[sip->si_idx].sp_flags & HL_ONELINE) { if (SYN_ITEMS(syn_block)[sip->si_idx].sp_flags & HL_ONELINE) {
// a "oneline" never continues in the next line // a "oneline" never continues in the next line
sip->si_ends = TRUE; sip->si_ends = true;
sip->si_m_endpos.lnum = current_lnum; sip->si_m_endpos.lnum = current_lnum;
sip->si_m_endpos.col = (colnr_T)STRLEN(syn_getcurline()); sip->si_m_endpos.col = (colnr_T)STRLEN(syn_getcurline());
} else { } else {
// continues in the next line // continues in the next line
sip->si_ends = FALSE; sip->si_ends = false;
sip->si_m_endpos.lnum = 0; sip->si_m_endpos.lnum = 0;
} }
sip->si_h_endpos = sip->si_m_endpos; sip->si_h_endpos = sip->si_m_endpos;
@ -2496,7 +2492,7 @@ static void update_si_end(stateitem_T *sip, int startcol, bool force)
sip->si_m_endpos = endpos; sip->si_m_endpos = endpos;
sip->si_h_endpos = hl_endpos; sip->si_h_endpos = hl_endpos;
sip->si_eoe_pos = end_endpos; sip->si_eoe_pos = end_endpos;
sip->si_ends = TRUE; sip->si_ends = true;
sip->si_end_idx = end_idx; sip->si_end_idx = end_idx;
} }
} }
@ -2888,7 +2884,7 @@ static char_u *syn_getcurline(void)
/* /*
* Call vim_regexec() to find a match with "rmp" in "syn_buf". * Call vim_regexec() to find a match with "rmp" in "syn_buf".
* Returns TRUE when there is a match. * Returns true when there is a match.
*/ */
static int syn_regexec(regmmatch_T *rmp, linenr_T lnum, colnr_T col, syn_time_T *st) static int syn_regexec(regmmatch_T *rmp, linenr_T lnum, colnr_T col, syn_time_T *st)
{ {
@ -2929,9 +2925,9 @@ static int syn_regexec(regmmatch_T *rmp, linenr_T lnum, colnr_T col, syn_time_T
if (r > 0) { if (r > 0) {
rmp->startpos[0].lnum += lnum; rmp->startpos[0].lnum += lnum;
rmp->endpos[0].lnum += lnum; rmp->endpos[0].lnum += lnum;
return TRUE; return true;
} }
return FALSE; return false;
} }
/// Check one position in a line for a matching keyword. /// Check one position in a line for a matching keyword.
@ -3471,7 +3467,7 @@ void syn_maybe_enable(void)
/// Handle ":syntax [list]" command: list current syntax words. /// Handle ":syntax [list]" command: list current syntax words.
/// ///
/// @param syncing when TRUE: list syncing items /// @param syncing when true: list syncing items
static void syn_cmd_list(exarg_T *eap, int syncing) static void syn_cmd_list(exarg_T *eap, int syncing)
{ {
char_u *arg = (char_u *)eap->arg; char_u *arg = (char_u *)eap->arg;
@ -4006,7 +4002,7 @@ static void add_keyword(char_u *const name, const int id, const int flags,
kp->k_char = conceal_char; kp->k_char = conceal_char;
kp->k_syn.cont_in_list = copy_id_list(cont_in_list); kp->k_syn.cont_in_list = copy_id_list(cont_in_list);
if (cont_in_list != NULL) { if (cont_in_list != NULL) {
curwin->w_s->b_syn_containedin = TRUE; curwin->w_s->b_syn_containedin = true;
} }
kp->next_list = copy_id_list(next_list); kp->next_list = copy_id_list(next_list);
@ -4063,7 +4059,7 @@ static char_u *get_group_name(char_u *arg, char_u **name_end)
/// ///
/// @param arg next argument to be checked /// @param arg next argument to be checked
/// @param opt various things /// @param opt various things
/// @param skip TRUE if skipping over command /// @param skip true if skipping over command
/// ///
/// @return a pointer to the next argument (which isn't an option). /// @return a pointer to the next argument (which isn't an option).
/// Return NULL for any error; /// Return NULL for any error;
@ -4428,7 +4424,7 @@ error:
/// ///
/// Also ":syntax sync match {name} [[grouphere | groupthere] {group-name}] .." /// Also ":syntax sync match {name} [[grouphere | groupthere] {group-name}] .."
/// ///
/// @param syncing TRUE for ":syntax sync match .. " /// @param syncing true for ":syntax sync match .. "
static void syn_cmd_match(exarg_T *eap, int syncing) static void syn_cmd_match(exarg_T *eap, int syncing)
{ {
char_u *arg = (char_u *)eap->arg; char_u *arg = (char_u *)eap->arg;
@ -4490,7 +4486,7 @@ static void syn_cmd_match(exarg_T *eap, int syncing)
spp->sp_syn.cont_in_list = syn_opt_arg.cont_in_list; spp->sp_syn.cont_in_list = syn_opt_arg.cont_in_list;
spp->sp_cchar = conceal_char; spp->sp_cchar = conceal_char;
if (syn_opt_arg.cont_in_list != NULL) { if (syn_opt_arg.cont_in_list != NULL) {
curwin->w_s->b_syn_containedin = TRUE; curwin->w_s->b_syn_containedin = true;
} }
spp->sp_next_list = syn_opt_arg.next_list; spp->sp_next_list = syn_opt_arg.next_list;
@ -4526,7 +4522,7 @@ static void syn_cmd_match(exarg_T *eap, int syncing)
/// Handle ":syntax region {group-name} [matchgroup={group-name}] /// Handle ":syntax region {group-name} [matchgroup={group-name}]
/// start {start} .. [skip {skip}] end {end} .. [{options}]". /// start {start} .. [skip {skip}] end {end} .. [{options}]".
/// ///
/// @param syncing TRUE for ":syntax sync region .." /// @param syncing true for ":syntax sync region .."
static void syn_cmd_region(exarg_T *eap, int syncing) static void syn_cmd_region(exarg_T *eap, int syncing)
{ {
char_u *arg = (char_u *)eap->arg; char_u *arg = (char_u *)eap->arg;
@ -4705,7 +4701,7 @@ static void syn_cmd_region(exarg_T *eap, int syncing)
SYN_ITEMS(curwin->w_s)[idx].sp_syn.cont_in_list = SYN_ITEMS(curwin->w_s)[idx].sp_syn.cont_in_list =
syn_opt_arg.cont_in_list; syn_opt_arg.cont_in_list;
if (syn_opt_arg.cont_in_list != NULL) { if (syn_opt_arg.cont_in_list != NULL) {
curwin->w_s->b_syn_containedin = TRUE; curwin->w_s->b_syn_containedin = true;
} }
SYN_ITEMS(curwin->w_s)[idx].sp_next_list = SYN_ITEMS(curwin->w_s)[idx].sp_next_list =
syn_opt_arg.next_list; syn_opt_arg.next_list;
@ -5154,7 +5150,7 @@ static void syn_cmd_sync(exarg_T *eap, int syncing)
char *cpo_save; char *cpo_save;
if (ends_excmd(*arg_start)) { if (ends_excmd(*arg_start)) {
syn_cmd_list(eap, TRUE); syn_cmd_list(eap, true);
return; return;
} }
@ -5189,7 +5185,7 @@ static void syn_cmd_sync(exarg_T *eap, int syncing)
arg_end = (char *)key + 9; arg_end = (char *)key + 9;
} }
if (arg_end[-1] != '=' || !ascii_isdigit(*arg_end)) { if (arg_end[-1] != '=' || !ascii_isdigit(*arg_end)) {
illegal = TRUE; illegal = true;
break; break;
} }
linenr_T n = getdigits_int32(&arg_end, false, 0); linenr_T n = getdigits_int32(&arg_end, false, 0);
@ -5214,7 +5210,7 @@ static void syn_cmd_sync(exarg_T *eap, int syncing)
} }
if (curwin->w_s->b_syn_linecont_pat != NULL) { if (curwin->w_s->b_syn_linecont_pat != NULL) {
emsg(_("E403: syntax sync: line continuations pattern specified twice")); emsg(_("E403: syntax sync: line continuations pattern specified twice"));
finished = TRUE; finished = true;
break; break;
} }
arg_end = (char *)skip_regexp(next_arg + 1, *next_arg, true, NULL); arg_end = (char *)skip_regexp(next_arg + 1, *next_arg, true, NULL);
@ -5247,15 +5243,15 @@ static void syn_cmd_sync(exarg_T *eap, int syncing)
} else { } else {
eap->arg = (char *)next_arg; eap->arg = (char *)next_arg;
if (STRCMP(key, "MATCH") == 0) { if (STRCMP(key, "MATCH") == 0) {
syn_cmd_match(eap, TRUE); syn_cmd_match(eap, true);
} else if (STRCMP(key, "REGION") == 0) { } else if (STRCMP(key, "REGION") == 0) {
syn_cmd_region(eap, TRUE); syn_cmd_region(eap, true);
} else if (STRCMP(key, "CLEAR") == 0) { } else if (STRCMP(key, "CLEAR") == 0) {
syn_cmd_clear(eap, TRUE); syn_cmd_clear(eap, true);
} else { } else {
illegal = TRUE; illegal = true;
} }
finished = TRUE; finished = true;
break; break;
} }
arg_start = next_arg; arg_start = next_arg;
@ -5364,7 +5360,7 @@ static int get_id_list(char_u **const arg, const int keylen, int16_t **const lis
break; break;
} }
regmatch.rm_ic = TRUE; regmatch.rm_ic = true;
id = 0; id = 0;
for (int i = highlight_num_groups(); --i >= 0;) { for (int i = highlight_num_groups(); --i >= 0;) {
if (vim_regexec(&regmatch, (char *)highlight_group_name(i), (colnr_T)0)) { if (vim_regexec(&regmatch, (char *)highlight_group_name(i), (colnr_T)0)) {
@ -5472,7 +5468,7 @@ static int in_id_list(stateitem_T *cur_si, int16_t *list, struct sp_syn *ssp, in
static int depth = 0; static int depth = 0;
int r; int r;
// If ssp has a "containedin" list and "cur_si" is in it, return TRUE. // If ssp has a "containedin" list and "cur_si" is in it, return true.
if (cur_si != NULL && ssp->cont_in_list != NULL if (cur_si != NULL && ssp->cont_in_list != NULL
&& !(cur_si->si_flags & HL_MATCH)) { && !(cur_si->si_flags & HL_MATCH)) {
// Ignore transparent items without a contains argument. Double check // Ignore transparent items without a contains argument. Double check
@ -5486,12 +5482,12 @@ static int in_id_list(stateitem_T *cur_si, int16_t *list, struct sp_syn *ssp, in
&(SYN_ITEMS(syn_block)[cur_si->si_idx].sp_syn), &(SYN_ITEMS(syn_block)[cur_si->si_idx].sp_syn),
SYN_ITEMS(syn_block)[cur_si->si_idx].sp_flags & SYN_ITEMS(syn_block)[cur_si->si_idx].sp_flags &
HL_CONTAINED)) { HL_CONTAINED)) {
return TRUE; return true;
} }
} }
if (list == NULL) { if (list == NULL) {
return FALSE; return false;
} }
/* /*
@ -5502,33 +5498,31 @@ static int in_id_list(stateitem_T *cur_si, int16_t *list, struct sp_syn *ssp, in
return !contained; return !contained;
} }
/* // If the first item is "ALLBUT", return true if "id" is NOT in the
* If the first item is "ALLBUT", return TRUE if "id" is NOT in the // contains list. We also require that "id" is at the same ":syn include"
* contains list. We also require that "id" is at the same ":syn include" // level as the list.
* level as the list.
*/
item = *list; item = *list;
if (item >= SYNID_ALLBUT && item < SYNID_CLUSTER) { if (item >= SYNID_ALLBUT && item < SYNID_CLUSTER) {
if (item < SYNID_TOP) { if (item < SYNID_TOP) {
// ALL or ALLBUT: accept all groups in the same file // ALL or ALLBUT: accept all groups in the same file
if (item - SYNID_ALLBUT != ssp->inc_tag) { if (item - SYNID_ALLBUT != ssp->inc_tag) {
return FALSE; return false;
} }
} else if (item < SYNID_CONTAINED) { } else if (item < SYNID_CONTAINED) {
// TOP: accept all not-contained groups in the same file // TOP: accept all not-contained groups in the same file
if (item - SYNID_TOP != ssp->inc_tag || contained) { if (item - SYNID_TOP != ssp->inc_tag || contained) {
return FALSE; return false;
} }
} else { } else {
// CONTAINED: accept all contained groups in the same file // CONTAINED: accept all contained groups in the same file
if (item - SYNID_CONTAINED != ssp->inc_tag || !contained) { if (item - SYNID_CONTAINED != ssp->inc_tag || !contained) {
return FALSE; return false;
} }
} }
item = *++list; item = *++list;
retval = FALSE; retval = false;
} else { } else {
retval = TRUE; retval = true;
} }
/* /*
@ -5832,7 +5826,7 @@ int syn_get_stack_item(int i)
{ {
if (i >= current_state.ga_len) { if (i >= current_state.ga_len) {
// Need to invalidate the state, because we didn't properly finish it // Need to invalidate the state, because we didn't properly finish it
// for the last character, "keep_state" was TRUE. // for the last character, "keep_state" was true.
invalidate_current_state(); invalidate_current_state();
current_col = MAXCOL; current_col = MAXCOL;
return -1; return -1;

48
src/nvim/tag.c
View File

@ -1409,7 +1409,7 @@ int find_tags(char_u *pat, int *num_matches, char ***matchesp, int flags, int mi
int cmplen; int cmplen;
int match; // matches int match; // matches
int match_no_ic = 0; // matches with rm_ic == FALSE int match_no_ic = 0; // matches with rm_ic == false
int match_re; // match with regexp int match_re; // match with regexp
int matchoff = 0; int matchoff = 0;
int save_emsg_off; int save_emsg_off;
@ -1441,7 +1441,7 @@ int find_tags(char_u *pat, int *num_matches, char ***matchesp, int flags, int mi
int help_only = (flags & TAG_HELP); int help_only = (flags & TAG_HELP);
int name_only = (flags & TAG_NAMES); int name_only = (flags & TAG_NAMES);
int noic = (flags & TAG_NOIC); int noic = (flags & TAG_NOIC);
int get_it_again = FALSE; int get_it_again = false;
int use_cscope = (flags & TAG_CSCOPE); int use_cscope = (flags & TAG_CSCOPE);
int verbose = (flags & TAG_VERBOSE); int verbose = (flags & TAG_VERBOSE);
int use_tfu = ((flags & TAG_NO_TAGFUNC) == 0); int use_tfu = ((flags & TAG_NO_TAGFUNC) == 0);
@ -1514,7 +1514,7 @@ int find_tags(char_u *pat, int *num_matches, char ***matchesp, int flags, int mi
} }
save_emsg_off = emsg_off; save_emsg_off = emsg_off;
emsg_off = TRUE; // don't want error for invalid RE here emsg_off = true; // don't want error for invalid RE here
prepare_pats(&orgpat, has_re); prepare_pats(&orgpat, has_re);
emsg_off = save_emsg_off; emsg_off = save_emsg_off;
if (has_re && orgpat.regmatch.regprog == NULL) { if (has_re && orgpat.regmatch.regprog == NULL) {
@ -2009,7 +2009,7 @@ parse_line:
} }
// if tag length does not match, don't try comparing // if tag length does not match, don't try comparing
if (orgpat.len != cmplen) { if (orgpat.len != cmplen) {
match = FALSE; match = false;
} else { } else {
if (orgpat.regmatch.rm_ic) { if (orgpat.regmatch.rm_ic) {
assert(cmplen >= 0); assert(cmplen >= 0);
@ -2026,7 +2026,7 @@ parse_line:
/* /*
* Has a regexp: Also find tags matching regexp. * Has a regexp: Also find tags matching regexp.
*/ */
match_re = FALSE; match_re = false;
if (!match && orgpat.regmatch.regprog != NULL) { if (!match && orgpat.regmatch.regprog != NULL) {
int cc; int cc;
@ -2236,7 +2236,7 @@ parse_line:
if (use_cscope) { if (use_cscope) {
break; break;
} }
orgpat.regmatch.rm_ic = TRUE; // try another time while ignoring case orgpat.regmatch.rm_ic = true; // try another time while ignoring case
} }
if (!stop_searching) { if (!stop_searching) {
@ -2334,7 +2334,7 @@ void free_tag_stuff(void)
/// For help files, use "tags" file only. /// For help files, use "tags" file only.
/// ///
/// @param tnp holds status info /// @param tnp holds status info
/// @param first TRUE when first file name is wanted /// @param first true when first file name is wanted
/// @param buf pointer to buffer of MAXPATHL chars /// @param buf pointer to buffer of MAXPATHL chars
/// ///
/// @return FAIL if no more tag file names, OK otherwise. /// @return FAIL if no more tag file names, OK otherwise.
@ -2395,8 +2395,8 @@ int get_tagfname(tagname_T *tnp, int first, char_u *buf)
/* /*
* Loop until we have found a file name that can be used. * Loop until we have found a file name that can be used.
* There are two states: * There are two states:
* tnp->tn_did_filefind_init == FALSE: setup for next part in 'tags'. * tnp->tn_did_filefind_init == false: setup for next part in 'tags'.
* tnp->tn_did_filefind_init == TRUE: find next file in this part. * tnp->tn_did_filefind_init == true: find next file in this part.
*/ */
for (;;) { for (;;) {
if (tnp->tn_did_filefind_init) { if (tnp->tn_did_filefind_init) {
@ -2405,7 +2405,7 @@ int get_tagfname(tagname_T *tnp, int first, char_u *buf)
break; break;
} }
tnp->tn_did_filefind_init = FALSE; tnp->tn_did_filefind_init = false;
} else { } else {
char_u *filename = NULL; char_u *filename = NULL;
@ -2431,11 +2431,11 @@ int get_tagfname(tagname_T *tnp, int first, char_u *buf)
tnp->tn_search_ctx = vim_findfile_init(buf, filename, tnp->tn_search_ctx = vim_findfile_init(buf, filename,
r_ptr, 100, r_ptr, 100,
FALSE, // don't free visited list false, // don't free visited list
FINDFILE_FILE, // we search for a file FINDFILE_FILE, // we search for a file
tnp->tn_search_ctx, true, (char_u *)curbuf->b_ffname); tnp->tn_search_ctx, true, (char_u *)curbuf->b_ffname);
if (tnp->tn_search_ctx != NULL) { if (tnp->tn_search_ctx != NULL) {
tnp->tn_did_filefind_init = TRUE; tnp->tn_did_filefind_init = true;
} }
} }
} }
@ -2459,7 +2459,7 @@ void tagname_free(tagname_T *tnp)
/// Parse one line from the tags file. Find start/end of tag name, start/end of /// Parse one line from the tags file. Find start/end of tag name, start/end of
/// file name and start of search pattern. /// file name and start of search pattern.
/// ///
/// If is_etag is TRUE, tagp->fname and tagp->fname_end are not set. /// If is_etag is true, tagp->fname and tagp->fname_end are not set.
/// ///
/// @param lbuf line to be parsed /// @param lbuf line to be parsed
/// ///
@ -2510,8 +2510,8 @@ static int parse_tag_line(char_u *lbuf, tagptrs_T *tagp)
* Static tags produced by the new ctags program have the format: * Static tags produced by the new ctags program have the format:
* 'tag file /pattern/;"<Tab>file:' " * 'tag file /pattern/;"<Tab>file:' "
* *
* Return TRUE if it is a static tag and adjust *tagname to the real tag. * Return true if it is a static tag and adjust *tagname to the real tag.
* Return FALSE if it is not a static tag. * Return false if it is not a static tag.
*/ */
static bool test_for_static(tagptrs_T *tagp) static bool test_for_static(tagptrs_T *tagp)
{ {
@ -2522,11 +2522,11 @@ static bool test_for_static(tagptrs_T *tagp)
while ((p = (char_u *)vim_strchr((char *)p, '\t')) != NULL) { while ((p = (char_u *)vim_strchr((char *)p, '\t')) != NULL) {
p++; p++;
if (STRNCMP(p, "file:", 5) == 0) { if (STRNCMP(p, "file:", 5) == 0) {
return TRUE; return true;
} }
} }
return FALSE; return false;
} }
// Returns the length of a matching tag line. // Returns the length of a matching tag line.
@ -2640,7 +2640,7 @@ static char_u *tag_full_fname(tagptrs_T *tagp)
/// ///
/// @param lbuf_arg line from the tags file for this tag /// @param lbuf_arg line from the tags file for this tag
/// @param forceit :ta with ! /// @param forceit :ta with !
/// @param keep_help keep help flag (FALSE for cscope) /// @param keep_help keep help flag (false for cscope)
/// ///
/// @return OK for success, NOTAGFILE when file not found, FAIL otherwise. /// @return OK for success, NOTAGFILE when file not found, FAIL otherwise.
static int jumpto_tag(const char_u *lbuf_arg, int forceit, int keep_help) static int jumpto_tag(const char_u *lbuf_arg, int forceit, int keep_help)
@ -2732,7 +2732,7 @@ static int jumpto_tag(const char_u *lbuf_arg, int forceit, int keep_help)
* into a fullpath * into a fullpath
*/ */
if (!curwin->w_p_pvw) { if (!curwin->w_p_pvw) {
full_fname = (char_u *)FullName_save((char *)fname, FALSE); full_fname = (char_u *)FullName_save((char *)fname, false);
fname = full_fname; fname = full_fname;
/* /*
@ -2825,15 +2825,15 @@ static int jumpto_tag(const char_u *lbuf_arg, int forceit, int keep_help)
*/ */
str = pbuf; str = pbuf;
if (pbuf[0] == '/' || pbuf[0] == '?') { if (pbuf[0] == '/' || pbuf[0] == '?') {
str = skip_regexp(pbuf + 1, pbuf[0], FALSE, NULL) + 1; str = skip_regexp(pbuf + 1, pbuf[0], false, NULL) + 1;
} }
if (str > pbuf_end - 1) { // search command with nothing following if (str > pbuf_end - 1) { // search command with nothing following
save_p_ws = p_ws; save_p_ws = p_ws;
save_p_ic = p_ic; save_p_ic = p_ic;
save_p_scs = p_scs; save_p_scs = p_scs;
p_ws = true; // need 'wrapscan' for backward searches p_ws = true; // need 'wrapscan' for backward searches
p_ic = FALSE; // don't ignore case now p_ic = false; // don't ignore case now
p_scs = FALSE; p_scs = false;
save_lnum = curwin->w_cursor.lnum; save_lnum = curwin->w_cursor.lnum;
if (tagp.tagline > 0) { if (tagp.tagline > 0) {
// start search before line from "line:" field // start search before line from "line:" field
@ -3014,13 +3014,13 @@ static char_u *expand_tag_fname(char_u *fname, char_u *const tag_fname, const bo
/* /*
* Check if we have a tag for the buffer with name "buf_ffname". * Check if we have a tag for the buffer with name "buf_ffname".
* This is a bit slow, because of the full path compare in path_full_compare(). * This is a bit slow, because of the full path compare in path_full_compare().
* Return TRUE if tag for file "fname" if tag file "tag_fname" is for current * Return true if tag for file "fname" if tag file "tag_fname" is for current
* file. * file.
*/ */
static int test_for_current(char_u *fname, char_u *fname_end, char_u *tag_fname, char_u *buf_ffname) static int test_for_current(char_u *fname, char_u *fname_end, char_u *tag_fname, char_u *buf_ffname)
{ {
int c; int c;
int retval = FALSE; int retval = false;
char_u *fullname; char_u *fullname;
if (buf_ffname != NULL) { // if the buffer has a name if (buf_ffname != NULL) { // if the buffer has a name

2
src/nvim/usercmd.c
View File

@ -106,7 +106,7 @@ static struct {
/// Return NULL if there is no matching command. /// Return NULL if there is no matching command.
/// ///
/// @param *p end of the command (possibly including count) /// @param *p end of the command (possibly including count)
/// @param full set to TRUE for a full match /// @param full set to true for a full match
/// @param xp used for completion, NULL otherwise /// @param xp used for completion, NULL otherwise
/// @param complp completion flags or NULL /// @param complp completion flags or NULL
char *find_ucmd(exarg_T *eap, char *p, int *full, expand_T *xp, int *complp) char *find_ucmd(exarg_T *eap, char *p, int *full, expand_T *xp, int *complp)

8
src/nvim/version.c
View File

@ -2016,7 +2016,7 @@ void ex_version(exarg_T *eap)
/// Output a string for the version message. If it's going to wrap, output a /// Output a string for the version message. If it's going to wrap, output a
/// newline, unless the message is too long to fit on the screen anyway. /// newline, unless the message is too long to fit on the screen anyway.
/// When "wrap" is TRUE wrap the string in []. /// When "wrap" is true wrap the string in [].
/// @param s /// @param s
/// @param wrap /// @param wrap
static void version_msg_wrap(char *s, int wrap) static void version_msg_wrap(char *s, int wrap)
@ -2209,7 +2209,7 @@ void maybe_intro_message(void)
/// Only used when starting Vim on an empty file, without a file name. /// Only used when starting Vim on an empty file, without a file name.
/// Or with the ":intro" command (for Sven :-). /// Or with the ":intro" command (for Sven :-).
/// ///
/// @param colon TRUE for ":intro" /// @param colon true for ":intro"
void intro_message(int colon) void intro_message(int colon)
{ {
int i; int i;
@ -2326,6 +2326,6 @@ static void do_intro_line(long row, char_u *mesg, int attr)
void ex_intro(exarg_T *eap) void ex_intro(exarg_T *eap)
{ {
screenclear(); screenclear();
intro_message(TRUE); intro_message(true);
wait_return(TRUE); wait_return(true);
} }

9
src/nvim/vim.h
View File

@ -167,15 +167,6 @@ enum {
#define MIN_SWAP_PAGE_SIZE 1048 #define MIN_SWAP_PAGE_SIZE 1048
#define MAX_SWAP_PAGE_SIZE 50000 #define MAX_SWAP_PAGE_SIZE 50000
// Boolean constants
#ifndef TRUE
# define FALSE 0 // note: this is an int, not a long!
# define TRUE 1
#endif
#define MAYBE 2 // sometimes used for a variant on TRUE
#define STATUS_HEIGHT 1 // height of a status line under a window #define STATUS_HEIGHT 1 // height of a status line under a window
#define QF_WINHEIGHT 10 // default height for quickfix window #define QF_WINHEIGHT 10 // default height for quickfix window

10
src/nvim/window.c
View File

@ -1299,9 +1299,9 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir)
} else { } else {
curfrp = oldwin->w_frame; curfrp = oldwin->w_frame;
if (flags & WSP_BELOW) { if (flags & WSP_BELOW) {
before = FALSE; before = false;
} else if (flags & WSP_ABOVE) { } else if (flags & WSP_ABOVE) {
before = TRUE; before = true;
} else if (flags & WSP_VERT) { } else if (flags & WSP_VERT) {
before = !p_spr; before = !p_spr;
} else { } else {
@ -3096,7 +3096,7 @@ void win_free_all(void)
cmdwin_type = 0; cmdwin_type = 0;
while (first_tabpage->tp_next != NULL) { while (first_tabpage->tp_next != NULL) {
tabpage_close(TRUE); tabpage_close(true);
} }
while (lastwin != NULL && lastwin->w_floating) { while (lastwin != NULL && lastwin->w_floating) {
@ -4025,7 +4025,7 @@ static tabpage_T *alloc_tabpage(void)
// Init t: variables. // Init t: variables.
tp->tp_vars = tv_dict_alloc(); tp->tp_vars = tv_dict_alloc();
init_var_dict(tp->tp_vars, &tp->tp_winvar, VAR_SCOPE); init_var_dict(tp->tp_vars, &tp->tp_winvar, VAR_SCOPE);
tp->tp_diff_invalid = TRUE; tp->tp_diff_invalid = true;
tp->tp_ch_used = p_ch; tp->tp_ch_used = p_ch;
return tp; return tp;
@ -4836,7 +4836,7 @@ static void win_enter_ext(win_T *const wp, const int flags)
} }
if (!curwin_invalid) { if (!curwin_invalid) {
prevwin = curwin; // remember for CTRL-W p prevwin = curwin; // remember for CTRL-W p
curwin->w_redr_status = TRUE; curwin->w_redr_status = true;
} }
curwin = wp; curwin = wp;
curbuf = wp->w_buffer; curbuf = wp->w_buffer;