0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

patch 8.2.0439: :disassemble has minor flaws

Problem:    :disassemble has minor flaws.
Solution:   Format the code.  Use (int) instead of (char) for %c.
            (also by James McCoy, closes #5831)
This commit is contained in:
Bram Moolenaar
2020-03-23 22:53:22 +01:00
parent d7b7770f11
commit 1082772f4c
2 changed files with 18 additions and 10 deletions

View File

@@ -738,6 +738,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
439,
/**/ /**/
438, 438,
/**/ /**/

View File

@@ -1774,14 +1774,16 @@ ex_disassemble(exarg_T *eap)
} }
break; break;
case ISN_EXECUTE: case ISN_EXECUTE:
smsg("%4d EXECUTE %lld", current, (long long)(iptr->isn_arg.number)); smsg("%4d EXECUTE %lld", current,
(long long)(iptr->isn_arg.number));
break; break;
case ISN_LOAD: case ISN_LOAD:
if (iptr->isn_arg.number < 0) if (iptr->isn_arg.number < 0)
smsg("%4d LOAD arg[%lld]", current, smsg("%4d LOAD arg[%lld]", current,
(long long)(iptr->isn_arg.number + STACK_FRAME_SIZE)); (long long)(iptr->isn_arg.number + STACK_FRAME_SIZE));
else else
smsg("%4d LOAD $%lld", current, (long long)(iptr->isn_arg.number)); smsg("%4d LOAD $%lld", current,
(long long)(iptr->isn_arg.number));
break; break;
case ISN_LOADV: case ISN_LOADV:
smsg("%4d LOADV v:%s", current, smsg("%4d LOADV v:%s", current,
@@ -1817,7 +1819,7 @@ ex_disassemble(exarg_T *eap)
smsg("%4d LOADENV %s", current, iptr->isn_arg.string); smsg("%4d LOADENV %s", current, iptr->isn_arg.string);
break; break;
case ISN_LOADREG: case ISN_LOADREG:
smsg("%4d LOADREG @%c", current, (char)(iptr->isn_arg.number)); smsg("%4d LOADREG @%c", current, (int)(iptr->isn_arg.number));
break; break;
case ISN_STORE: case ISN_STORE:
@@ -1825,7 +1827,8 @@ ex_disassemble(exarg_T *eap)
smsg("%4d STORE arg[%lld]", current, smsg("%4d STORE arg[%lld]", current,
(long long)(iptr->isn_arg.number + STACK_FRAME_SIZE)); (long long)(iptr->isn_arg.number + STACK_FRAME_SIZE));
else else
smsg("%4d STORE $%lld", current, (long long)(iptr->isn_arg.number)); smsg("%4d STORE $%lld", current,
(long long)(iptr->isn_arg.number));
break; break;
case ISN_STOREV: case ISN_STOREV:
smsg("%4d STOREV v:%s", current, smsg("%4d STOREV v:%s", current,
@@ -1862,7 +1865,7 @@ ex_disassemble(exarg_T *eap)
smsg("%4d STOREENV $%s", current, iptr->isn_arg.string); smsg("%4d STOREENV $%s", current, iptr->isn_arg.string);
break; break;
case ISN_STOREREG: case ISN_STOREREG:
smsg("%4d STOREREG @%c", current, (char)iptr->isn_arg.number); smsg("%4d STOREREG @%c", current, (int)iptr->isn_arg.number);
break; break;
case ISN_STORENR: case ISN_STORENR:
smsg("%4d STORE %lld in $%d", current, smsg("%4d STORE %lld in $%d", current,
@@ -1872,7 +1875,8 @@ ex_disassemble(exarg_T *eap)
// constants // constants
case ISN_PUSHNR: case ISN_PUSHNR:
smsg("%4d PUSHNR %lld", current, (long long)(iptr->isn_arg.number)); smsg("%4d PUSHNR %lld", current,
(long long)(iptr->isn_arg.number));
break; break;
case ISN_PUSHBOOL: case ISN_PUSHBOOL:
case ISN_PUSHSPEC: case ISN_PUSHSPEC:
@@ -1941,10 +1945,12 @@ ex_disassemble(exarg_T *eap)
smsg("%4d PUSH v:exception", current); smsg("%4d PUSH v:exception", current);
break; break;
case ISN_NEWLIST: case ISN_NEWLIST:
smsg("%4d NEWLIST size %lld", current, (long long)(iptr->isn_arg.number)); smsg("%4d NEWLIST size %lld", current,
(long long)(iptr->isn_arg.number));
break; break;
case ISN_NEWDICT: case ISN_NEWDICT:
smsg("%4d NEWDICT size %lld", current, (long long)(iptr->isn_arg.number)); smsg("%4d NEWDICT size %lld", current,
(long long)(iptr->isn_arg.number));
break; break;
// function call // function call