diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-03-25 19:52:20 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-03-29 10:08:46 +0300 |
| commit | 630ff33dc144a64b5488b4132c0fc4351a5c84db (patch) | |
| tree | 9eeb1d1dab68736bfb6396d5c28bbc2c4d5b13ee /src | |
| parent | ed4948a93317bf801eb2454fd5597a4388730a7b (diff) | |
| download | rneovim-630ff33dc144a64b5488b4132c0fc4351a5c84db.tar.gz rneovim-630ff33dc144a64b5488b4132c0fc4351a5c84db.tar.bz2 rneovim-630ff33dc144a64b5488b4132c0fc4351a5c84db.zip | |
unittests: Test locks section
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval/typval.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c index c245b9222e..185dd0e86c 100644 --- a/src/nvim/eval/typval.c +++ b/src/nvim/eval/typval.c @@ -1956,6 +1956,7 @@ void tv_copy(typval_T *const from, typval_T *const to) /// @param[in] deep Levels to (un)lock, -1 to (un)lock everything. /// @param[in] lock True if it is needed to lock an item, false to unlock. void tv_item_lock(typval_T *const tv, const int deep, const bool lock) + FUNC_ATTR_NONNULL_ALL { // TODO(ZyX-I): Make this not recursive static int recurse = 0; @@ -2031,13 +2032,13 @@ void tv_item_lock(typval_T *const tv, const int deep, const bool lock) bool tv_islocked(const typval_T *const tv) FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL { - return ((tv->v_lock & VAR_LOCKED) + return ((tv->v_lock == VAR_LOCKED) || (tv->v_type == VAR_LIST && tv->vval.v_list != NULL - && (tv->vval.v_list->lv_lock & VAR_LOCKED)) + && (tv->vval.v_list->lv_lock == VAR_LOCKED)) || (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL - && (tv->vval.v_dict->dv_lock & VAR_LOCKED))); + && (tv->vval.v_dict->dv_lock == VAR_LOCKED))); } /// Return true if typval is locked |