[Win32forth-cvs] win32forth/src MAPFILE.F,1.5,1.6 Primutil.f,1.5,1.6 Utils.f,1.6,1.7

[George H. <geo...@us...>]

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

Modified Files:
	MAPFILE.F Primutil.f Utils.f 
Log Message:
gah:  replaced 2swap 2drop with 2nip and other minor optimizations

Index: Utils.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/Utils.f,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Utils.f	1 May 2005 06:27:41 -0000	1.6
--- Utils.f	3 May 2005 15:05:54 -0000	1.7
***************
*** 209,217 ****
                  pocket pocket$ MAXSTRING move   \ get current pocket contents
                  editor-present?                 \ TRUE if editor is loaded
!                 if      cur-file count "path-file 0=
!                         if      ed-filename place
!                         else    2drop
!                                 cur-file count ed-filename place
!                         then
                          watched-cfa >name nfa-count ed-name place
                          cur-line @     ed-line !
--- 209,216 ----
                  pocket pocket$ MAXSTRING move   \ get current pocket contents
                  editor-present?                 \ TRUE if editor is loaded
!                 if      cur-file count "path-file
!                         if      2drop
!                                 cur-file count
!                         then    ed-filename place
                          watched-cfa >name nfa-count ed-name place
                          cur-line @     ed-line !
***************
*** 758,763 ****
                  while   type cr
                          10 ms
!                 repeat  2drop
!                 locHdl close-file drop ;
  
  : ftype         ( -<filename>- )
--- 757,762 ----
                  while   type cr
                          10 ms
!                 repeat
!                 locHdl close-file 3drop ;
  
  : ftype         ( -<filename>- )

Index: Primutil.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/Primutil.f,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Primutil.f	1 May 2005 06:27:41 -0000	1.5
--- Primutil.f	3 May 2005 15:05:54 -0000	1.6
***************
*** 358,363 ****
                  2dup [char] \ scan 2dup 2>r nip -       \ leading part of string
                  here place                              \ save in BNAME
!                 2r> dup
!                 IF      over 1+ c@ upc [char] T =
                          IF      9         here c+place
                                  2 /string here  +place
--- 358,363 ----
                  2dup [char] \ scan 2dup 2>r nip -       \ leading part of string
                  here place                              \ save in BNAME
!                 2r>
!                 -IF     over 1+ c@ upc [char] T =
                          IF      9         here c+place
                                  2 /string here  +place

Index: MAPFILE.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/MAPFILE.F,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MAPFILE.F	1 May 2005 06:27:41 -0000	1.5
--- MAPFILE.F	3 May 2005 15:05:54 -0000	1.6
***************
*** 242,247 ****
                  0 to ed-ptr                     \ initialize to not present
                  0 to ed-hndl
!                 z" SharedEditMemory" ed-size open-share dup
!                 IF      to ed-hndl
                          to ed-ptr
                          init-shared-type        \ bump count of Forths currently running
--- 242,247 ----
                  0 to ed-ptr                     \ initialize to not present
                  0 to ed-hndl
!                 z" SharedEditMemory" ed-size open-share
!                 -IF     to ed-hndl
                          to ed-ptr
                          init-shared-type        \ bump count of Forths currently running