[Win32forth-cvs] win32forth/src/kernel fkernel.f,1.79,1.80

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

Update of /cvsroot/win32forth/win32forth/src/kernel
In directory vz-cvs-4.sog:/tmp/cvs-serv1203

Modified Files:
	fkernel.f 
Log Message:
Improved RESTORE-INPUT and error reporting

Index: fkernel.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/kernel/fkernel.f,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** fkernel.f	14 Sep 2011 13:18:19 -0000	1.79
--- fkernel.f	17 Sep 2011 14:30:19 -0000	1.80
***************
*** 5046,5052 ****
                  IF
                    LOADFILE COUNT CUR-FILE PLACE \ make current again
!                   0 to source-position
!                   0 0 source-id reposition-file drop
!                   >in @ LOADLINE @  0 LoadLine ! 0 ?do refill drop loop >in !
                  THEN
                  FALSE ;
--- 5046,5054 ----
                  IF
                    LOADFILE COUNT CUR-FILE PLACE \ make current again
! \                   0 to source-position
! \                   0 0 source-id reposition-file THROW_FILEREADFAIL ?THROW
! \                   >in @ LOADLINE @  0 LoadLine ! 0 ?do refill drop loop >in !
!                   source-position 0 source-id reposition-file THROW_FILEREADFAIL ?THROW
!                   TIB MAXSTRING SOURCE-ID READ-LINE THROW_FILEREADFAIL ?THROW drop (SOURCE) !
                  THEN
                  FALSE ;
***************
*** 5572,5582 ****
                  S>D (D.) TYPE ." ): "                    \ i.e "Error(-234): <name> "
                  POCKET ?TYPE                             \ show whatever was parsed by WORD
-                 MSG @ ?TYPE                              \ if message already set, print it
-                 NULLMSG MSG !                            \ set null message
                  THROW_MSGS                               \ list of message
                  BEGIN @ ?DUP                             \ get pointer to next message
                  WHILE DUP CELL+ @ LAST-ERROR =           \ if it matches
!                   IF 2 CELLS+ ?TYPE PTRNULL THEN         \ print the message, set ptr 2 null to stop loop
                  REPEAT
                  LOADING? IF
                    ." in file " LOADFILE ?TYPE
--- 5574,5585 ----
                  S>D (D.) TYPE ." ): "                    \ i.e "Error(-234): <name> "
                  POCKET ?TYPE                             \ show whatever was parsed by WORD
                  THROW_MSGS                               \ list of message
                  BEGIN @ ?DUP                             \ get pointer to next message
                  WHILE DUP CELL+ @ LAST-ERROR =           \ if it matches
!                   IF 2 CELLS+ ?TYPE NULLMSG MSG !        \ print the message and clear it
!                     PTRNULL THEN                         \ set ptr to null to stop loop
                  REPEAT
+                 MSG @ ?TYPE                              \ if message already set, print it
+                 NULLMSG MSG !                            \ set null message
                  LOADING? IF
                    ." in file " LOADFILE ?TYPE