Merge pull request #9 from ryangray/number-op-number-fix

Number op number fix

ChangeLog

@@ -1,3 +1,7 @@
+2023-04-15 ryangray
+        * Fix "-num" or "+num" following a number leaving out the FP bytes after "num"
+        * Version 1.8.3
+
 2023-01-28 ryangray
         * Fix translation of backtick to the quote image token
         * Remove VAL$ from ZX81 tokens list

Makefile

@@ -38,7 +38,7 @@ zmakebas.guide: zmakebas.1
 
 # The stuff below makes the distribution tgz.
 
-VERS=1.8.2
+VERS=1.8.3
 
 dist: tgz
 tgz: ../zmakebas-$(VERS).tar.gz

Makefile.68k

@@ -38,7 +38,7 @@ zmakebas.guide: zmakebas.1
 
 # The stuff below makes the distribution tgz.
 
-VERS=1.8.2
+VERS=1.8.3
 
 dist: tgz
 tgz: ../zmakebas-$(VERS).tar.gz

zmakebas.1

@@ -5,7 +5,7 @@
 .\"
 .\" zmakebas.1 - man page
 .\"
-.TH zmakebas 1 "28th January, 2023" "Version 1.8.2" "Retrocomputing Tools"
+.TH zmakebas 1 "15th April, 2023" "Version 1.8.3" "Retrocomputing Tools"
 .\"
 .\"------------------------------------------------------------------
 .\"

zmakebas.c

@@ -22,7 +22,7 @@
 #define MSDOS
 #endif
 
-#define VERSION          	"1.8.2"
+#define VERSION          	"1.8.3"
 #define DEFAULT_OUTPUT		"out.tap"
 #define REM_TOKEN_NUM		234
 #define PEEK_TOKEN_NUM		190						// :dbolli:20200420 19:00:13 Added ZX Spectrum PEEK token code (v1.5.2)
@@ -1199,7 +1199,7 @@ int main(int argc, char *argv[]) {
                  * so that we only have to find the start - i.e. a non-alpha char,
                  * an optional `-' or `+', an optional `.', then a digit.
                  */
-                if (!in_rem && !in_quotes && !isalpha(ptr[-1]) &&
+                if (!in_rem && !in_quotes && !isalpha(ptr[-1]) && !isdigit(ptr[-1]) && 
                         (isdigit(*ptr) ||
                         ((*ptr == '-' || *ptr == '+' || *ptr == '.') && isdigit(ptr[1])) ||
                         ((*ptr == '-' || *ptr == '+') && ptr[1] == '.' && isdigit(ptr[2])))) {
@@ -1222,7 +1222,7 @@ int main(int argc, char *argv[]) {
                         memcpy(outptr, ptr, ptr2 - ptr);
                     outptr += ptr2 - ptr;
 
-					if ( zx81mode || ( ptr[-1] != '$' && ptr[-1] != '@' && !isalnum(ptr[-1]) ) ) {											// :dbolli:20200417 19:36:10 Don't insert 5 byte inline FP for ZX Spectrum Next $nnnn hex num and @nnn binary num
+					if ( zx81mode || ( ptr[-1] != '$' && ptr[-1] != '@' ) ) {											// :dbolli:20200417 19:36:10 Don't insert 5 byte inline FP for ZX Spectrum Next $nnnn hex num and @nnn binary num
 
 						*outptr++ = zx81mode ? 0x7e : 0x0e;
 

zmakebas.rc

@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,8,2,0
- PRODUCTVERSION 1,8,2,0
+ FILEVERSION 1,8,3,0
+ PRODUCTVERSION 1,8,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "zmakebas"
-            VALUE "FileVersion", "1.8.2.0"
+            VALUE "FileVersion", "1.8.3.0"
             VALUE "InternalName", "zmakebas.exe"
             VALUE "LegalCopyright", "Copyright (C) 2023"
             VALUE "OriginalFilename", "zmakebas.exe"
             VALUE "ProductName", "zmakebas"
-            VALUE "ProductVersion", "1.8.2.0"
+            VALUE "ProductVersion", "1.8.3.0"
         END
     END
     BLOCK "VarFileInfo"

zmakebas.readme

@@ -2,7 +2,7 @@ Short:        BASIC Text to ZX Spectrum/ZX81 .TAP/.P
 Uploader:     chris@unsatisfactorysoftware.co.uk (Chris Young)
 Author:       Russell Marks and others
 Type:         util/conv
-Version:      1.8.2
+Version:      1.8.3
 Architecture: m68k-amigaos >= 2.0.4; ppc-amigaos >= 4.0.0
 
 Quick port/recompile of zmakebas.
@@ -13,6 +13,10 @@ format.
 
 Changelog:
 
+2023-04-15 ryangray
+        * Fix "-num" or "+num" following a number leaving out the FP bytes after "num"
+        * Version 1.8.3
+
 2023-01-28 ryangray
         * Fix translation of backtick to the quote image token
         * Remove VAL$ from ZX81 tokens list