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
index 82d93e529a276ff7b9f188ffa175d3102620a25d..009266b941d65ddd4dac88812835e11108deac47 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    439,
 /**/
     438,
 /**/

diff --git a/src/vim9execute.c b/src/vim9execute.c
index a5b707492d371cd2ee7a0ee129c00ac0426eae6d..5f6f79a15e97ddd1687d6af4c3576d0a4b01b59c 100644 (file)
--- 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