comparison src/evalfunc.c @ 18265:fe5afdc03bd2 v8.1.2127

patch 8.1.2127: the indent.c file is a bit big Commit: https://github.com/vim/vim/commit/14c01f83487d5c53192297a710eda2b8a4ab17c9 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Oct 9 22:53:08 2019 +0200 patch 8.1.2127: the indent.c file is a bit big Problem: The indent.c file is a bit big. Solution: Move C-indent code a a new cindent.c file. Move other indent-related code to indent.c. (Yegappan Lakshmanan, closes #5031)
author Bram Moolenaar <Bram@vim.org>
date Wed, 09 Oct 2019 23:00:04 +0200
parents c8a53c0daeed
children 9f51d0cef8da
comparison
equal deleted inserted replaced
18264:5202d9b99bee 18265:fe5afdc03bd2
49 #ifdef FEAT_FLOAT 49 #ifdef FEAT_FLOAT
50 static void f_ceil(typval_T *argvars, typval_T *rettv); 50 static void f_ceil(typval_T *argvars, typval_T *rettv);
51 #endif 51 #endif
52 static void f_changenr(typval_T *argvars, typval_T *rettv); 52 static void f_changenr(typval_T *argvars, typval_T *rettv);
53 static void f_char2nr(typval_T *argvars, typval_T *rettv); 53 static void f_char2nr(typval_T *argvars, typval_T *rettv);
54 static void f_cindent(typval_T *argvars, typval_T *rettv);
55 static void f_col(typval_T *argvars, typval_T *rettv); 54 static void f_col(typval_T *argvars, typval_T *rettv);
56 static void f_confirm(typval_T *argvars, typval_T *rettv); 55 static void f_confirm(typval_T *argvars, typval_T *rettv);
57 static void f_copy(typval_T *argvars, typval_T *rettv); 56 static void f_copy(typval_T *argvars, typval_T *rettv);
58 #ifdef FEAT_FLOAT 57 #ifdef FEAT_FLOAT
59 static void f_cos(typval_T *argvars, typval_T *rettv); 58 static void f_cos(typval_T *argvars, typval_T *rettv);
106 static void f_hasmapto(typval_T *argvars, typval_T *rettv); 105 static void f_hasmapto(typval_T *argvars, typval_T *rettv);
107 static void f_hlID(typval_T *argvars, typval_T *rettv); 106 static void f_hlID(typval_T *argvars, typval_T *rettv);
108 static void f_hlexists(typval_T *argvars, typval_T *rettv); 107 static void f_hlexists(typval_T *argvars, typval_T *rettv);
109 static void f_hostname(typval_T *argvars, typval_T *rettv); 108 static void f_hostname(typval_T *argvars, typval_T *rettv);
110 static void f_iconv(typval_T *argvars, typval_T *rettv); 109 static void f_iconv(typval_T *argvars, typval_T *rettv);
111 static void f_indent(typval_T *argvars, typval_T *rettv);
112 static void f_index(typval_T *argvars, typval_T *rettv); 110 static void f_index(typval_T *argvars, typval_T *rettv);
113 static void f_input(typval_T *argvars, typval_T *rettv); 111 static void f_input(typval_T *argvars, typval_T *rettv);
114 static void f_inputdialog(typval_T *argvars, typval_T *rettv); 112 static void f_inputdialog(typval_T *argvars, typval_T *rettv);
115 static void f_inputlist(typval_T *argvars, typval_T *rettv); 113 static void f_inputlist(typval_T *argvars, typval_T *rettv);
116 static void f_inputrestore(typval_T *argvars, typval_T *rettv); 114 static void f_inputrestore(typval_T *argvars, typval_T *rettv);
126 static void f_len(typval_T *argvars, typval_T *rettv); 124 static void f_len(typval_T *argvars, typval_T *rettv);
127 static void f_libcall(typval_T *argvars, typval_T *rettv); 125 static void f_libcall(typval_T *argvars, typval_T *rettv);
128 static void f_libcallnr(typval_T *argvars, typval_T *rettv); 126 static void f_libcallnr(typval_T *argvars, typval_T *rettv);
129 static void f_line(typval_T *argvars, typval_T *rettv); 127 static void f_line(typval_T *argvars, typval_T *rettv);
130 static void f_line2byte(typval_T *argvars, typval_T *rettv); 128 static void f_line2byte(typval_T *argvars, typval_T *rettv);
131 static void f_lispindent(typval_T *argvars, typval_T *rettv);
132 static void f_localtime(typval_T *argvars, typval_T *rettv); 129 static void f_localtime(typval_T *argvars, typval_T *rettv);
133 #ifdef FEAT_FLOAT 130 #ifdef FEAT_FLOAT
134 static void f_log(typval_T *argvars, typval_T *rettv); 131 static void f_log(typval_T *argvars, typval_T *rettv);
135 static void f_log10(typval_T *argvars, typval_T *rettv); 132 static void f_log10(typval_T *argvars, typval_T *rettv);
136 #endif 133 #endif
1489 } 1486 }
1490 else 1487 else
1491 rettv->vval.v_number = tv_get_string(&argvars[0])[0]; 1488 rettv->vval.v_number = tv_get_string(&argvars[0])[0];
1492 } 1489 }
1493 1490
1494 /*
1495 * "cindent(lnum)" function
1496 */
1497 static void
1498 f_cindent(typval_T *argvars UNUSED, typval_T *rettv)
1499 {
1500 #ifdef FEAT_CINDENT
1501 pos_T pos;
1502 linenr_T lnum;
1503
1504 pos = curwin->w_cursor;
1505 lnum = tv_get_lnum(argvars);
1506 if (lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count)
1507 {
1508 curwin->w_cursor.lnum = lnum;
1509 rettv->vval.v_number = get_c_indent();
1510 curwin->w_cursor = pos;
1511 }
1512 else
1513 #endif
1514 rettv->vval.v_number = -1;
1515 }
1516
1517 win_T * 1491 win_T *
1518 get_optional_window(typval_T *argvars, int idx) 1492 get_optional_window(typval_T *argvars, int idx)
1519 { 1493 {
1520 win_T *win = curwin; 1494 win_T *win = curwin;
1521 1495
3944 vim_free(from); 3918 vim_free(from);
3945 vim_free(to); 3919 vim_free(to);
3946 } 3920 }
3947 3921
3948 /* 3922 /*
3949 * "indent()" function
3950 */
3951 static void
3952 f_indent(typval_T *argvars, typval_T *rettv)
3953 {
3954 linenr_T lnum;
3955
3956 lnum = tv_get_lnum(argvars);
3957 if (lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count)
3958 rettv->vval.v_number = get_indent_lnum(lnum);
3959 else
3960 rettv->vval.v_number = -1;
3961 }
3962
3963 /*
3964 * "index()" function 3923 * "index()" function
3965 */ 3924 */
3966 static void 3925 static void
3967 f_index(typval_T *argvars, typval_T *rettv) 3926 f_index(typval_T *argvars, typval_T *rettv)
3968 { 3927 {
4446 else 4405 else
4447 rettv->vval.v_number = ml_find_line_or_offset(curbuf, lnum, NULL); 4406 rettv->vval.v_number = ml_find_line_or_offset(curbuf, lnum, NULL);
4448 if (rettv->vval.v_number >= 0) 4407 if (rettv->vval.v_number >= 0)
4449 ++rettv->vval.v_number; 4408 ++rettv->vval.v_number;
4450 #endif 4409 #endif
4451 }
4452
4453 /*
4454 * "lispindent(lnum)" function
4455 */
4456 static void
4457 f_lispindent(typval_T *argvars UNUSED, typval_T *rettv)
4458 {
4459 #ifdef FEAT_LISP
4460 pos_T pos;
4461 linenr_T lnum;
4462
4463 pos = curwin->w_cursor;
4464 lnum = tv_get_lnum(argvars);
4465 if (lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count)
4466 {
4467 curwin->w_cursor.lnum = lnum;
4468 rettv->vval.v_number = get_lisp_indent();
4469 curwin->w_cursor = pos;
4470 }
4471 else
4472 #endif
4473 rettv->vval.v_number = -1;
4474 } 4410 }
4475 4411
4476 /* 4412 /*
4477 * "localtime()" function 4413 * "localtime()" function
4478 */ 4414 */