[Win32forth-cvs] win32forth-stc/src paths.f,1.2,1.3

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

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

Modified Files:
	paths.f 
Log Message:
Removed some temp change because AS now work's as expected in the STC-Kernel.

Index: paths.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth-stc/src/paths.f,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** paths.f	23 Sep 2006 10:18:34 -0000	1.2
--- paths.f	24 Sep 2006 08:32:38 -0000	1.3
***************
*** 31,63 ****
  [endif]
  
  1 PROC PathRemoveFileSpec    as (call-prfs)
  1 PROC PathRemoveExtension   as (call-pre)
  
! \ Temp fix until AS work's within the STC-Kernel
! \ : ("path-func") ( a1 n1 xt -- a2 n2 )   \ execute path function
! \                 -rot                    \ save the xt under the string
! \                 over >r                 \ save original address
! \                 MAX-PATH _localalloc    \ allocate space on stack
! \                 -z dup>r           \ make a zstring
! \                 swap execute drop       \ call the function
! \                 r> zcount               \ count the chars
! \                 _localfree
! \                 nip r> swap             \ use original address
! \                 ;
! 
! \ : "path-only"   ( a1 n1 -- a2 n2 )      \ return path, minus final '\'
! \                 ['] (call-prfs) ("path-func")
! \                 ;
! \
! \ : "minus-ext"   ( a1 n1 -- a2 n2 )      \ remove the file extension
! \                 ['] (call-pre) ("path-func")
! \                 ;
! 
! : "path-only"   ( a1 n1 -- a2 n2 )
! \ *G Return path, minus final '\'
                  over >r                 \ save original address
!                 MAX_PATH _localalloc    \ allocate space on stack
                  ascii-z dup>r           \ make a zstring
!                 call PathRemoveFileSpec drop       \ call the function
                  r> zcount               \ count the chars
                  _localfree
--- 31,45 ----
  [endif]
  
+ internal
+ 
  1 PROC PathRemoveFileSpec    as (call-prfs)
  1 PROC PathRemoveExtension   as (call-pre)
  
! : ("path-func") ( a1 n1 xt -- a2 n2 )   \ execute path function
!                 -rot                    \ save the xt under the string
                  over >r                 \ save original address
!                 MAX-PATH _localalloc    \ allocate space on stack
                  ascii-z dup>r           \ make a zstring
!                 swap execute drop       \ call the function
                  r> zcount               \ count the chars
                  _localfree
***************
*** 65,78 ****
                  ;
  
  : "minus-ext"   ( a1 n1 -- a2 n2 )
! \ *G Remove the file extension
!                 over >r                 \ save original address
!                 MAX_PATH _localalloc    \ allocate space on stack
!                 ascii-z dup>r           \ make a zstring
!                 call PathRemoveExtension drop       \ call the function
!                 r> zcount               \ count the chars
!                 _localfree
!                 nip r> swap             \ use original address
!                 ;
  
  : ".ext-only"   ( a1 n1 -- a1 n1 )
--- 47,59 ----
                  ;
  
+ external
+ 
+ : "path-only"   ( a1 n1 -- a2 n2 )
+ \ *G return path, minus final '\'
+                 ['] (call-prfs) ("path-func") ;
+ 
  : "minus-ext"   ( a1 n1 -- a2 n2 )
! \ *G remove the file extension
!                 ['] (call-pre) ("path-func") ;
  
  : ".ext-only"   ( a1 n1 -- a1 n1 )
***************
*** 411,420 ****
  \ ** n2=0 means not in search path.
          dup>r reset-path-source
!                 begin   r@ path-source 2@ nip 0>
!                                 if      r@ next-path" 4dup IsPathRelativeTo? not
!                                 else    over 0  false
!                                 then
!                 while   2drop
!                 repeat
          2nip  r>drop
   ;
--- 392,401 ----
  \ ** n2=0 means not in search path.
          dup>r reset-path-source
!         begin   r@ path-source 2@ nip 0>
!                 if      r@ next-path" 4dup IsPathRelativeTo? not
!                 else    over 0  false
!                 then
!         while   2drop
!         repeat
          2nip  r>drop
   ;