[Win32forth-cvs] win32forth/src/kernel fkernel.f,1.2,1.3

[Alex M. <ale...@us...>]

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

Modified Files:
	fkernel.f 
Log Message:
arm: corrected bug in \ comment

Index: fkernel.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/kernel/fkernel.f,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** fkernel.f	2 Jan 2005 23:04:55 -0000	1.2
--- fkernel.f	3 Jan 2005 23:46:33 -0000	1.3
***************
*** 2030,2035 ****
  VARIABLE LOADLINE
  VARIABLE ?LOADING
- 0 VALUE SOURCE-ID
  VARIABLE >IN                    \ offset in to input stream
  
  MAXSTRING 2 + ALIGNED EQU TIBLEN
--- 2030,2035 ----
  VARIABLE LOADLINE
  VARIABLE ?LOADING
  VARIABLE >IN                    \ offset in to input stream
+ 0 VALUE SOURCE-ID
  
  MAXSTRING 2 + ALIGNED EQU TIBLEN
***************
*** 4591,4609 ****
  DEFER INTERPRET    ' _INTERPRET IS INTERPRET
  
- \ -------------------- Evaluate ---------------------------------------------
- 
- : EVALUATE      ( addr len -- ) \ interpret string addr,len
-                 SOURCE 2>R
-                 >IN @ >R
-                 SOURCE-ID >R
-                 (SOURCE) 2!
-                 >IN OFF
-                 -1 TO SOURCE-ID
-                 ['] INTERPRET CATCH
-                 R> TO SOURCE-ID
-                 R> >IN !
-                 2R> (SOURCE) 2!
-                 THROW ;
- 
  1 PROC Sleep
  
--- 4591,4594 ----
***************
*** 4787,4790 ****
--- 4772,4777 ----
  in-application
  
+ \ -------------------- save/restore file input ------------------------------
+ 
  : SAVE-INPUT    ( -- ... 7 )                  \ save input
                  LOADFILE
***************
*** 4810,4816 ****
                  FALSE ;
  
! in-system
! 
! | CODE (SAVE-INPUT) ( -- R: ... 7 )               \ save input to rstack
                  mov     -8 CELLS [ebp], ebx
                  pop     -7 CELLS [ebp]
--- 4797,4801 ----
                  FALSE ;
  
! | CODE (SAVE-INPUT) ( ... 7 -- R: ... 7 )               \ save input to rstack
                  mov     -8 CELLS [ebp], ebx
                  pop     -7 CELLS [ebp]
***************
*** 4825,4829 ****
                  next    c;
  
! | CODE (RESTORE-INPUT) ( -- R: ... 7 )            \ save input to rstack
                  push    ebx
                  push    7 CELLS [ebp]
--- 4810,4814 ----
                  next    c;
  
! | CODE (RESTORE-INPUT) ( R: ... 7 -- ... 7 )            \ save input to stack
                  push    ebx
                  push    7 CELLS [ebp]
***************
*** 4838,4841 ****
--- 4823,4841 ----
                  next    c;
  
+ \ -------------------- Evaluate ---------------------------------------------
+ 
+ : EVALUATE      ( addr len -- ) \ interpret string addr,len
+                 save-input (save-input)
+                 (SOURCE) 2!
+                 >IN OFF
+                 -1 TO SOURCE-ID
+                 ['] INTERPRET CATCH
+                 (restore-input) restore-input drop
+                 THROW ;
+ 
+ \ -------------------- Include file support ---------------------------------
+ 
+ in-system
+ 
  DEFER START-INCLUDE     ' NOOP IS START-INCLUDE
  DEFER   END-INCLUDE     ' NOOP IS   END-INCLUDE
***************
*** 4844,4850 ****
                  SAVE-INPUT (SAVE-INPUT)         \ save source to rstack
                  ( fileid ) TO SOURCE-ID
- \                TIBLEN _LOCALALLOC
- \                (SOURCE) CELL+ !                \ point at new buffer
- 
                  ?LOADING ON                     \ mark as loading a file
                  POCKET LINKFILE                 \ create a filename link
--- 4844,4847 ----
***************
*** 4855,4859 ****
  
                  END-INCLUDE
- \                _LOCALFREE
                  SOURCE-ID CLOSE-FILE DROP
                  THROW                           \ throw load error if any
--- 4852,4855 ----
***************
*** 4886,4891 ****
  
  : \             ( -- )
!                 (SOURCE) >IN ! ; IMMEDIATE
! 
  
  \ -------------------- Locals Allocation on rstack --------------------------
--- 4882,4886 ----
  
  : \             ( -- )
!                 (SOURCE) @ >IN ! ; IMMEDIATE
  
  \ -------------------- Locals Allocation on rstack --------------------------