mirror of
https://github.com/neovim/neovim.git
synced 2026-01-25 22:51:14 +10:00
f5aee19ac0
Several opart_T members like use_reg_one, end_adjusted, empty, is_VIsual, and block_mode, only ever store TRUE or FALSE, so make this constraint explicit by changing them to bools, and TRUE to true and FALSE to false in the context of their uses. The member, inclusive, has several other uses such as in arithmetic equations and one inequality, but every single assignment (obtained with 'grep -r "inclusive \\="') sets it to either TRUE or FALSE. This also implies that the inequality, "oap->end.coladd < oap->inclusive", can only be true when coladd==0 and inclusive==true, so test for that instead. For consistency, change the first argument of findpar (which ends up being inclusive) to bool. Include stdbool.h for consistency with issue #918. This commit shrinks the size of oparg_T from 128 bytes to 112 (-13%) on my machine.
71 lines
3.2 KiB
C
71 lines
3.2 KiB
C
#ifndef NVIM_NORMAL_H
|
|
#define NVIM_NORMAL_H
|
|
|
|
#include <stdbool.h>
|
|
#include "nvim/pos.h"
|
|
#include "nvim/buffer_defs.h" // for win_T
|
|
|
|
/* Values for find_ident_under_cursor() */
|
|
#define FIND_IDENT 1 /* find identifier (word) */
|
|
#define FIND_STRING 2 /* find any string (WORD) */
|
|
#define FIND_EVAL 4 /* include "->", "[]" and "." */
|
|
|
|
/*
|
|
* Arguments for operators.
|
|
*/
|
|
typedef struct oparg_S {
|
|
int op_type; /* current pending operator type */
|
|
int regname; /* register to use for the operator */
|
|
int motion_type; /* type of the current cursor motion */
|
|
int motion_force; /* force motion type: 'v', 'V' or CTRL-V */
|
|
bool use_reg_one; /* true if delete uses reg 1 even when not
|
|
linewise */
|
|
bool inclusive; /* true if char motion is inclusive (only
|
|
valid when motion_type is MCHAR */
|
|
bool end_adjusted; /* backuped b_op_end one char (only used by
|
|
do_format()) */
|
|
pos_T start; /* start of the operator */
|
|
pos_T end; /* end of the operator */
|
|
pos_T cursor_start; /* cursor position before motion for "gw" */
|
|
|
|
long line_count; /* number of lines from op_start to op_end
|
|
(inclusive) */
|
|
bool empty; /* op_start and op_end the same (only used by
|
|
op_change()) */
|
|
bool is_VIsual; /* operator on Visual area */
|
|
bool block_mode; /* current operator is Visual block mode */
|
|
colnr_T start_vcol; /* start col for block mode operator */
|
|
colnr_T end_vcol; /* end col for block mode operator */
|
|
long prev_opcount; /* ca.opcount saved for K_CURSORHOLD */
|
|
long prev_count0; /* ca.count0 saved for K_CURSORHOLD */
|
|
} oparg_T;
|
|
|
|
/*
|
|
* Arguments for Normal mode commands.
|
|
*/
|
|
typedef struct cmdarg_S {
|
|
oparg_T *oap; /* Operator arguments */
|
|
int prechar; /* prefix character (optional, always 'g') */
|
|
int cmdchar; /* command character */
|
|
int nchar; /* next command character (optional) */
|
|
int ncharC1; /* first composing character (optional) */
|
|
int ncharC2; /* second composing character (optional) */
|
|
int extra_char; /* yet another character (optional) */
|
|
long opcount; /* count before an operator */
|
|
long count0; /* count before command, default 0 */
|
|
long count1; /* count before command, default 1 */
|
|
int arg; /* extra argument from nv_cmds[] */
|
|
int retval; /* return: CA_* values */
|
|
char_u *searchbuf; /* return: pointer to search pattern or NULL */
|
|
} cmdarg_T;
|
|
|
|
/* values for retval: */
|
|
#define CA_COMMAND_BUSY 1 /* skip restarting edit() once */
|
|
#define CA_NO_ADJ_OP_END 2 /* don't adjust operator end */
|
|
|
|
|
|
#ifdef INCLUDE_GENERATED_DECLARATIONS
|
|
# include "normal.h.generated.h"
|
|
#endif
|
|
#endif // NVIM_NORMAL_H
|