# HG changeset patch # User Bram Moolenaar # Date 1585000805 -3600 # Node ID aa4cbdb676cd3dde5e939ec5cb078e2a7345cd6c # Parent 24bdcdb27edd6cf8d139f8629f7ec3449e455e77 patch 8.2.0439: :disassemble has minor flaws Commit: https://github.com/vim/vim/commit/1082772f4c29bceebf5eb06f7e1f01bd143a2131 Author: Bram Moolenaar Date: Mon Mar 23 22:53:22 2020 +0100 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) diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 439, +/**/ 438, /**/ 437, diff --git a/src/vim9execute.c b/src/vim9execute.c --- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -1774,14 +1774,16 @@ ex_disassemble(exarg_T *eap) } break; 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; case ISN_LOAD: if (iptr->isn_arg.number < 0) 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 - smsg("%4d LOAD $%lld", current, (long long)(iptr->isn_arg.number)); + smsg("%4d LOAD $%lld", current, + (long long)(iptr->isn_arg.number)); break; case ISN_LOADV: smsg("%4d LOADV v:%s", current, @@ -1817,15 +1819,16 @@ ex_disassemble(exarg_T *eap) smsg("%4d LOADENV %s", current, iptr->isn_arg.string); break; case ISN_LOADREG: - smsg("%4d LOADREG @%c", current, (char)(iptr->isn_arg.number)); + smsg("%4d LOADREG @%c", current, (int)(iptr->isn_arg.number)); break; case ISN_STORE: if (iptr->isn_arg.number < 0) 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 - smsg("%4d STORE $%lld", current, (long long)(iptr->isn_arg.number)); + smsg("%4d STORE $%lld", current, + (long long)(iptr->isn_arg.number)); break; case ISN_STOREV: smsg("%4d STOREV v:%s", current, @@ -1862,7 +1865,7 @@ ex_disassemble(exarg_T *eap) smsg("%4d STOREENV $%s", current, iptr->isn_arg.string); break; case ISN_STOREREG: - smsg("%4d STOREREG @%c", current, (char)iptr->isn_arg.number); + smsg("%4d STOREREG @%c", current, (int)iptr->isn_arg.number); break; case ISN_STORENR: smsg("%4d STORE %lld in $%d", current, @@ -1872,7 +1875,8 @@ ex_disassemble(exarg_T *eap) // constants 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; case ISN_PUSHBOOL: case ISN_PUSHSPEC: @@ -1941,10 +1945,12 @@ ex_disassemble(exarg_T *eap) smsg("%4d PUSH v:exception", current); break; 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; 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; // function call