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

ops.c: eliminate unneccesary static variable y_append

Browse Source
This commit is contained in:
Björn Linse 2015-04-11 15:00:22 +02:00
parent 96e9d261cf
commit 84b7a9ac34
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/eval.c
View File

@ -13629,13 +13629,12 @@ static void f_setreg(typval_T *argvars, typval_T *rettv)
int regname; int regname;
char_u *strregname; char_u *strregname;
char_u *stropt; char_u *stropt;
int append; bool append = false;
char_u yank_type; char_u yank_type;
long block_len; long block_len;
block_len = -1; block_len = -1;
yank_type = MAUTO; yank_type = MAUTO;
append = FALSE;
strregname = get_tv_string_chk(argvars); strregname = get_tv_string_chk(argvars);
rettv->vval.v_number = 1; /* FAIL is default */ rettv->vval.v_number = 1; /* FAIL is default */
@ -13653,7 +13652,7 @@ static void f_setreg(typval_T *argvars, typval_T *rettv)
for (; *stropt != NUL; ++stropt) for (; *stropt != NUL; ++stropt)
switch (*stropt) { switch (*stropt) {
case 'a': case 'A': /* append */ case 'a': case 'A': /* append */
append = TRUE; append = true;
break; break;
case 'v': case 'c': /* character-wise selection */ case 'v': case 'c': /* character-wise selection */
yank_type = MCHAR; yank_type = MCHAR;

27
src/nvim/ops.c
View File

@ -71,7 +71,6 @@
static yankreg_T y_regs[NUM_REGISTERS]; static yankreg_T y_regs[NUM_REGISTERS];
static bool y_append; /* true when appending */
static yankreg_T *y_previous = NULL; /* ptr to last written yankreg */ static yankreg_T *y_previous = NULL; /* ptr to last written yankreg */
static bool clipboard_didwarn_unnamed = false; static bool clipboard_didwarn_unnamed = false;
@ -766,7 +765,6 @@ typedef enum {
yankreg_T *get_yank_register(int regname, int mode) yankreg_T *get_yank_register(int regname, int mode)
{ {
yankreg_T *reg; yankreg_T *reg;
y_append = false;
if (mode == YREG_PASTE && get_clipboard(regname, &reg, false)) { if (mode == YREG_PASTE && get_clipboard(regname, &reg, false)) {
// reg is set to clipboard contents. // reg is set to clipboard contents.
@ -782,7 +780,6 @@ yankreg_T *get_yank_register(int regname, int mode)
i = CharOrdLow(regname) + 10; i = CharOrdLow(regname) + 10;
else if (ASCII_ISUPPER(regname)) { else if (ASCII_ISUPPER(regname)) {
i = CharOrdUp(regname) + 10; i = CharOrdUp(regname) + 10;
y_append = true;
} else if (regname == '-') } else if (regname == '-')
i = DELETION_REGISTER; i = DELETION_REGISTER;
else if (regname == '*') else if (regname == '*')
@ -798,6 +795,10 @@ yankreg_T *get_yank_register(int regname, int mode)
return reg; return reg;
} }
static bool is_append_register(int regname)
{
return ASCII_ISUPPER(regname);
}
/* /*
* Obtain the contents of a "normal" register. The register is made empty. * Obtain the contents of a "normal" register. The register is made empty.
@ -923,7 +924,7 @@ static int stuff_yank(int regname, char_u *p)
return OK; return OK;
} }
yankreg_T *reg = get_yank_register(regname, YREG_YANK); yankreg_T *reg = get_yank_register(regname, YREG_YANK);
if (y_append && reg->y_array != NULL) { if (is_append_register(regname) && reg->y_array != NULL) {
char_u **pp = &(reg->y_array[reg->y_size - 1]); char_u **pp = &(reg->y_array[reg->y_size - 1]);
char_u *lp = xmalloc(STRLEN(*pp) + STRLEN(p) + 1); char_u *lp = xmalloc(STRLEN(*pp) + STRLEN(p) + 1);
STRCPY(lp, *pp); STRCPY(lp, *pp);
@ -1416,7 +1417,7 @@ int op_delete(oparg_T *oap)
y_previous = &y_regs[1]; y_previous = &y_regs[1];
y_regs[1].y_array = NULL; /* set register "1 to empty */ y_regs[1].y_array = NULL; /* set register "1 to empty */
reg = &y_regs[1]; reg = &y_regs[1];
op_yank_reg(oap, false, reg); op_yank_reg(oap, false, reg, false);
} }
/* Yank into small delete register when no named register specified /* Yank into small delete register when no named register specified
@ -1424,7 +1425,7 @@ int op_delete(oparg_T *oap)
if (oap->regname == 0 && oap->motion_type != MLINE if (oap->regname == 0 && oap->motion_type != MLINE
&& oap->line_count == 1) { && oap->line_count == 1) {
reg = get_yank_register('-', YREG_YANK); reg = get_yank_register('-', YREG_YANK);
op_yank_reg(oap, false, reg); op_yank_reg(oap, false, reg, false);
} }
if(oap->regname == 0) { if(oap->regname == 0) {
@ -2335,12 +2336,12 @@ bool op_yank(oparg_T *oap, bool message)
} }
yankreg_T *reg = get_yank_register(oap->regname, YREG_YANK); yankreg_T *reg = get_yank_register(oap->regname, YREG_YANK);
op_yank_reg(oap, message, reg); op_yank_reg(oap, message, reg, is_append_register(oap->regname));
set_clipboard(oap->regname, reg); set_clipboard(oap->regname, reg);
return true; return true;
} }
static void op_yank_reg(oparg_T *oap, bool message, yankreg_T *reg) static void op_yank_reg(oparg_T *oap, bool message, yankreg_T *reg, bool append)
{ {
long y_idx; /* index in y_array[] */ long y_idx; /* index in y_array[] */
yankreg_T *curr; /* copy of current register */ yankreg_T *curr; /* copy of current register */
@ -2357,7 +2358,7 @@ static void op_yank_reg(oparg_T *oap, bool message, yankreg_T *reg)
curr = reg; curr = reg;
/* append to existing contents */ /* append to existing contents */
if (y_append && reg->y_array != NULL) if (append && reg->y_array != NULL)
reg = &newreg; reg = &newreg;
else else
free_register(reg); /* free previously yanked lines */ free_register(reg); /* free previously yanked lines */
@ -4761,7 +4762,7 @@ void *get_reg_contents(int regname, int flags)
} }
static yankreg_T *init_write_reg(int name, yankreg_T **old_y_previous, int must_append) static yankreg_T *init_write_reg(int name, yankreg_T **old_y_previous, bool must_append)
{ {
if (!valid_yank_reg(name, true)) { // check for valid reg name if (!valid_yank_reg(name, true)) { // check for valid reg name
emsg_invreg(name); emsg_invreg(name);
@ -4772,7 +4773,7 @@ static yankreg_T *init_write_reg(int name, yankreg_T **old_y_previous, int must_
*old_y_previous = y_previous; *old_y_previous = y_previous;
yankreg_T *reg = get_yank_register(name, YREG_YANK); yankreg_T *reg = get_yank_register(name, YREG_YANK);
if (!y_append && !must_append) { if (!is_append_register(name) && !must_append) {
free_register(reg); free_register(reg);
} }
return reg; return reg;
@ -4799,7 +4800,7 @@ void write_reg_contents(int name, const char_u *str, ssize_t len,
} }
void write_reg_contents_lst(int name, char_u **strings, int maxlen, void write_reg_contents_lst(int name, char_u **strings, int maxlen,
int must_append, int yank_type, long block_len) bool must_append, int yank_type, long block_len)
{ {
if (name == '/' || name == '=') { if (name == '/' || name == '=') {
char_u *s = strings[0]; char_u *s = strings[0];
@ -4850,7 +4851,7 @@ void write_reg_contents_lst(int name, char_u **strings, int maxlen,
void write_reg_contents_ex(int name, void write_reg_contents_ex(int name,
const char_u *str, const char_u *str,
ssize_t len, ssize_t len,
int must_append, bool must_append,
int yank_type, int yank_type,
long block_len) long block_len)
{ {