[Win32forth-cvs] win32forth/src/kernel fkernel.f,1.14,1.15

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

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

Modified Files:
	fkernel.f 
Log Message:
gah: modified SEE to detect the difference between EXIT plus and ; EXITM and ;M. Made _EXIT and EXITP aliases of UNNEST and UNNESTP

Index: fkernel.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/kernel/fkernel.f,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** fkernel.f	2 Jun 2005 21:14:55 -0000	1.14
--- fkernel.f	6 Jun 2005 09:44:39 -0000	1.15
***************
*** 125,132 ****
                  next    c;
  
! NCODE _EXIT     ( -- )          \ exit the current Forth definition
!                 mov     esi, 0 [ebp]
!                 add     ebp, # 4
!                 next    c;
  
  NCODE LIT       ( -- n )        \ push the literal value following LIT in the
--- 125,129 ----
                  next    c;
  
! ' UNNEST ALIAS _EXIT
  
  NCODE LIT       ( -- n )        \ push the literal value following LIT in the
***************
*** 2009,2013 ****
    THROW_MSGS LINK, THROW_WINERR              , ," Windows DLL error"
    THROW_MSGS LINK, THROW_STACKCHG            , ," stack changed"
!   THROW_MSGS LINK, THROW_METHEXIT            , ," can't use EXIT in a method"
    THROW_MSGS LINK, THROW_METHDOES>           , ," can't use DOES> in a method"
    THROW_MSGS LINK, THROW_METH;M              , ," method must end with ;M"
--- 2006,2010 ----
    THROW_MSGS LINK, THROW_WINERR              , ," Windows DLL error"
    THROW_MSGS LINK, THROW_STACKCHG            , ," stack changed"
!   THROW_MSGS LINK, THROW_METHEXIT            , ," can't be used in a method"
    THROW_MSGS LINK, THROW_METHDOES>           , ," can't use DOES> in a method"
    THROW_MSGS LINK, THROW_METH;M              , ," method must end with ;M"
***************
*** 2457,2461 ****
                  dup to -ve-num? negate /string
                  0 0 2swap >number nip
!                 if false _exit then             \ leave if not all converted
                  -ve-num? if dnegate then true ;
  
--- 2454,2458 ----
                  dup to -ve-num? negate /string
                  0 0 2swap >number nip
!                 if false exit then             \ leave if not all converted
                  -ve-num? if dnegate then true ;
  
***************
*** 4934,4944 ****
                  next    c;
  
! NCODE EXITP     ( -- )                  \ exit the current Forth definition, remove parms
!                 mov     ebp, LP [UP]
!                 mov     eax, 0 [ebp]
!                 mov     esi, 4 [ebp]
!                 mov     LP [UP], eax
!                 add     ebp, # 8
!                 next    c;
  
  NCODE INIT-LOCALS ( loc1 loc2 ... -- )
--- 4931,4935 ----
                  next    c;
  
! ' UNNESTP ALIAS EXITP
  
  NCODE INIT-LOCALS ( loc1 loc2 ... -- )
***************
*** 5655,5664 ****
                  EXIT_A
                  PARMS
!                 IF      COMPILE EXITP
!                 ELSE    COMPILE _EXIT
                  THEN    ; IMMEDIATE
  
  : ?EXIT         ( F1 -- )
!                 EXIT_A
                  [COMPILE]  IF
                  [COMPILE]  EXIT
--- 5646,5655 ----
                  EXIT_A
                  PARMS
!                 IF      COMPILE UNNESTP
!                 ELSE    COMPILE UNNEST
                  THEN    ; IMMEDIATE
  
  : ?EXIT         ( F1 -- )
! \                EXIT_A
                  [COMPILE]  IF
                  [COMPILE]  EXIT
***************
*** 5710,5714 ****
                  IF      COMPILE UNNESTP
                  ELSE    COMPILE UNNEST
!                 THEN    [COMPILE] [ PARMS-INIT DO-;CHAIN ; IMMEDIATE
  
  
--- 5701,5705 ----
                  IF      COMPILE UNNESTP
                  ELSE    COMPILE UNNEST
!                 THEN ( EXIT_B )  [COMPILE] [ PARMS-INIT DO-;CHAIN ; IMMEDIATE
  
  
***************
*** 5719,5722 ****
--- 5710,5714 ----
  in-application
  
+  ' UNNEST        RESOLVES EXIT
  ' CONSTANT      RESOLVES CONSTANT 
  ' THROW         RESOLVES THROW
***************
*** 5732,5733 ****
--- 5724,5726 ----
  ' ?THROW        RESOLVES ?THROW
  ' WARNMSG       RESOLVES WARNMSG
+