Mercurial > vim

comparison src/textprop.c @ 15211:de63593896b3 v8.1.0615

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0615: get_tv function names are not consistent commit https://github.com/vim/vim/commit/d155d7a8519987361169459b8d464ae1caef5e9c Author: Bram Moolenaar <Bram@vim.org> Date: Fri Dec 21 16:04:21 2018 +0100 patch 8.1.0615: get_tv function names are not consistent Problem: Get_tv function names are not consistent. Solution: Rename to tv_get.
author Bram Moolenaar <Bram@vim.org>
date Fri, 21 Dec 2018 16:15:06 +0100
parents 4b2de998ebd6
children 17525ca95e1e
comparison
equal deleted inserted replaced
15210:fbb2936c39b6 15211:de63593896b3
152 char_u *props; 152 char_u *props;
153 char_u *newprops; 153 char_u *newprops;
154 textprop_T tmp_prop; 154 textprop_T tmp_prop;
155 int i; 155 int i;
156 156
157 lnum = get_tv_number(&argvars[0]); 157 lnum = tv_get_number(&argvars[0]);
158 col = get_tv_number(&argvars[1]); 158 col = tv_get_number(&argvars[1]);
159 if (col < 1) 159 if (col < 1)
160 { 160 {
161 EMSGN(_(e_invalid_col), (long)col); 161 EMSGN(_(e_invalid_col), (long)col);
162 return; 162 return;
163 } 163 }
350 * prop_clear({lnum} [, {lnum_end} [, {bufnr}]]) 350 * prop_clear({lnum} [, {lnum_end} [, {bufnr}]])
351 */ 351 */
352 void 352 void
353 f_prop_clear(typval_T *argvars, typval_T *rettv UNUSED) 353 f_prop_clear(typval_T *argvars, typval_T *rettv UNUSED)
354 { 354 {
355 linenr_T start = get_tv_number(&argvars[0]); 355 linenr_T start = tv_get_number(&argvars[0]);
356 linenr_T end = start; 356 linenr_T end = start;
357 linenr_T lnum; 357 linenr_T lnum;
358 buf_T *buf = curbuf; 358 buf_T *buf = curbuf;
359 359
360 if (argvars[1].v_type != VAR_UNKNOWN) 360 if (argvars[1].v_type != VAR_UNKNOWN)
361 { 361 {
362 end = get_tv_number(&argvars[1]); 362 end = tv_get_number(&argvars[1]);
363 if (argvars[2].v_type != VAR_UNKNOWN) 363 if (argvars[2].v_type != VAR_UNKNOWN)
364 { 364 {
365 if (get_bufnr_from_arg(&argvars[2], &buf) == FAIL) 365 if (get_bufnr_from_arg(&argvars[2], &buf) == FAIL)
366 return; 366 return;
367 } 367 }
403 * prop_list({lnum} [, {bufnr}]) 403 * prop_list({lnum} [, {bufnr}])
404 */ 404 */
405 void 405 void
406 f_prop_list(typval_T *argvars, typval_T *rettv) 406 f_prop_list(typval_T *argvars, typval_T *rettv)
407 { 407 {
408 linenr_T lnum = get_tv_number(&argvars[0]); 408 linenr_T lnum = tv_get_number(&argvars[0]);
409 buf_T *buf = curbuf; 409 buf_T *buf = curbuf;
410 410
411 if (argvars[1].v_type != VAR_UNKNOWN) 411 if (argvars[1].v_type != VAR_UNKNOWN)
412 { 412 {
413 if (get_bufnr_from_arg(&argvars[1], &buf) == FAIL) 413 if (get_bufnr_from_arg(&argvars[1], &buf) == FAIL)
474 return; 474 return;
475 } 475 }
476 476
477 if (argvars[1].v_type != VAR_UNKNOWN) 477 if (argvars[1].v_type != VAR_UNKNOWN)
478 { 478 {
479 start = get_tv_number(&argvars[1]); 479 start = tv_get_number(&argvars[1]);
480 end = start; 480 end = start;
481 if (argvars[2].v_type != VAR_UNKNOWN) 481 if (argvars[2].v_type != VAR_UNKNOWN)
482 end = get_tv_number(&argvars[2]); 482 end = tv_get_number(&argvars[2]);
483 if (start < 1 || end < 1) 483 if (start < 1 || end < 1)
484 { 484 {
485 EMSG(_(e_invrange)); 485 EMSG(_(e_invrange));
486 return; 486 return;
487 } 487 }
584 buf_T *buf = NULL; 584 buf_T *buf = NULL;
585 dict_T *dict; 585 dict_T *dict;
586 dictitem_T *di; 586 dictitem_T *di;
587 proptype_T *prop; 587 proptype_T *prop;
588 588
589 name = get_tv_string(&argvars[0]); 589 name = tv_get_string(&argvars[0]);
590 if (*name == NUL) 590 if (*name == NUL)
591 { 591 {
592 EMSG(_(e_invarg)); 592 EMSG(_(e_invarg));
593 return; 593 return;
594 } 594 }
654 prop->pt_hl_id = hl_id; 654 prop->pt_hl_id = hl_id;
655 } 655 }
656 656
657 di = dict_find(dict, (char_u *)"priority", -1); 657 di = dict_find(dict, (char_u *)"priority", -1);
658 if (di != NULL) 658 if (di != NULL)
659 prop->pt_priority = get_tv_number(&di->di_tv); 659 prop->pt_priority = tv_get_number(&di->di_tv);
660 660
661 di = dict_find(dict, (char_u *)"start_incl", -1); 661 di = dict_find(dict, (char_u *)"start_incl", -1);
662 if (di != NULL) 662 if (di != NULL)
663 { 663 {
664 if (get_tv_number(&di->di_tv)) 664 if (tv_get_number(&di->di_tv))
665 prop->pt_flags |= PT_FLAG_INS_START_INCL; 665 prop->pt_flags |= PT_FLAG_INS_START_INCL;
666 else 666 else
667 prop->pt_flags &= ~PT_FLAG_INS_START_INCL; 667 prop->pt_flags &= ~PT_FLAG_INS_START_INCL;
668 } 668 }
669 669
670 di = dict_find(dict, (char_u *)"end_incl", -1); 670 di = dict_find(dict, (char_u *)"end_incl", -1);
671 if (di != NULL) 671 if (di != NULL)
672 { 672 {
673 if (get_tv_number(&di->di_tv)) 673 if (tv_get_number(&di->di_tv))
674 prop->pt_flags |= PT_FLAG_INS_END_INCL; 674 prop->pt_flags |= PT_FLAG_INS_END_INCL;
675 else 675 else
676 prop->pt_flags &= ~PT_FLAG_INS_END_INCL; 676 prop->pt_flags &= ~PT_FLAG_INS_END_INCL;
677 } 677 }
678 } 678 }
704 { 704 {
705 char_u *name; 705 char_u *name;
706 buf_T *buf = NULL; 706 buf_T *buf = NULL;
707 hashitem_T *hi; 707 hashitem_T *hi;
708 708
709 name = get_tv_string(&argvars[0]); 709 name = tv_get_string(&argvars[0]);
710 if (*name == NUL) 710 if (*name == NUL)
711 { 711 {
712 EMSG(_(e_invarg)); 712 EMSG(_(e_invarg));
713 return; 713 return;
714 } 714 }
738 * prop_type_get({name} [, {bufnr}]) 738 * prop_type_get({name} [, {bufnr}])
739 */ 739 */
740 void 740 void
741 f_prop_type_get(typval_T *argvars, typval_T *rettv UNUSED) 741 f_prop_type_get(typval_T *argvars, typval_T *rettv UNUSED)
742 { 742 {
743 char_u *name = get_tv_string(&argvars[0]); 743 char_u *name = tv_get_string(&argvars[0]);
744 744
745 if (*name == NUL) 745 if (*name == NUL)
746 { 746 {
747 EMSG(_(e_invarg)); 747 EMSG(_(e_invarg));
748 return; 748 return;