duskos

commit 25de1c936efea1f84ad7fdaf97197503c9de047a
parent ee4c507adc3749f743eb91b5bd9013508b449390
Author: Virgil Dupras <hsoft@hardcoded.net>
Date:   Wed, 29 Jun 2022 15:10:38 -0400

Add word "require"

Diffstat:
M
Makefile
 | 
2
+-
M
fs/cc/cc.fs
 | 
3
++-
M
fs/lib/file.fs
 | 
2
+-
M
fs/tests/drv/ramdrive.fs
 | 
2
+-

4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
@@ -20,4 +20,4 @@ test: dusk
 
 .PHONY: clean
 clean:
-	rm -f $(TARGETS) dusk.o
+	rm -f $(TARGETS) dusk.o fatfs
diff --git a/fs/cc/cc.fs b/fs/cc/cc.fs
@@ -1,4 +1,5 @@
-\ Requires sys/scratch sys/xhere
+require sys/scratch.fs
+require sys/xhere.fs
 1 value _debug
 ?f<< lib/str.fs
 ?f<< lib/wordtbl.fs
diff --git a/fs/lib/file.fs b/fs/lib/file.fs
@@ -17,4 +17,4 @@
   s= if 2drop 1 exit then @ repeat 2drop 0 ;
 : .floaded floaded begin dup while dup 4 + stype nl> @ repeat drop ;
 : ?f<< word dup floaded? if drop else fload then ;
-
+: require word dup floaded? not if stype abort"  required" else drop then ;
diff --git a/fs/tests/drv/ramdrive.fs b/fs/tests/drv/ramdrive.fs
@@ -1,6 +1,6 @@
 ?f<< tests/harness.fs
 ?f<< drv/ramdrive.fs
-\ requires sys/scratch
+require sys/scratch.fs
 testbegin
 \ Tests for drv/ramdrive
 fatfs( to ramdrv(