diff options
| author | erw7 <erw7.github@gmail.com> | 2019-05-29 09:33:43 +0900 |
|---|---|---|
| committer | erw7 <erw7.github@gmail.com> | 2019-05-29 12:05:56 +0900 |
| commit | d46aaa074640ef92382e5800297b7c76ed7574da (patch) | |
| tree | 2cad825bacdc78bda76b9cd77362ee75a0a59081 /src/nvim/eval/executor.c | |
| parent | f8f63393c12da88799cb480086922431de60ca0a (diff) | |
| download | rneovim-d46aaa074640ef92382e5800297b7c76ed7574da.tar.gz rneovim-d46aaa074640ef92382e5800297b7c76ed7574da.tar.bz2 rneovim-d46aaa074640ef92382e5800297b7c76ed7574da.zip | |
vim-patch:8.1.0902: incomplete set of assignment operators
Problem: Incomplete set of assignment operators.
Solution: Add /=, *= and %=. (Ozaki Kiichi, closes vim/vim#3931)
https://github.com/vim/vim/commit/ff697e6cef8ced7717a21fd525ab3200b2f1724f
Diffstat (limited to 'src/nvim/eval/executor.c')
| -rw-r--r-- | src/nvim/eval/executor.c | 44 |
1 files changed, 26 insertions, 18 deletions
diff --git a/src/nvim/eval/executor.c b/src/nvim/eval/executor.c index 99298cbbcf..e972c506dd 100644 --- a/src/nvim/eval/executor.c +++ b/src/nvim/eval/executor.c @@ -16,7 +16,7 @@ static char *e_letwrong = N_("E734: Wrong variable type for %s="); char *e_listidx = N_("E684: list index out of range: %" PRId64); -/// Hanle tv1 += tv2, -=, .= +/// Hanle tv1 += tv2, -=, *=, /=, %=, .= /// /// @param[in,out] tv1 First operand, modified typval. /// @param[in] tv2 Second operand. @@ -51,25 +51,31 @@ int eexe_mod_op(typval_T *const tv1, const typval_T *const tv2, if (tv2->v_type == VAR_LIST) { break; } - if (*op == '+' || *op == '-') { - // nr += nr or nr -= nr + if (vim_strchr((char_u *)"+-*/%", *op) != NULL) { + // nr += nr or nr -= nr, nr *= nr, nr /= nr, nr %= nr varnumber_T n = tv_get_number(tv1); if (tv2->v_type == VAR_FLOAT) { float_T f = (float_T)n; - if (*op == '+') { - f += tv2->vval.v_float; - } else { - f -= tv2->vval.v_float; + if (*op == '%') { + break; + } + switch (*op) { + case '+': f += tv2->vval.v_float; break; + case '-': f -= tv2->vval.v_float; break; + case '*': f *= tv2->vval.v_float; break; + case '/': f /= tv2->vval.v_float; break; } tv_clear(tv1); tv1->v_type = VAR_FLOAT; tv1->vval.v_float = f; } else { - if (*op == '+') { - n += tv_get_number(tv2); - } else { - n -= tv_get_number(tv2); + switch (*op) { + case '+': n += tv_get_number(tv2); break; + case '-': n -= tv_get_number(tv2); break; + case '*': n *= tv_get_number(tv2); break; + case '/': n /= tv_get_number(tv2); break; + case '%': n %= tv_get_number(tv2); break; } tv_clear(tv1); tv1->v_type = VAR_NUMBER; @@ -92,18 +98,20 @@ int eexe_mod_op(typval_T *const tv1, const typval_T *const tv2, return OK; } case VAR_FLOAT: { - if (*op == '.' || (tv2->v_type != VAR_FLOAT - && tv2->v_type != VAR_NUMBER - && tv2->v_type != VAR_STRING)) { + if (*op == '%' || *op == '.' + || (tv2->v_type != VAR_FLOAT + && tv2->v_type != VAR_NUMBER + && tv2->v_type != VAR_STRING)) { break; } const float_T f = (tv2->v_type == VAR_FLOAT ? tv2->vval.v_float : (float_T)tv_get_number(tv2)); - if (*op == '+') { - tv1->vval.v_float += f; - } else { - tv1->vval.v_float -= f; + switch (*op) { + case '+': tv1->vval.v_float += f; break; + case '-': tv1->vval.v_float -= f; break; + case '*': tv1->vval.v_float *= f; break; + case '/': tv1->vval.v_float /= f; break; } return OK; } |