Mercurial > vim

comparison src/vim9script.c @ 21120:4d844a65183d v8.2.1111

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1111: inconsistent naming of get_list_tv() and eval_dict() Commit: https://github.com/vim/vim/commit/9a78e6df17033223ebdf499f2b02b2538601c52d Author: Bram Moolenaar <Bram@vim.org> Date: Wed Jul 1 18:29:55 2020 +0200 patch 8.2.1111: inconsistent naming of get_list_tv() and eval_dict() Problem: Inconsistent naming of get_list_tv() and eval_dict(). Solution: Rename get_list_tv() to eval_list(). Similarly for eval_number(), eval_string(), eval_lit_string() and a few others.
author Bram Moolenaar <Bram@vim.org>
date Wed, 01 Jul 2020 18:45:04 +0200
parents 187c3fb42c8f
children 465d6e40e79c
comparison
equal deleted inserted replaced
21119:20dcea08f37b 21120:4d844a65183d
300 from_ptr = arg; 300 from_ptr = arg;
301 arg = skipwhite(arg + 4); 301 arg = skipwhite(arg + 4);
302 tv.v_type = VAR_UNKNOWN; 302 tv.v_type = VAR_UNKNOWN;
303 // TODO: should we accept any expression? 303 // TODO: should we accept any expression?
304 if (*arg == '\'') 304 if (*arg == '\'')
305 ret = get_lit_string_tv(&arg, &tv, TRUE); 305 ret = eval_lit_string(&arg, &tv, TRUE);
306 else if (*arg == '"') 306 else if (*arg == '"')
307 ret = get_string_tv(&arg, &tv, TRUE); 307 ret = eval_string(&arg, &tv, TRUE);
308 if (ret == FAIL || tv.vval.v_string == NULL || *tv.vval.v_string == NUL) 308 if (ret == FAIL || tv.vval.v_string == NULL || *tv.vval.v_string == NUL)
309 { 309 {
310 emsg(_("E1071: Invalid string after \"from\"")); 310 emsg(_("E1071: Invalid string after \"from\""));
311 return NULL; 311 return NULL;
312 } 312 }