IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove long_u: ex_docmd.c: Refactor long_u.

Browse Source
This commit is contained in:
Eliseo Martínez 2015-01-14 11:48:07 +01:00
parent c03913c991
commit b716b047e0
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/eval.c
View File

@ -10332,7 +10332,7 @@ static void get_user_input(typval_T *argvars, typval_T *rettv, int inputdialog)
if (!inputdialog && argvars[2].v_type != VAR_UNKNOWN) { if (!inputdialog && argvars[2].v_type != VAR_UNKNOWN) {
char_u *xp_name; char_u *xp_name;
int xp_namelen; int xp_namelen;
long argt; uint32_t argt;
/* input() with a third argument: completion */ /* input() with a third argument: completion */
rettv->vval.v_string = NULL; rettv->vval.v_string = NULL;

2
src/nvim/ex_cmds_defs.h
View File

@ -96,7 +96,7 @@ struct exarg {
char_u *cmd; ///< the name of the command (except for :make) char_u *cmd; ///< the name of the command (except for :make)
char_u **cmdlinep; ///< pointer to pointer of allocated cmdline char_u **cmdlinep; ///< pointer to pointer of allocated cmdline
cmdidx_T cmdidx; ///< the index for the command cmdidx_T cmdidx; ///< the index for the command
long argt; ///< flags for the command uint32_t argt; ///< flags for the command
int skip; ///< don't execute the command, only parse it int skip; ///< don't execute the command, only parse it
int forceit; ///< TRUE if ! present int forceit; ///< TRUE if ! present
int addr_count; ///< the number of addresses given int addr_count; ///< the number of addresses given

28
src/nvim/ex_docmd.c
View File

@ -12,6 +12,7 @@
#include <string.h> #include <string.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h>
#include <errno.h> #include <errno.h>
#include <inttypes.h> #include <inttypes.h>
@ -77,7 +78,7 @@ static int ex_pressedreturn = FALSE;
typedef struct ucmd { typedef struct ucmd {
char_u *uc_name; /* The command name */ char_u *uc_name; /* The command name */
long_u uc_argt; /* The argument type */ uint32_t uc_argt; /* The argument type */
char_u *uc_rep; /* The command's replacement string */ char_u *uc_rep; /* The command's replacement string */
long uc_def; /* The default value for a range/count */ long uc_def; /* The default value for a range/count */
int uc_compl; /* completion type */ int uc_compl; /* completion type */
@ -1422,7 +1423,7 @@ static char_u * do_one_cmd(char_u **cmdlinep,
goto doend; goto doend;
if (*ea.cmd == '|' || (exmode_active && ea.line1 != ea.line2)) { if (*ea.cmd == '|' || (exmode_active && ea.line1 != ea.line2)) {
ea.cmdidx = CMD_print; ea.cmdidx = CMD_print;
ea.argt = RANGE+COUNT+TRLBAR; ea.argt = RANGE | COUNT | TRLBAR;
if ((errormsg = invalid_range(&ea)) == NULL) { if ((errormsg = invalid_range(&ea)) == NULL) {
correct_range(&ea); correct_range(&ea);
ex_print(&ea); ex_print(&ea);
@ -1509,7 +1510,7 @@ static char_u * do_one_cmd(char_u **cmdlinep,
* 5. parse arguments * 5. parse arguments
*/ */
if (!IS_USER_CMDIDX(ea.cmdidx)) { if (!IS_USER_CMDIDX(ea.cmdidx)) {
ea.argt = (long)cmdnames[(int)ea.cmdidx].cmd_argt; ea.argt = cmdnames[(int)ea.cmdidx].cmd_argt;
} }
if (!ea.skip) { if (!ea.skip) {
@ -2204,7 +2205,7 @@ find_ucmd (
eap->cmdidx = CMD_USER; eap->cmdidx = CMD_USER;
else else
eap->cmdidx = CMD_USER_BUF; eap->cmdidx = CMD_USER_BUF;
eap->argt = (long)uc->uc_argt; eap->argt = uc->uc_argt;
eap->useridx = j; eap->useridx = j;
if (compl != NULL) if (compl != NULL)
@ -2470,7 +2471,7 @@ set_one_cmd_context (
* 5. parse arguments * 5. parse arguments
*/ */
if (!IS_USER_CMDIDX(ea.cmdidx)) { if (!IS_USER_CMDIDX(ea.cmdidx)) {
ea.argt = (long)cmdnames[(int)ea.cmdidx].cmd_argt; ea.argt = cmdnames[(int)ea.cmdidx].cmd_argt;
} }
arg = skipwhite(p); arg = skipwhite(p);
@ -4122,7 +4123,9 @@ char_u *get_command_name(expand_T *xp, int idx)
} }
static int uc_add_command(char_u *name, size_t name_len, char_u *rep, long argt, long def, int flags, int compl, char_u *compl_arg, int force) static int uc_add_command(char_u *name, size_t name_len, char_u *rep,
uint32_t argt, long def, int flags, int compl,
char_u *compl_arg, int force)
{ {
ucmd_T *cmd = NULL; ucmd_T *cmd = NULL;
char_u *p; char_u *p;
@ -4257,7 +4260,7 @@ static void uc_list(char_u *name, size_t name_len)
int found = FALSE; int found = FALSE;
ucmd_T *cmd; ucmd_T *cmd;
int len; int len;
long a; uint32_t a;
garray_T *gap; garray_T *gap;
gap = &curbuf->b_ucmds; gap = &curbuf->b_ucmds;
@ -4265,7 +4268,7 @@ static void uc_list(char_u *name, size_t name_len)
int i; int i;
for (i = 0; i < gap->ga_len; ++i) { for (i = 0; i < gap->ga_len; ++i) {
cmd = USER_CMD_GA(gap, i); cmd = USER_CMD_GA(gap, i);
a = (long)cmd->uc_argt; a = cmd->uc_argt;
/* Skip commands which don't match the requested prefix */ /* Skip commands which don't match the requested prefix */
if (STRNCMP(name, cmd->uc_name, name_len) != 0) if (STRNCMP(name, cmd->uc_name, name_len) != 0)
@ -4296,7 +4299,7 @@ static void uc_list(char_u *name, size_t name_len)
len = 0; len = 0;
/* Arguments */ /* Arguments */
switch ((int)(a & (EXTRA|NOSPC|NEEDARG))) { switch (a & (EXTRA|NOSPC|NEEDARG)) {
case 0: IObuff[len++] = '0'; break; case 0: IObuff[len++] = '0'; break;
case (EXTRA): IObuff[len++] = '*'; break; case (EXTRA): IObuff[len++] = '*'; break;
case (EXTRA|NOSPC): IObuff[len++] = '?'; break; case (EXTRA|NOSPC): IObuff[len++] = '?'; break;
@ -4374,7 +4377,7 @@ static char_u *uc_fun_cmd(void)
return IObuff; return IObuff;
} }
static int uc_scan_attr(char_u *attr, size_t len, long *argt, long *def, int *flags, int *compl, char_u **compl_arg) static int uc_scan_attr(char_u *attr, size_t len, uint32_t *argt, long *def, int *flags, int *compl, char_u **compl_arg)
{ {
char_u *p; char_u *p;
@ -4493,7 +4496,7 @@ static void ex_command(exarg_T *eap)
char_u *name; char_u *name;
char_u *end; char_u *end;
char_u *p; char_u *p;
long argt = 0; uint32_t argt = 0;
long def = -1; long def = -1;
int flags = 0; int flags = 0;
int compl = EXPAND_NOTHING; int compl = EXPAND_NOTHING;
@ -5026,7 +5029,8 @@ char_u *get_user_cmd_complete(expand_T *xp, int idx)
* copied to allocated memory and stored in "*compl_arg". * copied to allocated memory and stored in "*compl_arg".
* Returns FAIL if something is wrong. * Returns FAIL if something is wrong.
*/ */
int parse_compl_arg(char_u *value, int vallen, int *complp, long *argt, char_u **compl_arg) int parse_compl_arg(char_u *value, int vallen, int *complp,
uint32_t *argt, char_u **compl_arg)
{ {
char_u *arg = NULL; char_u *arg = NULL;
size_t arglen = 0; size_t arglen = 0;