Simplify

* fth/require.fth (INCLUDED?): What was I thinking? Just use FIND
instead of exotic stuff like FINDNFA.FROM.

* fth/loadp4th.fth: Restore filefind.fth to its original position.

diff --git a/fth/loadp4th.fth b/fth/loadp4th.fth
index 3dcb869..0973fc9 100644 (file)
--- a/fth/loadp4th.fth
+++ b/fth/loadp4th.fth
@@ -26,7 +26,6 @@ include? task-misc2.fth misc2.fth
 include? [if]    condcomp.fth
 include? save-input save-input.fth
 include? read-line  file.fth
-include? file?      filefind.fth
 include? require    require.fth
 
 \ load floating point support if basic support is in kernel
@@ -39,6 +38,7 @@ exists? F*
 include? task-member.fth   member.fth
 include? :struct c_struct.fth
 include? smif{   smart_if.fth
+include? file?   filefind.fth
 include? see     see.fth
 include? words.like wordslik.fth
 include? trace   trace.fth

diff --git a/fth/require.fth b/fth/require.fth
index c18d8c4..18a060a 100644 (file)
--- a/fth/require.fth
+++ b/fth/require.fth
@@ -20,8 +20,7 @@ private{
 : INCLUDED? ( c-addr u -- flag )
     s" ::::" here place         ( c-addr u )
     here $append                ( )
-    here latest findnfa.from    ( x found? )
-    nip
+    here find nip 0<>           ( found? )
 ;
 
 \ FIXME: use real PARSE-NAME when available