Update of /cvsroot/win32forth/win32forth/src/kernel
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6830/src/kernel
Modified Files:
fkernel.f version.f
Log Message:
- Renamed ?LOADING into LOADING?
- Replaced DEFER@ with ACTION-OF
- and some other minor changes
Index: fkernel.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/kernel/fkernel.f,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** fkernel.f 18 Sep 2006 10:08:09 -0000 1.38
--- fkernel.f 3 Oct 2006 07:44:22 -0000 1.39
***************
*** 2074,2079 ****
0 VALUE SOURCE-POSITION \ readded for cf32 port (Samstag, August 13 2005 dbu)
! \ Note: ?LOADING was defined as a variable in older w32f versions !!!
! : ?LOADING ( -- flag ) \ are we loading?
source-id -1 0 between 0= ;
--- 2074,2080 ----
0 VALUE SOURCE-POSITION \ readded for cf32 port (Samstag, August 13 2005 dbu)
! \ Renamed ?LOADING to LOADING? because ?LOADING was defined as a variable
! \ in older w32f versions (Dienstag, Oktober 03 2006 dbu).
! : LOADING? ( -- flag ) \ are we loading?
source-id -1 0 between 0= ;
***************
*** 4276,4280 ****
|: _HEADER-OPT ( -- ) \ optional fields
! ?LOADING IF \ if loading...
LOADFILE \ file
LOADLINE @ \ line number
--- 4277,4281 ----
|: _HEADER-OPT ( -- ) \ optional fields
! LOADING? IF \ if loading...
LOADFILE \ file
LOADLINE @ \ line number
***************
*** 4861,4865 ****
\ September 23rd, 2003 - dbu
: LINKFILE ( a1 -- ) \ link name a1 as current file IF LOADING ONLY !!
! ?LOADING
IF
MAXCOUNTED _LOCALALLOC \ alloc local path buffer
--- 4862,4866 ----
\ September 23rd, 2003 - dbu
: LINKFILE ( a1 -- ) \ link name a1 as current file IF LOADING ONLY !!
! LOADING?
IF
MAXCOUNTED _LOCALALLOC \ alloc local path buffer
***************
*** 4908,4912 ****
LOADLINE !
TO LOADFILE
! ?LOADING
IF
LOADFILE COUNT CUR-FILE PLACE \ make current again
--- 4909,4913 ----
LOADLINE !
TO LOADFILE
! LOADING?
IF
LOADFILE COUNT CUR-FILE PLACE \ make current again
***************
*** 5372,5376 ****
|: (TYPEMSG) ( n addr len -- )
! ?LOADING IF CR SOURCE TYPE THEN \ print source line if loading
CR >IN @ DUP (SOURCE) @ < + \ adjust if not at end of line
POCKET C@ DUP>R - SPACES \ spaces
--- 5373,5377 ----
|: (TYPEMSG) ( n addr len -- )
! LOADING? IF CR SOURCE TYPE THEN \ print source line if loading
CR >IN @ DUP (SOURCE) @ < + \ adjust if not at end of line
POCKET C@ DUP>R - SPACES \ spaces
***************
*** 5388,5392 ****
IF 2 CELLS+ ?TYPE PTRNULL THEN \ print the message, set ptr 2 null to stop loop
REPEAT
! ?LOADING IF
." in file " LOADFILE ?TYPE
." at line " LOADLINE @ .
--- 5389,5393 ----
IF 2 CELLS+ ?TYPE PTRNULL THEN \ print the message, set ptr 2 null to stop loop
REPEAT
! LOADING? IF
." in file " LOADFILE ?TYPE
." at line " LOADLINE @ .
***************
*** 5401,5405 ****
DUP 1+ IF \ only do this for real errors, not -1 throw
S" Error" (TYPEMSG) \ mark the source line in error, error
! ?LOADING IF EDIT-ERROR THEN \ edit if loading
else drop
THEN ;
--- 5402,5406 ----
DUP 1+ IF \ only do this for real errors, not -1 throw
S" Error" (TYPEMSG) \ mark the source line in error, error
! LOADING? IF EDIT-ERROR THEN \ edit if loading
else drop
THEN ;
|
