fix issue #193: ensure there's no space between FN, USR and any following keyword

robhagemans · robhagemans · commit a5031e63f9e9 · 2022-07-11T11:26:24.000+01:00
diff --git a/pcbasic/basic/converter/lister.py b/pcbasic/basic/converter/lister.py
@@ -113,6 +113,10 @@ def _detokenise_keyword(self, ins, output):
         if (
                 output and int2byte(output[-1]) in ALPHANUMERIC
                 and s not in tk.OPERATOR
+                # we need to check again for FN and USR, but not SPC( and TAB(
+                # because we check the converted output, not the previous token
+                and not (len(output) >= 2 and bytes(output[-2:]) == b'FN')
+                and not (len(output) >= 3 and bytes(output[-3:]) == b'USR')
             ):
             output += b' '
         output += keyword
