Mercurial > vim
comparison src/regexp.c @ 26534:28745eec1dda v8.2.3796
patch 8.2.3796: the funcexe_T struct members are not named consistently
Commit: https://github.com/vim/vim/commit/851f86b951cdd67ad9cf3149e46169d1375c8d82
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Dec 13 14:26:44 2021 +0000
patch 8.2.3796: the funcexe_T struct members are not named consistently
Problem: The funcexe_T struct members are not named consistently.
Solution: Prefix "fe_" to all the members.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 13 Dec 2021 15:30:03 +0100 |
parents | ef0c07cbf53f |
children | 48d6f187e9c0 |
comparison
equal
deleted
inserted
replaced
26533:88b2affbddd9 | 26534:28745eec1dda |
---|---|
2031 rettv.vval.v_string = NULL; | 2031 rettv.vval.v_string = NULL; |
2032 argv[0].v_type = VAR_LIST; | 2032 argv[0].v_type = VAR_LIST; |
2033 argv[0].vval.v_list = &matchList.sl_list; | 2033 argv[0].vval.v_list = &matchList.sl_list; |
2034 matchList.sl_list.lv_len = 0; | 2034 matchList.sl_list.lv_len = 0; |
2035 CLEAR_FIELD(funcexe); | 2035 CLEAR_FIELD(funcexe); |
2036 funcexe.argv_func = fill_submatch_list; | 2036 funcexe.fe_argv_func = fill_submatch_list; |
2037 funcexe.evaluate = TRUE; | 2037 funcexe.fe_evaluate = TRUE; |
2038 if (expr->v_type == VAR_FUNC) | 2038 if (expr->v_type == VAR_FUNC) |
2039 { | 2039 { |
2040 s = expr->vval.v_string; | 2040 s = expr->vval.v_string; |
2041 call_func(s, -1, &rettv, 1, argv, &funcexe); | 2041 call_func(s, -1, &rettv, 1, argv, &funcexe); |
2042 } | 2042 } |
2043 else if (expr->v_type == VAR_PARTIAL) | 2043 else if (expr->v_type == VAR_PARTIAL) |
2044 { | 2044 { |
2045 partial_T *partial = expr->vval.v_partial; | 2045 partial_T *partial = expr->vval.v_partial; |
2046 | 2046 |
2047 s = partial_name(partial); | 2047 s = partial_name(partial); |
2048 funcexe.partial = partial; | 2048 funcexe.fe_partial = partial; |
2049 call_func(s, -1, &rettv, 1, argv, &funcexe); | 2049 call_func(s, -1, &rettv, 1, argv, &funcexe); |
2050 } | 2050 } |
2051 if (matchList.sl_list.lv_len > 0) | 2051 if (matchList.sl_list.lv_len > 0) |
2052 // fill_submatch_list() was called | 2052 // fill_submatch_list() was called |
2053 clear_submatch_list(&matchList); | 2053 clear_submatch_list(&matchList); |