Implement REQUIRE (Forth 2012)

[pforth] / fth / t_file.fth

diff --git a/fth/t_file.fth b/fth/t_file.fth
index e6ba0bd..7171a78 100644 (file)
--- a/fth/t_file.fth
+++ b/fth/t_file.fth
@@ -214,12 +214,12 @@ T{ FN2 R/W BIN OPEN-FILE SWAP DROP 0= -> FALSE }T
 T{ FN2 DELETE-FILE 0= -> FALSE }T
 
 \ ----------------------------------------------------------------------------
 T{ FN2 DELETE-FILE 0= -> FALSE }T
 
 \ ----------------------------------------------------------------------------

-\ TESTING multi-line ( comments
-\ 
-\ T{ ( 1 2 3
-\ 4 5 6
-\ 7 8 9 ) 11 22 33 -> 11 22 33 }T
-\ 
+TESTING multi-line ( comments
+
+T{ ( 1 2 3
+4 5 6
+7 8 9 ) 11 22 33 -> 11 22 33 }T
+

 \ ----------------------------------------------------------------------------
 TESTING SOURCE-ID (can only test it does not return 0 or -1)
 
 \ ----------------------------------------------------------------------------
 TESTING SOURCE-ID (can only test it does not return 0 or -1)
 


@@ -246,6 +246,21 @@ T{ FID1 @ CLOSE-FILE -> 0 }T
 \ Tidy the test folder
 T{ fn3 DELETE-FILE DROP -> }T
 
 \ Tidy the test folder
 T{ fn3 DELETE-FILE DROP -> }T
 

+\ ------------------------------------------------------------------------------
+TESTING REQUIRED REQUIRE INCLUDED
+\ Tests taken from Forth 2012 RfD
+
+T{ 0 S" t_required-helper1.fth" REQUIRED
+     REQUIRE t_required-helper1.fth
+     INCLUDE t_required-helper1.fth
+     -> 2 }T
+
+T{ 0 INCLUDE t_required-helper2.fth
+     S" t_required-helper2.fth" REQUIRED
+     REQUIRE t_required-helper2.fth
+     S" t_required-helper2.fth" INCLUDED
+     -> 2 }T
+

 \ ----------------------------------------------------------------------------
 TESTING two buffers available for S" and/or S\" (Forth 2012)
 
 \ ----------------------------------------------------------------------------
 TESTING two buffers available for S" and/or S\" (Forth 2012)