Merge pull request #10 from ryangray/deffn-fp-fix

Fix bug not ending the in_deffn condition
chris-y · Jul 10, 2023 · 626a1e2 · 626a1e2
2 parents 904bb6d + 733c93f
commit 626a1e2
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 13 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2023-07-07 ryangray
+        * Fix bug not ending the in_deffn condition which would produce a bad 
+          line or cause zmakebas to hang.
+
 2023-04-15 ryangray
         * Fix "-num" or "+num" following a number leaving out the FP bytes after "num"
         * Version 1.8.3

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

diff --git a/Makefile.68k b/Makefile.68k
@@ -38,7 +38,7 @@ zmakebas.guide: zmakebas.1
 
 # The stuff below makes the distribution tgz.
 
-VERS=1.8.3
+VERS=1.8.4
 
 dist: tgz
 tgz: ../zmakebas-$(VERS).tar.gz

diff --git a/zmakebas.1 b/zmakebas.1
@@ -5,7 +5,7 @@
 .\"
 .\" zmakebas.1 - man page
 .\"
-.TH zmakebas 1 "15th April, 2023" "Version 1.8.3" "Retrocomputing Tools"
+.TH zmakebas 1 "7th July, 2023" "Version 1.8.4" "Retrocomputing Tools"
 .\"
 .\"------------------------------------------------------------------
 .\"

diff --git a/zmakebas.c b/zmakebas.c
@@ -22,7 +22,7 @@
 #define MSDOS
 #endif
 
-#define VERSION          	"1.8.3"
+#define VERSION          	"1.8.4"
 #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)
@@ -1253,15 +1253,14 @@ int main(int argc, char *argv[]) {
 					/* special def fn case */
 					if ( in_deffn ) {
 						if( *ptr == '=' )
-							in_deffn= 0;
+							in_deffn = 0; /* Finished with the formal parameters */
 						else if ( *ptr == ',' || *ptr == ')' )
-							*outptr++= 0x0e,
+							*outptr++= 0x0e, /*  Insert inline Floating Point placeholder after each formal parameter */
 							*outptr++= 0,
 							*outptr++= 0,
 							*outptr++= 0,
 							*outptr++= 0,
-							*outptr++= 0,
-							*outptr++= *ptr++;
+							*outptr++= 0;
 						if( *ptr != ' ' )
 							*outptr++= *ptr++;
 					}

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

diff --git a/zmakebas.readme b/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.3
+Version:      1.8.4
 Architecture: m68k-amigaos >= 2.0.4; ppc-amigaos >= 4.0.0
 
 Quick port/recompile of zmakebas.
@@ -13,6 +13,10 @@ format.
 
 Changelog:
 
+2023-07-07 ryangray
+        * Fix bug not ending the in_deffn condition which would produce a bad 
+          line or cause zmakebas to hang.
+
 2023-04-15 ryangray
         * Fix "-num" or "+num" following a number leaving out the FP bytes after "num"
         * Version 1.8.3