From c147b2cba5f7c93d881f5b096617972b33e7fe01 Mon Sep 17 00:00:00 2001 From: Philip Zembrod Date: Sat, 7 Dec 2024 12:40:27 +0100 Subject: [PATCH] Rename all .fth/.fr files in CPM/tests to .fs --- 8080/CPM/Makefile | 28 ++++++++++---------- 8080/CPM/tests/{ans-shim.fth => ans-shim.fs} | 0 8080/CPM/tests/{block.fth => block.fs} | 0 8080/CPM/tests/{core.fr => core.fs} | 0 8080/CPM/tests/{coreext.fth => coreext.fs} | 0 8080/CPM/tests/{coreplus.fth => coreplus.fs} | 0 8080/CPM/tests/{doubltst.fth => doubltst.fs} | 0 8080/CPM/tests/{errorrep.fth => errorrep.fs} | 0 8080/CPM/tests/golden/block.golden | 2 +- 8080/CPM/tests/golden/core.golden | 4 +-- 8080/CPM/tests/golden/coreext.golden | 6 ++--- 8080/CPM/tests/golden/coreplus.golden | 2 +- 8080/CPM/tests/golden/doubltst.golden | 2 +- 8080/CPM/tests/golden/inctest.golden | 4 +-- 8080/CPM/tests/golden/prelim.golden | 4 +-- 8080/CPM/tests/{inctest.fth => inctest.fs} | 0 8080/CPM/tests/{logfile.fth => logfile.fs} | 0 8080/CPM/tests/{prelim.fth => prelim.fs} | 0 8080/CPM/tests/test-blk.fs | 26 ++++++++++++++++++ 8080/CPM/tests/test-blk.fth | 26 ------------------ 8080/CPM/tests/test-krn.fs | 22 +++++++++++++++ 8080/CPM/tests/test-krn.fth | 22 --------------- 8080/CPM/tests/test-min.fs | 14 ++++++++++ 8080/CPM/tests/test-min.fth | 14 ---------- 8080/CPM/tests/{test-std.fth => test-std.fs} | 20 +++++++------- 8080/CPM/tests/{tester.fth => tester.fs} | 0 8080/CPM/tests/{util.fth => util.fs} | 0 27 files changed, 98 insertions(+), 98 deletions(-) rename 8080/CPM/tests/{ans-shim.fth => ans-shim.fs} (100%) rename 8080/CPM/tests/{block.fth => block.fs} (100%) rename 8080/CPM/tests/{core.fr => core.fs} (100%) rename 8080/CPM/tests/{coreext.fth => coreext.fs} (100%) rename 8080/CPM/tests/{coreplus.fth => coreplus.fs} (100%) rename 8080/CPM/tests/{doubltst.fth => doubltst.fs} (100%) rename 8080/CPM/tests/{errorrep.fth => errorrep.fs} (100%) rename 8080/CPM/tests/{inctest.fth => inctest.fs} (100%) rename 8080/CPM/tests/{logfile.fth => logfile.fs} (100%) rename 8080/CPM/tests/{prelim.fth => prelim.fs} (100%) create mode 100644 8080/CPM/tests/test-blk.fs delete mode 100644 8080/CPM/tests/test-blk.fth create mode 100644 8080/CPM/tests/test-krn.fs delete mode 100644 8080/CPM/tests/test-krn.fth create mode 100644 8080/CPM/tests/test-min.fs delete mode 100644 8080/CPM/tests/test-min.fth rename 8080/CPM/tests/{test-std.fth => test-std.fs} (52%) rename 8080/CPM/tests/{tester.fth => tester.fs} (100%) rename 8080/CPM/tests/{util.fth => util.fs} (100%) diff --git a/8080/CPM/Makefile b/8080/CPM/Makefile index 1f77714..69fc9b8 100644 --- a/8080/CPM/Makefile +++ b/8080/CPM/Makefile @@ -66,7 +66,7 @@ logtest.log: \ inctest.log: \ $(patsubst %, $(cpmfilesdir)/%, kernel.com fileint.fb \ - include.fb log2file.fb inctest.fth) \ + include.fb log2file.fb inctest.fs) \ | emu ./emulator/run-in-runcpm.sh \ "kernel fileint.fb" \ @@ -75,7 +75,7 @@ inctest.log: \ "include include.fb" \ "include log2file.fb" \ "logopen" \ - "include inctest.fth" \ + "include inctest.fs" \ "logclose" \ "bye" \ "exit" @@ -161,58 +161,58 @@ $(cpmfilesdir)/v4thblk.com: \ test-kernel.log: \ $(patsubst %, $(cpmfilesdir)/%, kernel.com fileint.fb \ - include.fb log2file.fb core.fr) \ - $(patsubst tests/%, $(cpmfilesdir)/%, $(wildcard tests/*.fth)) \ + include.fb log2file.fb core.fs) \ + $(patsubst tests/%, $(cpmfilesdir)/%, $(wildcard tests/*.fs)) \ | emu ./emulator/run-in-runcpm.sh \ "kernel fileint.fb" \ "1 load onlyforth" \ "$50 constant /tib" \ "include include.fb" \ - "include test-krn.fth" \ + "include test-krn.fs" \ "bye" \ "exit" dos2unix -n $(runcpmdir)/logfile.txt $@ test-min.log: \ $(patsubst %, $(cpmfilesdir)/%, v4th.com sfileint.fs \ - logfile.fth \ - ans-shim.fth prelim.fth tester.fth core.fr test-min.fth) \ + logfile.fs \ + ans-shim.fs prelim.fs tester.fs core.fs test-min.fs) \ | emu ./emulator/run-in-runcpm.sh \ "v4th sfileint.fs" \ "include-isfile" \ "onlyforth" \ - "include test-min.fth" \ + "include test-min.fs" \ "bye" \ "exit" dos2unix -n $(runcpmdir)/logfile.txt $@ test-std.log: \ $(patsubst %, $(cpmfilesdir)/%, v4th.com sfileint.fs \ - logfile.fth core.fr) \ - $(patsubst tests/%, $(cpmfilesdir)/%, $(wildcard tests/*.fth)) \ + logfile.fs core.fs) \ + $(patsubst tests/%, $(cpmfilesdir)/%, $(wildcard tests/*.fs)) \ | emu ./emulator/run-in-runcpm.sh \ "v4th sfileint.fs" \ "include-isfile" \ "onlyforth" \ - "include test-std.fth" \ + "include test-std.fs" \ "bye" \ "exit" dos2unix -n $(runcpmdir)/logfile.txt $@ test-blk.log: \ $(patsubst %, $(cpmfilesdir)/%, v4thblk.com sfileint.fs \ - sblkint.fs log2file.fb core.fr) \ - $(patsubst tests/%, $(cpmfilesdir)/%, $(wildcard tests/*.fth) \ + sblkint.fs log2file.fb core.fs) \ + $(patsubst tests/%, $(cpmfilesdir)/%, $(wildcard tests/*.fs) \ tests/empty.fb) | emu ./emulator/run-in-runcpm.sh \ "v4thblk sfileint.fs" \ "include-isfile" \ "include sblkint.fs" \ "onlyforth" \ - "include test-blk.fth" \ + "include test-blk.fs" \ "bye" \ "exit" dos2unix -n $(runcpmdir)/logfile.txt $@ diff --git a/8080/CPM/tests/ans-shim.fth b/8080/CPM/tests/ans-shim.fs similarity index 100% rename from 8080/CPM/tests/ans-shim.fth rename to 8080/CPM/tests/ans-shim.fs diff --git a/8080/CPM/tests/block.fth b/8080/CPM/tests/block.fs similarity index 100% rename from 8080/CPM/tests/block.fth rename to 8080/CPM/tests/block.fs diff --git a/8080/CPM/tests/core.fr b/8080/CPM/tests/core.fs similarity index 100% rename from 8080/CPM/tests/core.fr rename to 8080/CPM/tests/core.fs diff --git a/8080/CPM/tests/coreext.fth b/8080/CPM/tests/coreext.fs similarity index 100% rename from 8080/CPM/tests/coreext.fth rename to 8080/CPM/tests/coreext.fs diff --git a/8080/CPM/tests/coreplus.fth b/8080/CPM/tests/coreplus.fs similarity index 100% rename from 8080/CPM/tests/coreplus.fth rename to 8080/CPM/tests/coreplus.fs diff --git a/8080/CPM/tests/doubltst.fth b/8080/CPM/tests/doubltst.fs similarity index 100% rename from 8080/CPM/tests/doubltst.fth rename to 8080/CPM/tests/doubltst.fs diff --git a/8080/CPM/tests/errorrep.fth b/8080/CPM/tests/errorrep.fs similarity index 100% rename from 8080/CPM/tests/errorrep.fth rename to 8080/CPM/tests/errorrep.fs diff --git a/8080/CPM/tests/golden/block.golden b/8080/CPM/tests/golden/block.golden index 10a80cf..7dbff0c 100644 --- a/8080/CPM/tests/golden/block.golden +++ b/8080/CPM/tests/golden/block.golden @@ -1,5 +1,5 @@ -BLOCK.FTH **=== NOT TESTED === ******* EMPTY.FB Scr 21 +BLOCK.FS **=== NOT TESTED === ******* EMPTY.FB Scr 21 0 Should show a (mostly) blank screen 1 2 diff --git a/8080/CPM/tests/golden/core.golden b/8080/CPM/tests/golden/core.golden index 77b0436..ea9ae31 100644 --- a/8080/CPM/tests/golden/core.golden +++ b/8080/CPM/tests/golden/core.golden @@ -1,6 +1,6 @@ -TESTER.FTH ERROR exists -CORE.FR +TESTER.FS ERROR exists +CORE.FS *********************YOU SHOULD SEE THE STANDARD GRAPHIC CHARACTERS: !"#$%&'()*+,-./0123456789:;<=>?@ ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_` diff --git a/8080/CPM/tests/golden/coreext.golden b/8080/CPM/tests/golden/coreext.golden index 929c241..a581f92 100644 --- a/8080/CPM/tests/golden/coreext.golden +++ b/8080/CPM/tests/golden/coreext.golden @@ -1,9 +1,9 @@ -UTIL.FTH ?DEFTEST1 exists +UTIL.FS ?DEFTEST1 exists Test utilities loaded -ERRORREP.FTH -COREEXT.FTH ************** +ERRORREP.FS +COREEXT.FS ************** Output from .( You should see -9876: -9876 diff --git a/8080/CPM/tests/golden/coreplus.golden b/8080/CPM/tests/golden/coreplus.golden index d70ee3a..e9d5ed9 100644 --- a/8080/CPM/tests/golden/coreplus.golden +++ b/8080/CPM/tests/golden/coreplus.golden @@ -1,4 +1,4 @@ -COREPLUS.FTH ******** +COREPLUS.FS ******** You should see 2345: 2345 ***** End of additional Core tests diff --git a/8080/CPM/tests/golden/doubltst.golden b/8080/CPM/tests/golden/doubltst.golden index 146428f..030a2a1 100644 --- a/8080/CPM/tests/golden/doubltst.golden +++ b/8080/CPM/tests/golden/doubltst.golden @@ -1,3 +1,3 @@ -DOUBLTST.FTH ***************** +DOUBLTST.FS ***************** End of Double-Number word tests diff --git a/8080/CPM/tests/golden/inctest.golden b/8080/CPM/tests/golden/inctest.golden index a66156a..2211fcb 100644 --- a/8080/CPM/tests/golden/inctest.golden +++ b/8080/CPM/tests/golden/inctest.golden @@ -1,5 +1,5 @@ ok -include inctest.fth -INCTEST.FTH included from stream file: "1 2 + 4 * .": 12 +include inctest.fs +INCTEST.FS included from stream file: "1 2 + 4 * .": 12 ok logclose diff --git a/8080/CPM/tests/golden/prelim.golden b/8080/CPM/tests/golden/prelim.golden index 326a7dc..d6f135a 100644 --- a/8080/CPM/tests/golden/prelim.golden +++ b/8080/CPM/tests/golden/prelim.golden @@ -1,6 +1,6 @@ -ANS-SHIM.FTH -PRELIM.FTH +ANS-SHIM.FS +PRELIM.FS CR CR SOURCE TYPE ( Preliminary test ) CR SOURCE ( These lines test SOURCE, TYPE, CR and parenthetic comments ) TYPE CR diff --git a/8080/CPM/tests/inctest.fth b/8080/CPM/tests/inctest.fs similarity index 100% rename from 8080/CPM/tests/inctest.fth rename to 8080/CPM/tests/inctest.fs diff --git a/8080/CPM/tests/logfile.fth b/8080/CPM/tests/logfile.fs similarity index 100% rename from 8080/CPM/tests/logfile.fth rename to 8080/CPM/tests/logfile.fs diff --git a/8080/CPM/tests/prelim.fth b/8080/CPM/tests/prelim.fs similarity index 100% rename from 8080/CPM/tests/prelim.fth rename to 8080/CPM/tests/prelim.fs diff --git a/8080/CPM/tests/test-blk.fs b/8080/CPM/tests/test-blk.fs new file mode 100644 index 0000000..ecb0b43 --- /dev/null +++ b/8080/CPM/tests/test-blk.fs @@ -0,0 +1,26 @@ + +include log2file.fb \ so that include with block file gets tested +' noop Is .status +logopen + +include ans-shim.fs +: \vf [compile] \ ; immediate + +include prelim.fs +include tester.fs +\ 1 verbose ! +include core.fs +include coreplus.fs + +include util.fs +include errorrep.fs + +include coreext.fs +include doubltst.fs + +include block.fs + +REPORT-ERRORS + +logclose + diff --git a/8080/CPM/tests/test-blk.fth b/8080/CPM/tests/test-blk.fth deleted file mode 100644 index cd456d2..0000000 --- a/8080/CPM/tests/test-blk.fth +++ /dev/null @@ -1,26 +0,0 @@ - -include log2file.fb \ so that include with block file gets tested -' noop Is .status -logopen - -include ans-shim.fth -: \vf [compile] \ ; immediate - -include prelim.fth -include tester.fth -\ 1 verbose ! -include core.fr -include coreplus.fth - -include util.fth -include errorrep.fth - -include coreext.fth -include doubltst.fth - -include block.fth - -REPORT-ERRORS - -logclose - diff --git a/8080/CPM/tests/test-krn.fs b/8080/CPM/tests/test-krn.fs new file mode 100644 index 0000000..62017e7 --- /dev/null +++ b/8080/CPM/tests/test-krn.fs @@ -0,0 +1,22 @@ + +include log2file.fb +logopen + +include ans-shim.fs +: \vf [compile] \ ; immediate + +include prelim.fs +include tester.fs + +\ 1 verbose ! +include core.fs +include coreplus.fs + +include util.fs +include errorrep.fs + +include coreext.fs + +REPORT-ERRORS + +logclose diff --git a/8080/CPM/tests/test-krn.fth b/8080/CPM/tests/test-krn.fth deleted file mode 100644 index 60373be..0000000 --- a/8080/CPM/tests/test-krn.fth +++ /dev/null @@ -1,22 +0,0 @@ - -include log2file.fb -logopen - -include ans-shim.fth -: \vf [compile] \ ; immediate - -include prelim.fth -include tester.fth - -\ 1 verbose ! -include core.fr -include coreplus.fth - -include util.fth -include errorrep.fth - -include coreext.fth - -REPORT-ERRORS - -logclose diff --git a/8080/CPM/tests/test-min.fs b/8080/CPM/tests/test-min.fs new file mode 100644 index 0000000..2302beb --- /dev/null +++ b/8080/CPM/tests/test-min.fs @@ -0,0 +1,14 @@ + +include logfile.fs +logopen + +include ans-shim.fs +: \vf [compile] \ ; immediate + +include prelim.fs +include tester.fs + +\ 1 verbose ! +include core.fs + +logclose diff --git a/8080/CPM/tests/test-min.fth b/8080/CPM/tests/test-min.fth deleted file mode 100644 index 9e6ff59..0000000 --- a/8080/CPM/tests/test-min.fth +++ /dev/null @@ -1,14 +0,0 @@ - -include logfile.fth -logopen - -include ans-shim.fth -: \vf [compile] \ ; immediate - -include prelim.fth -include tester.fth - -\ 1 verbose ! -include core.fr - -logclose diff --git a/8080/CPM/tests/test-std.fth b/8080/CPM/tests/test-std.fs similarity index 52% rename from 8080/CPM/tests/test-std.fth rename to 8080/CPM/tests/test-std.fs index 2606c25..c1cfe0e 100644 --- a/8080/CPM/tests/test-std.fth +++ b/8080/CPM/tests/test-std.fs @@ -3,26 +3,26 @@ \ blk @ ?dup IF ." Blk " u. ?cr exit THEN \ incfile @ IF tib #tib @ cr type THEN ; -include logfile.fth +include logfile.fs logopen -include ans-shim.fth +include ans-shim.fs : \vf [compile] \ ; immediate -include prelim.fth -include tester.fth +include prelim.fs +include tester.fs \ 1 verbose ! -include core.fr -include coreplus.fth +include core.fs +include coreplus.fs -include util.fth -include errorrep.fth +include util.fs +include errorrep.fs -include coreext.fth +include coreext.fs \ ' .blk|tib Is .status -include doubltst.fth +include doubltst.fs REPORT-ERRORS diff --git a/8080/CPM/tests/tester.fth b/8080/CPM/tests/tester.fs similarity index 100% rename from 8080/CPM/tests/tester.fth rename to 8080/CPM/tests/tester.fs diff --git a/8080/CPM/tests/util.fth b/8080/CPM/tests/util.fs similarity index 100% rename from 8080/CPM/tests/util.fth rename to 8080/CPM/tests/util.fs