Update of /cvsroot/win32forth/win32forth/src/lib
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8995/src/lib
Modified Files:
FileLister.f SUB_DIRS.F
Log Message:
Jos: Made multiple search path's possible and changed subdirs. Now it will not destroy the search path when sdir is used.
Index: FileLister.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/lib/FileLister.f,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FileLister.f 15 Jun 2006 18:48:46 -0000 1.2
--- FileLister.f 8 Jul 2006 17:50:33 -0000 1.3
***************
*** 533,537 ****
repeat FindClose: FileFinder
\ now we get the rest of the files
! first-path"
begin dup 0>
while TreePath count 2swap SetUp: FileFinder
--- 533,537 ----
repeat FindClose: FileFinder
\ now we get the rest of the files
! path-ptr first-path"
begin dup 0>
while TreePath count 2swap SetUp: FileFinder
***************
*** 543,547 ****
then FindNextFile: FileFinder
repeat FindClose: FileFinder
! next-path"
repeat 2drop
r> to path-ptr ;
--- 543,547 ----
then FindNextFile: FileFinder
repeat FindClose: FileFinder
! path-ptr next-path"
repeat 2drop
r> to path-ptr ;
Index: SUB_DIRS.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/lib/SUB_DIRS.F,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SUB_DIRS.F 4 Jan 2006 22:17:38 -0000 1.5
--- SUB_DIRS.F 8 Jul 2006 17:50:33 -0000 1.6
***************
*** 172,185 ****
THEN ;
EXTERNAL
! : do-files-process ( -- )
! false to search-aborted?
! first-path" "process-directory
! BEGIN next-path" dup
search-aborted? 0= and
WHILE "process-directory
! REPEAT 2drop
;
INTERNAL
--- 172,193 ----
THEN ;
+ Path: sdir-path
+
EXTERNAL
!
! : (do-files-process ( path-ptr -- )
! >r false to search-aborted?
! r@ first-path" "process-directory
! BEGIN r@ next-path" dup
search-aborted? 0= and
WHILE "process-directory
! REPEAT 2drop r>drop
;
+
+ : do-files-process ( -- ) \ In the Forth-part
+ path-ptr (do-files-process
+ ;
+
INTERNAL
***************
*** 212,219 ****
to sub-dirs?
mask-buf place mask-buf +NULL
! path-ptr place path-ptr +NULL
! do-files-process
;
MODULE
--- 220,229 ----
to sub-dirs?
mask-buf place mask-buf +NULL
! sdir-path place sdir-path +NULL
! (do-files-process
;
MODULE
+ \s
+
|
