diff --git a/8086/msdos/Makefile b/8086/msdos/Makefile index cb766b6..8d18d86 100644 --- a/8086/msdos/Makefile +++ b/8086/msdos/Makefile @@ -13,45 +13,45 @@ fb.txt: $(fb_txt_files) clean: rm -f *.log *.LOG *.result *.golden rm -f dosfiles/* - rm -f tests/empty.fth tests/empty.fb.txt + rm -f tests/empty.fs tests/empty.fb.txt *.log: emulator/run-in-dosbox.sh -metafile.com: v4thfile.com src/meta.fb src/mk-meta.fth tests/log2file.fb +metafile.com: v4thfile.com src/meta.fb src/mk-meta.fs tests/log2file.fb rm -f METAFILE.COM OUTPUT.LOG FORTHPATH="f:\\;f:\\src;f:\\tests" ./emulator/run-in-dosbox.sh \ - v4thfile.com "include mk-meta.fth" + v4thfile.com "include mk-meta.fs" dos2unix -n OUTPUT.LOG metafile.log grep -F 'Metacompiler saved as metafile.com' metafile.log -v4th.com: metafile.com src/meta.fb src/v4th.fth src/vf86core.fth \ - src/vf86dkey.fth src/vf86dos.fth src/vf86file.fth src/vf86end.fth +v4th.com: metafile.com src/meta.fb src/v4th.fs src/vf86core.fs \ + src/vf86dkey.fs src/vf86dos.fs src/vf86file.fs src/vf86end.fs rm -f v4th.com V4TH.COM OUTPUT.LOG FORTHPATH="f:\\;f:\\src;f:\\tests" ./emulator/run-in-dosbox.sh \ - metafile.com "include v4th.fth" + metafile.com "include v4th.fs" dos2unix -n OUTPUT.LOG v4th.log mv V4TH.COM v4th.com grep -F 'unresolved:' v4th.log grep -F 'new kernel written as v4th.com' v4th.log grep -i 'unresolved:.*[^ ]' v4th.log && exit 1 || true -v4thblk.com: metafile.com src/meta.fb src/v4thblk.fth src/vf86core.fth \ - src/vf86dkey.fth src/vf86dos.fth src/vf86file.fth src/vf86bufs.fth \ - src/vf86end.fth +v4thblk.com: metafile.com src/meta.fb src/v4thblk.fs src/vf86core.fs \ + src/vf86dkey.fs src/vf86dos.fs src/vf86file.fs src/vf86bufs.fs \ + src/vf86end.fs rm -f v4thblk.com V4THBLK.COM OUTPUT.LOG FORTHPATH="f:\\;f:\\src;f:\\tests" ./emulator/run-in-dosbox.sh \ - metafile.com "include v4thblk.fth" + metafile.com "include v4thblk.fs" dos2unix -n OUTPUT.LOG v4thblk.log mv V4THBLK.COM v4thblk.com grep -F 'unresolved:' v4thblk.log grep -F 'new kernel written as v4thblk.com' v4thblk.log grep -i 'unresolved:.*[^ ]' v4thblk.log && exit 1 || true -v4thi.com: metafile.com src/meta.fb src/v4thi.fth src/vf86core.fth \ - src/vf86ikey.fth src/vf86dos.fth src/vf86file.fth src/vf86end.fth +v4thi.com: metafile.com src/meta.fb src/v4thi.fs src/vf86core.fs \ + src/vf86ikey.fs src/vf86dos.fs src/vf86file.fs src/vf86end.fs rm -f v4th.com V4TH.COM OUTPUT.LOG FORTHPATH="f:\\;f:\\src;f:\\tests" ./emulator/run-in-dosbox.sh \ - metafile.com "include v4thi.fth" + metafile.com "include v4thi.fs" dos2unix -n OUTPUT.LOG v4thi.log mv V4THI.COM v4thi.com grep -F 'unresolved:' v4thi.log @@ -59,7 +59,7 @@ v4thi.com: metafile.com src/meta.fb src/v4thi.fth src/vf86core.fth \ grep -i 'unresolved:.*[^ ]' v4thi.log && exit 1 || true # o4th for old volks4th - the new v4th is built with precompiled -# metacompiler metafile.com and mk-v4th.fth which writes a compile log. +# metacompiler metafile.com and mk-v4th.fs which writes a compile log. o4th.com o4th.log: volks4th.com src/kernel.fb rm -f FORTH.COM forth.com o4th.com FORTHPATH="f:\\;f:\\src;f:\\tests" ./emulator/run-in-dosbox.sh \ @@ -78,22 +78,22 @@ logtest.log: volks4th.com tests/log2file.fb tests/logtest.fb FORTHPATH="f:\\;f:\\src;f:\\tests" ./emulator/run-in-dosbox.sh volks4th.com "include logtest.fb" dos2unix -n OUTPUT.LOG $@ -logappendtest.log: v4thfile.com tests/logapp.fth +logappendtest.log: v4thfile.com tests/logapp.fs rm -f OUTPUT.LOG - FORTHPATH="f:\\;f:\\src;f:\\tests" ./emulator/run-in-dosbox.sh v4thfile.com "include logapp.fth" + FORTHPATH="f:\\;f:\\src;f:\\tests" ./emulator/run-in-dosbox.sh v4thfile.com "include logapp.fs" dos2unix -n OUTPUT.LOG $@ prepsrcs = asm.fb extend.fb multi.vid dos.fb include.fb -prepfths = asm.fb extend.fb multi.vid dos.fb include.fb 86asm.fth \ - t86asm.fth extend2.fth multivid.fth dos2.fth dos3.fth log2file.fth +prepfths = asm.fb extend.fb multi.vid dos.fb include.fb 86asm.fs \ + t86asm.fs extend2.fs multivid.fs dos2.fs dos3.fs log2file.fs incltest.log: \ $(patsubst %, dosfiles/%, v4thblk.com $(prepsrcs) log2file.fb \ - incltest.fth) + incltest.fs) rm -f dosfiles/OUTPUT.LOG (cd dosfiles && ../emulator/run-in-dosbox.sh \ - v4thblk.com "include incltest.fth") + v4thblk.com "include incltest.fs") dos2unix -n dosfiles/OUTPUT.LOG $@ test-std.log: \ @@ -101,7 +101,7 @@ test-std.log: \ $(patsubst tests/%, dosfiles/%, $(wildcard tests/*.*)) rm -f dosfiles/OUTPUT.LOG (cd dosfiles && ../emulator/run-in-dosbox.sh v4th.com \ - "include logprep.fth include test-std.fth") + "include logprep.fs include test-std.fs") dos2unix -n dosfiles/OUTPUT.LOG $@ test-blk.log: \ @@ -109,7 +109,7 @@ test-blk.log: \ $(patsubst tests/%, dosfiles/%, $(wildcard tests/*.*)) rm -f dosfiles/OUTPUT.LOG (cd dosfiles && ../emulator/run-in-dosbox.sh v4thblk.com \ - "include logprep.fth include test-blk.fth") + "include logprep.fs include test-blk.fs") dos2unix -n dosfiles/OUTPUT.LOG $@ test-stdi.log: \ @@ -117,7 +117,7 @@ test-stdi.log: \ $(patsubst tests/%, dosfiles/%, $(wildcard tests/*.*)) rm -f dosfiles/OUTPUT.LOG (cd dosfiles && ../emulator/run-in-dosbox.sh v4thi.com \ - "include logprep.fth include test-std.fth") + "include logprep.fs include test-std.fs") dos2unix -n dosfiles/OUTPUT.LOG $@ forthblkdos: v4thblk.dos v4thblk.forth @@ -129,7 +129,7 @@ v4th0.dos: \ $(patsubst tests/%, dosfiles/%, $(wildcard tests/*.*)) rm -f dosfiles/OUTPUT.LOG (cd dosfiles && ../emulator/run-in-dosbox.sh v4th.com \ - "include logprep.fth include vocdos.fth") + "include logprep.fs include vocdos.fs") dos2unix -n dosfiles/OUTPUT.LOG output.log tr " " "\n" $@ @@ -138,7 +138,7 @@ v4th0.forth: \ $(patsubst tests/%, dosfiles/%, $(wildcard tests/*.*)) rm -f dosfiles/OUTPUT.LOG (cd dosfiles && ../emulator/run-in-dosbox.sh v4th.com \ - "include logprep.fth include vocforth.fth") + "include logprep.fs include vocforth.fs") dos2unix -n dosfiles/OUTPUT.LOG output.log tr " " "\n" $@ @@ -147,7 +147,7 @@ v4thblk.dos: \ $(patsubst tests/%, dosfiles/%, $(wildcard tests/*.*)) rm -f dosfiles/OUTPUT.LOG (cd dosfiles && ../emulator/run-in-dosbox.sh v4thblk.com \ - "include logprep.fth include vocdos.fth") + "include logprep.fs include vocdos.fs") dos2unix -n dosfiles/OUTPUT.LOG output.log tr " " "\n" $@ @@ -156,7 +156,7 @@ v4thblk.forth: \ $(patsubst tests/%, dosfiles/%, $(wildcard tests/*.*)) rm -f dosfiles/OUTPUT.LOG (cd dosfiles && ../emulator/run-in-dosbox.sh v4thblk.com \ - "include logprep.fth include vocforth.fth") + "include logprep.fs include vocforth.fs") dos2unix -n dosfiles/OUTPUT.LOG output.log tr " " "\n" $@ @@ -165,7 +165,7 @@ v4thfile.dos: \ $(patsubst tests/%, dosfiles/%, $(wildcard tests/*.*)) rm -f dosfiles/OUTPUT.LOG (cd dosfiles && ../emulator/run-in-dosbox.sh v4thfile.com \ - "include log2file.fth include vocdos.fth") + "include log2file.fs include vocdos.fs") dos2unix -n dosfiles/OUTPUT.LOG output.log tr " " "\n" $@ @@ -174,20 +174,20 @@ v4thfile.forth: \ $(patsubst tests/%, dosfiles/%, $(wildcard tests/*.*)) rm -f dosfiles/OUTPUT.LOG (cd dosfiles && ../emulator/run-in-dosbox.sh v4thfile.com \ - "include log2file.fth include vocforth.fth") + "include log2file.fs include vocforth.fs") dos2unix -n dosfiles/OUTPUT.LOG output.log tr " " "\n" $@ -incltest-volks4th.log: v4thfile.com tests/log2file.fb tests/incltest.fth +incltest-volks4th.log: v4thfile.com tests/log2file.fb tests/incltest.fs rm -f OUTPUT.LOG FORTHPATH="f:\\;f:\\tests" ./emulator/run-in-dosbox.sh \ - v4thfile.com "include incltest.fth" + v4thfile.com "include incltest.fs" dos2unix -n OUTPUT.LOG $@ test-volks4th-min.log: v4thfile.com tests/* emulator/run-in-dosbox.sh rm -f OUTPUT.LOG FORTHPATH="f:\\;f:\\src;f:\\tests" ./emulator/run-in-dosbox.sh \ - v4thfile.com "include test-min.fth" + v4thfile.com "include test-min.fs" dos2unix -n OUTPUT.LOG $@ diff --git a/8086/msdos/src/86asm.fth b/8086/msdos/src/86asm.fs similarity index 100% rename from 8086/msdos/src/86asm.fth rename to 8086/msdos/src/86asm.fs diff --git a/8086/msdos/src/dos2.fth b/8086/msdos/src/dos2.fs similarity index 99% rename from 8086/msdos/src/dos2.fth rename to 8086/msdos/src/dos2.fs index 4618be8..62bf0bf 100644 --- a/8086/msdos/src/dos2.fth +++ b/8086/msdos/src/dos2.fs @@ -3,7 +3,7 @@ \ 28 jun 88 -\ This file is a pure .fth-version of dos.fb. +\ This file is a pure .fs-version of dos.fb. \ DOS loads higher level file functions which go beyond \ including a screen file. Calls to MS-DOS are implemented diff --git a/8086/msdos/src/dos3.fth b/8086/msdos/src/dos3.fs similarity index 98% rename from 8086/msdos/src/dos3.fth rename to 8086/msdos/src/dos3.fs index ad3ae7b..d29200d 100644 --- a/8086/msdos/src/dos3.fth +++ b/8086/msdos/src/dos3.fs @@ -3,7 +3,7 @@ \ 28 jun 88 -\ This file is an .fth-version of dos.fb without the block-related +\ This file is an .fs-version of dos.fb without the block-related \ words. \ DOS loads higher level file functions which go beyond diff --git a/8086/msdos/src/extend2.fth b/8086/msdos/src/extend2.fs similarity index 97% rename from 8086/msdos/src/extend2.fth rename to 8086/msdos/src/extend2.fs index 0852488..7f02c88 100644 --- a/8086/msdos/src/extend2.fth +++ b/8086/msdos/src/extend2.fs @@ -3,7 +3,7 @@ \ ks 11 mai 88 -\ This file is a pure .fth-version of extend.fb. +\ This file is a pure .fs-version of extend.fb. \ It contains definitions needed for several further system \ and application files. @@ -17,7 +17,7 @@ \ loadscreen for often used words ks cas 25sep16 - Onlyforth \needs Assembler include t86asm.fth + Onlyforth \needs Assembler include t86asm.fs ' save-buffers Alias sav diff --git a/8086/msdos/src/mk-meta.fth b/8086/msdos/src/mk-meta.fs similarity index 95% rename from 8086/msdos/src/mk-meta.fth rename to 8086/msdos/src/mk-meta.fs index c052275..9547383 100644 --- a/8086/msdos/src/mk-meta.fth +++ b/8086/msdos/src/mk-meta.fs @@ -1,5 +1,5 @@ - include log2file.fth + include log2file.fs logopen output.log Onlyforth \ \needs Assembler 2 loadfrom asm.fb diff --git a/8086/msdos/src/multivid.fth b/8086/msdos/src/multivid.fs similarity index 98% rename from 8086/msdos/src/multivid.fth rename to 8086/msdos/src/multivid.fs index 6915ccd..f5a9142 100644 --- a/8086/msdos/src/multivid.fth +++ b/8086/msdos/src/multivid.fs @@ -1,7 +1,7 @@ \ *** Block No. 0, Hexblock 0 -\ This file is a pure .fth-version of multi.vid. +\ This file is a pure .fs-version of multi.vid. \ This display interface uses BIOS call $10 functions for a fast \ display interface. A couple of state variables is contained @@ -22,7 +22,7 @@ \ *** Block No. 1, Hexblock 1 \ Multitsking display interface loadscreen ks phz 31jan22 - Onlyforth \needs Assembler include t86asm.fth + Onlyforth \needs Assembler include t86asm.fs User area area off \ points at active window Variable status \ to switch status on/off diff --git a/8086/msdos/src/t86asm.fth b/8086/msdos/src/t86asm.fs similarity index 90% rename from 8086/msdos/src/t86asm.fth rename to 8086/msdos/src/t86asm.fs index f58411e..8fbfa14 100644 --- a/8086/msdos/src/t86asm.fth +++ b/8086/msdos/src/t86asm.fs @@ -11,4 +11,4 @@ include dp ! ; - maybe-include-tmp-asm 86asm.fth + maybe-include-tmp-asm 86asm.fs diff --git a/8086/msdos/src/v4th.fth b/8086/msdos/src/v4th.fs similarity index 78% rename from 8086/msdos/src/v4th.fth rename to 8086/msdos/src/v4th.fs index 371aefd..baa654e 100644 --- a/8086/msdos/src/v4th.fth +++ b/8086/msdos/src/v4th.fs @@ -18,11 +18,11 @@ new v4th.com Onlyforth Target definitions - include vf86core.fth - include vf86dkey.fth - include vf86dos.fth - include vf86file.fth - include vf86end.fth + include vf86core.fs + include vf86dkey.fs + include vf86dos.fs + include vf86file.fs + include vf86end.fs \log logclose flush diff --git a/8086/msdos/src/v4thblk.fth b/8086/msdos/src/v4thblk.fs similarity index 75% rename from 8086/msdos/src/v4thblk.fth rename to 8086/msdos/src/v4thblk.fs index e01bf48..2417b1f 100644 --- a/8086/msdos/src/v4thblk.fth +++ b/8086/msdos/src/v4thblk.fs @@ -18,12 +18,12 @@ new v4thblk.com Onlyforth Target definitions - include vf86core.fth - include vf86dkey.fth - include vf86dos.fth - include vf86file.fth - include vf86bufs.fth - include vf86end.fth + include vf86core.fs + include vf86dkey.fs + include vf86dos.fs + include vf86file.fs + include vf86bufs.fs + include vf86end.fs \log logclose flush diff --git a/8086/msdos/src/v4thi.fth b/8086/msdos/src/v4thi.fs similarity index 78% rename from 8086/msdos/src/v4thi.fth rename to 8086/msdos/src/v4thi.fs index 60df6da..52edee9 100644 --- a/8086/msdos/src/v4thi.fth +++ b/8086/msdos/src/v4thi.fs @@ -18,11 +18,11 @@ new v4thi.com Onlyforth Target definitions - include vf86core.fth - include vf86ikey.fth - include vf86dos.fth - include vf86file.fth - include vf86end.fth + include vf86core.fs + include vf86ikey.fs + include vf86dos.fs + include vf86file.fs + include vf86end.fs \log logclose flush diff --git a/8086/msdos/src/vf86bufs.fth b/8086/msdos/src/vf86bufs.fs similarity index 100% rename from 8086/msdos/src/vf86bufs.fth rename to 8086/msdos/src/vf86bufs.fs diff --git a/8086/msdos/src/vf86core.fth b/8086/msdos/src/vf86core.fs similarity index 100% rename from 8086/msdos/src/vf86core.fth rename to 8086/msdos/src/vf86core.fs diff --git a/8086/msdos/src/vf86dkey.fth b/8086/msdos/src/vf86dkey.fs similarity index 100% rename from 8086/msdos/src/vf86dkey.fth rename to 8086/msdos/src/vf86dkey.fs diff --git a/8086/msdos/src/vf86dos.fth b/8086/msdos/src/vf86dos.fs similarity index 100% rename from 8086/msdos/src/vf86dos.fth rename to 8086/msdos/src/vf86dos.fs diff --git a/8086/msdos/src/vf86end.fth b/8086/msdos/src/vf86end.fs similarity index 100% rename from 8086/msdos/src/vf86end.fth rename to 8086/msdos/src/vf86end.fs diff --git a/8086/msdos/src/vf86file.fth b/8086/msdos/src/vf86file.fs similarity index 100% rename from 8086/msdos/src/vf86file.fth rename to 8086/msdos/src/vf86file.fs diff --git a/8086/msdos/src/vf86ikey.fth b/8086/msdos/src/vf86ikey.fs similarity index 100% rename from 8086/msdos/src/vf86ikey.fth rename to 8086/msdos/src/vf86ikey.fs diff --git a/8086/msdos/tests/ans-shim.fth b/8086/msdos/tests/ans-shim.fs similarity index 100% rename from 8086/msdos/tests/ans-shim.fth rename to 8086/msdos/tests/ans-shim.fs diff --git a/8086/msdos/tests/block.fth b/8086/msdos/tests/block.fs similarity index 100% rename from 8086/msdos/tests/block.fth rename to 8086/msdos/tests/block.fs diff --git a/8086/msdos/tests/core.fr b/8086/msdos/tests/core.fs similarity index 100% rename from 8086/msdos/tests/core.fr rename to 8086/msdos/tests/core.fs diff --git a/8086/msdos/tests/coreacpt.fth b/8086/msdos/tests/coreacpt.fs similarity index 100% rename from 8086/msdos/tests/coreacpt.fth rename to 8086/msdos/tests/coreacpt.fs diff --git a/8086/msdos/tests/coreext.fth b/8086/msdos/tests/coreext.fs similarity index 100% rename from 8086/msdos/tests/coreext.fth rename to 8086/msdos/tests/coreext.fs diff --git a/8086/msdos/tests/coreplus.fth b/8086/msdos/tests/coreplus.fs similarity index 100% rename from 8086/msdos/tests/coreplus.fth rename to 8086/msdos/tests/coreplus.fs diff --git a/8086/msdos/tests/doubltst.fth b/8086/msdos/tests/doubltst.fs similarity index 100% rename from 8086/msdos/tests/doubltst.fth rename to 8086/msdos/tests/doubltst.fs diff --git a/8086/msdos/tests/errorrep.fth b/8086/msdos/tests/errorrep.fs similarity index 100% rename from 8086/msdos/tests/errorrep.fth rename to 8086/msdos/tests/errorrep.fs diff --git a/8086/msdos/tests/golden/block.golden b/8086/msdos/tests/golden/block.golden index d241942..9bbb027 100644 --- a/8086/msdos/tests/golden/block.golden +++ b/8086/msdos/tests/golden/block.golden @@ -1,5 +1,5 @@ FLUSH exists -BLOCK.FTH **=== NOT TESTED === ******* Scr 21 Dr 5 EMPTY.FB +BLOCK.FS **=== NOT TESTED === ******* Scr 21 Dr 5 EMPTY.FB 0 Should show a (mostly) blank screen 1 2 diff --git a/8086/msdos/tests/golden/core.golden b/8086/msdos/tests/golden/core.golden index 607d2cd..e497700 100644 --- a/8086/msdos/tests/golden/core.golden +++ b/8086/msdos/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/8086/msdos/tests/golden/coreext.golden b/8086/msdos/tests/golden/coreext.golden index 4b81e2d..70b25f9 100644 --- a/8086/msdos/tests/golden/coreext.golden +++ b/8086/msdos/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/8086/msdos/tests/golden/coreplus.golden b/8086/msdos/tests/golden/coreplus.golden index 0c3fde5..70397bb 100644 --- a/8086/msdos/tests/golden/coreplus.golden +++ b/8086/msdos/tests/golden/coreplus.golden @@ -1,5 +1,5 @@ -COREPLUS.FTH ******** +COREPLUS.FS ******** You should see 2345: 2345 ***** End of additional Core tests diff --git a/8086/msdos/tests/golden/doubltst.golden b/8086/msdos/tests/golden/doubltst.golden index 146428f..030a2a1 100644 --- a/8086/msdos/tests/golden/doubltst.golden +++ b/8086/msdos/tests/golden/doubltst.golden @@ -1,3 +1,3 @@ -DOUBLTST.FTH ***************** +DOUBLTST.FS ***************** End of Double-Number word tests diff --git a/8086/msdos/tests/golden/prelim.golden b/8086/msdos/tests/golden/prelim.golden index d381a31..9f312f3 100644 --- a/8086/msdos/tests/golden/prelim.golden +++ b/8086/msdos/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/8086/msdos/tests/golden/volks4th-prelim.golden b/8086/msdos/tests/golden/volks4th-prelim.golden index cd2bedb..5bf0ad0 100644 --- a/8086/msdos/tests/golden/volks4th-prelim.golden +++ b/8086/msdos/tests/golden/volks4th-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/8086/msdos/tests/incltest.fth b/8086/msdos/tests/incltest.fs similarity index 100% rename from 8086/msdos/tests/incltest.fth rename to 8086/msdos/tests/incltest.fs diff --git a/8086/msdos/tests/log2file.fth b/8086/msdos/tests/log2file.fs similarity index 100% rename from 8086/msdos/tests/log2file.fth rename to 8086/msdos/tests/log2file.fs diff --git a/8086/msdos/tests/logapp.fth b/8086/msdos/tests/logapp.fs similarity index 100% rename from 8086/msdos/tests/logapp.fth rename to 8086/msdos/tests/logapp.fs diff --git a/8086/msdos/tests/logprep.fth b/8086/msdos/tests/logprep.fs similarity index 64% rename from 8086/msdos/tests/logprep.fth rename to 8086/msdos/tests/logprep.fs index 4e4e3d6..bcc0116 100644 --- a/8086/msdos/tests/logprep.fth +++ b/8086/msdos/tests/logprep.fs @@ -1,7 +1,7 @@ - include extend2.fth + include extend2.fs \needs drv : drv 2 ; \ showing C: if drv isn't defined - include multivid.fth + include multivid.fs \ : .blk|tib \ blk @ ?dup IF ." Blk " u. ?cr exit THEN @@ -9,6 +9,6 @@ \ ' .blk|tib Is .status -\ include dos2.fth - include dos3.fth - include log2file.fth +\ include dos2.fs + include dos3.fs + include log2file.fs diff --git a/8086/msdos/tests/prelim.fth b/8086/msdos/tests/prelim.fs similarity index 100% rename from 8086/msdos/tests/prelim.fth rename to 8086/msdos/tests/prelim.fs diff --git a/8086/msdos/tests/test-blk.fs b/8086/msdos/tests/test-blk.fs new file mode 100644 index 0000000..c8083ac --- /dev/null +++ b/8086/msdos/tests/test-blk.fs @@ -0,0 +1,26 @@ + +include log2file.fs +logopen output.log + +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 + +: flush logclose flush logreopen ; +include block.fs + +REPORT-ERRORS + +logclose + diff --git a/8086/msdos/tests/test-blk.fth b/8086/msdos/tests/test-blk.fth deleted file mode 100644 index 76840f0..0000000 --- a/8086/msdos/tests/test-blk.fth +++ /dev/null @@ -1,26 +0,0 @@ - -include log2file.fth -logopen output.log - -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 - -: flush logclose flush logreopen ; -include block.fth - -REPORT-ERRORS - -logclose - diff --git a/8086/msdos/tests/test-min.fs b/8086/msdos/tests/test-min.fs new file mode 100644 index 0000000..f4642a5 --- /dev/null +++ b/8086/msdos/tests/test-min.fs @@ -0,0 +1,14 @@ + +include log2file.fs +logopen output.log + +include ans-shim.fs +: \vf [compile] \ ; immediate + +include prelim.fs +include tester.fs + +\ 1 verbose ! +include core.fs + +logclose diff --git a/8086/msdos/tests/test-min.fth b/8086/msdos/tests/test-min.fth deleted file mode 100644 index 68071f9..0000000 --- a/8086/msdos/tests/test-min.fth +++ /dev/null @@ -1,14 +0,0 @@ - -include log2file.fth -logopen output.log - -include ans-shim.fth -: \vf [compile] \ ; immediate - -include prelim.fth -include tester.fth - -\ 1 verbose ! -include core.fr - -logclose diff --git a/8086/msdos/tests/test-std.fth b/8086/msdos/tests/test-std.fs similarity index 53% rename from 8086/msdos/tests/test-std.fth rename to 8086/msdos/tests/test-std.fs index baaea50..eecf38d 100644 --- a/8086/msdos/tests/test-std.fth +++ b/8086/msdos/tests/test-std.fs @@ -3,26 +3,26 @@ \ blk @ ?dup IF ." Blk " u. ?cr exit THEN \ incfile @ IF tib #tib @ cr type THEN ; -include log2file.fth +include log2file.fs logopen output.log -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/8086/msdos/tests/tester.fth b/8086/msdos/tests/tester.fs similarity index 100% rename from 8086/msdos/tests/tester.fth rename to 8086/msdos/tests/tester.fs diff --git a/8086/msdos/tests/util.fth b/8086/msdos/tests/util.fs similarity index 100% rename from 8086/msdos/tests/util.fth rename to 8086/msdos/tests/util.fs diff --git a/8086/msdos/tests/vocdos.fth b/8086/msdos/tests/vocdos.fs similarity index 100% rename from 8086/msdos/tests/vocdos.fth rename to 8086/msdos/tests/vocdos.fs diff --git a/8086/msdos/tests/vocforth.fth b/8086/msdos/tests/vocforth.fs similarity index 100% rename from 8086/msdos/tests/vocforth.fth rename to 8086/msdos/tests/vocforth.fs