mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-01 07:28:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use bool for flags in oparg_T.

Browse Source 
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.
This commit is contained in:
Scott Prager
2014-07-07 08:30:43 -04:00
parent e450c541dd
commit f5aee19ac0
5 changed files with 88 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/normal.h
View File

@@ -1,6 +1,7 @@
#ifndef NVIM_NORMAL_H
#define NVIM_NORMAL_H
#include <stdbool.h>
#include "nvim/pos.h"
#include "nvim/buffer_defs.h" // for win_T
@@ -17,11 +18,11 @@ typedef struct oparg_S {
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 */
int use_reg_one; /* TRUE if delete uses reg 1 even when not
bool use_reg_one; /* true if delete uses reg 1 even when not
linewise */
int inclusive; /* TRUE if char motion is inclusive (only
bool inclusive; /* true if char motion is inclusive (only
valid when motion_type is MCHAR */
int end_adjusted; /* backuped b_op_end one char (only used by
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 */
@@ -29,10 +30,10 @@ typedef struct oparg_S {
long line_count; /* number of lines from op_start to op_end
(inclusive) */
int empty; /* op_start and op_end the same (only used by
do_change()) */
int is_VIsual; /* operator on Visual area */
int block_mode; /* current operator is Visual block mode */
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 */