[Win32forth-cvs] win32forth/src paths.f,1.16,1.17

[Dirk B. <db...@us...>]

Update of /cvsroot/win32forth/win32forth/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8143/src

Modified Files:
	paths.f 
Log Message:
Keywords: %FORTHDIR%   %CURRENTDIR%  and %APPDIR% to the search path support.

Index: paths.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/paths.f,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** paths.f	27 Jul 2006 07:21:10 -0000	1.16
--- paths.f	30 Jul 2006 08:38:00 -0000	1.17
***************
*** 92,96 ****
  \ *G Get the next path from dir list.
                  dup>r path-source 2@ 2dup ';' scan  2dup 1 /string r> path-source 2!
!                 nip - ;
  
  : reset-path-source     ( path-ptr --  )
--- 92,101 ----
  \ *G Get the next path from dir list.
                  dup>r path-source 2@ 2dup ';' scan  2dup 1 /string r> path-source 2!
!                 nip -
! 
!                 2dup s" %FORTHDIR%"   ISTR= if 2drop &forthdir    dup ?+\ count "path-only" exit then
!                 2dup s" %CURRENTDIR%" ISTR= if 2drop current-dir$ dup ?+\ count "path-only" exit then
!                 2dup s" %APPDIR%"     ISTR= if 2drop &prognam             count "path-only" exit then
!                 ;
  
  : reset-path-source     ( path-ptr --  )
***************
*** 100,104 ****
  : first-path"   ( path-ptr -- a1 n1  )
  \ *G Get the first forth directory path.
!                 dup>r reset-path-source  r>  next-path" ;
  
  : "path+       ( a1 n1 path-ptr -- )
--- 105,109 ----
  : first-path"   ( path-ptr -- a1 n1  )
  \ *G Get the first forth directory path.
!                 dup>r reset-path-source  r> next-path" ;
  
  : "path+       ( a1 n1 path-ptr -- )
***************
*** 182,193 ****
  \ *G Initialize the Forth directory search path list.
                  path-ptr off \ clear path list
!                 s" ."       "fpath+ \ current dir is first
!                 &forthdir count "fpath+
!                 s" src"     "fpath+
!                 s" src\lib" "fpath+
!                 s" src\gdi" "fpath+ \ GDI class library
!                 s" src\res" "fpath+
!                 s" src\console" "fpath+
!                 s" doc"     "fpath+ \ last
                  ;
  
--- 187,203 ----
  \ *G Initialize the Forth directory search path list.
                  path-ptr off \ clear path list
! \                s" ."       "fpath+ \ current dir is first
! \                &forthdir count "fpath+
!                 s" %CURRENTDIR%" "fpath+
!                 s" %FORTHDIR%"   "fpath+
!                 s" %APPDIR%"     "fpath+
! 
!                 s" src"          "fpath+
!                 s" src\lib"      "fpath+
!                 s" src\tools"    "fpath+
!                 s" src\gdi"      "fpath+ \ GDI class library
!                 s" src\res"      "fpath+
!                 s" src\console"  "fpath+
!                 s" doc"          "fpath+ \ last
                  ;