From 7c826f085ffd60404b6021c3bd6e8a60a29978be Mon Sep 17 00:00:00 2001
From: Philip Zembrod <pzembrod@gmail.com>
Date: Sat, 9 Nov 2024 17:10:56 +0100
Subject: [PATCH] Include vf-file.fth in v4th.com and use sfileint.fth in
 tests.

---
 8080/CPM/Makefile      | 32 ++++++++++++++++----------------
 8080/CPM/src/v4th.fth  |  1 +
 8080/CPM/src/vf-io.fth |  2 +-
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/8080/CPM/Makefile b/8080/CPM/Makefile
index 7b82a7b..4fc612d 100644
--- a/8080/CPM/Makefile
+++ b/8080/CPM/Makefile
@@ -104,7 +104,7 @@ $(patsubst %, $(cpmfilesdir)/%, kernel.com \
 
 $(cpmfilesdir)/v4th.com: \
     $(patsubst %, $(cpmfilesdir)/%, tc-base.com \
-    target.fb v4th.fth vf-core.fth \
+    target.fb v4th.fth vf-core.fth vf-file.fth \
     vf-io.fth vf-bufs.fth vf-sys.fth vf-end.fth vf-bdos.fth) \
     Makefile | emu
 	rm -f $(runcpmdir)/A/0/V4TH.COM $(runcpmdir)/A/0/LOGFILE.TXT $@
@@ -168,42 +168,42 @@ test-kernel.log: \
 	dos2unix -n $(runcpmdir)/logfile.txt $@
 
 test-min.log: \
-    $(patsubst %, $(cpmfilesdir)/%, v4th.com fileint.fb \
-    include.fb log2file.fb \
+    $(patsubst %, $(cpmfilesdir)/%, v4th.com sfileint.fth \
+    log2file.fb \
     ans-shim.fth prelim.fth tester.fth core.fr test-min.fth) \
     | emu
 	./emulator/run-in-runcpm.sh \
-	    "v4th fileint.fb" \
-	    "1 load onlyforth" \
-	    "include include.fb" \
+	    "v4th sfileint.fth" \
+	    "include-isfile" \
+	    "onlyforth" \
 	    "include test-min.fth" \
 	    "bye" \
 	    "exit"
 	dos2unix -n $(runcpmdir)/logfile.txt $@
 
 test-std.log: \
-    $(patsubst %, $(cpmfilesdir)/%, v4th.com fileint.fb \
-    include.fb log2file.fb core.fr) \
+    $(patsubst %, $(cpmfilesdir)/%, v4th.com sfileint.fth \
+    log2file.fb core.fr) \
     $(patsubst tests/%, $(cpmfilesdir)/%, $(wildcard tests/*.fth)) \
     | emu
 	./emulator/run-in-runcpm.sh \
-	    "v4th fileint.fb" \
-	    "1 load onlyforth" \
-	    "include include.fb" \
+	    "v4th sfileint.fth" \
+	    "include-isfile" \
+	    "onlyforth" \
 	    "include test-std.fth" \
 	    "bye" \
 	    "exit"
 	dos2unix -n $(runcpmdir)/logfile.txt $@
 
 test-blk.log: \
-    $(patsubst %, $(cpmfilesdir)/%, v4th.com fileint.fb \
-    include.fb log2file.fb core.fr) \
+    $(patsubst %, $(cpmfilesdir)/%, v4th.com sfileint.fth \
+    log2file.fb core.fr) \
     $(patsubst tests/%, $(cpmfilesdir)/%, $(wildcard tests/*.fth) \
     tests/empty.fb) | emu
 	./emulator/run-in-runcpm.sh \
-	    "v4th fileint.fb" \
-	    "1 load onlyforth" \
-	    "include include.fb" \
+	    "v4th sfileint.fth" \
+	    "include-isfile" \
+	    "onlyforth" \
 	    "include test-blk.fth" \
 	    "bye" \
 	    "exit"
diff --git a/8080/CPM/src/v4th.fth b/8080/CPM/src/v4th.fth
index c3f344f..dd80368 100644
--- a/8080/CPM/src/v4th.fth
+++ b/8080/CPM/src/v4th.fth
@@ -8,6 +8,7 @@ Target definitions   $100 here!
   include vf-bufs.fth
   include vf-sys.fth
   include vf-bdos.fth
+  include vf-file.fth
   include vf-end.fth
 
 cr .( unresolved: )  .unresolved   ( ' .blk is .status )
diff --git a/8080/CPM/src/vf-io.fth b/8080/CPM/src/vf-io.fth
index 61860ee..0146c07 100644
--- a/8080/CPM/src/vf-io.fth
+++ b/8080/CPM/src/vf-io.fth
@@ -45,7 +45,7 @@ Defer .status   ' noop Is .status
 
 Defer prompt    ' (prompt Is prompt
 
-: (quit       BEGIN prompt query interpret REPEAT ;
+: (quit      clear-tibstash  BEGIN prompt query interpret REPEAT ;
 
 Defer 'quit     ' (quit Is 'quit
 : quit   r0 @ rp!  level off  [compile] [ 'quit ;