Mercurial > vim
diff src/dict.c @ 11418:162bcd0debd7 v8.0.0593
patch 8.0.0593: duplication of code for adding a list or dict return value
commit https://github.com/vim/vim/commit/45cf6e910c6d162775ca9d470fac4b6db844001f
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Apr 30 20:25:19 2017 +0200
patch 8.0.0593: duplication of code for adding a list or dict return value
Problem: Duplication of code for adding a list or dict return value.
Solution: Add rettv_dict_set() and rettv_list_set(). (Yegappan Lakshmanan)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 30 Apr 2017 20:30:04 +0200 |
parents | a54985a73ab2 |
children | 6e81a68d63a1 |
line wrap: on
line diff
--- a/src/dict.c +++ b/src/dict.c @@ -59,14 +59,24 @@ rettv_dict_alloc(typval_T *rettv) if (d == NULL) return FAIL; - rettv->vval.v_dict = d; - rettv->v_type = VAR_DICT; + rettv_dict_set(rettv, d); rettv->v_lock = 0; - ++d->dv_refcount; return OK; } /* + * Set a dictionary as the return value + */ + void +rettv_dict_set(typval_T *rettv, dict_T *d) +{ + rettv->v_type = VAR_DICT; + rettv->vval.v_dict = d; + if (d != NULL) + ++d->dv_refcount; +} + +/* * Free a Dictionary, including all non-container items it contains. * Ignores the reference count. */ @@ -646,11 +656,7 @@ failret: *arg = skipwhite(*arg + 1); if (evaluate) - { - rettv->v_type = VAR_DICT; - rettv->vval.v_dict = d; - ++d->dv_refcount; - } + rettv_dict_set(rettv, d); return OK; }