[Win32forth-cvs] win32forth-stc/src/kernel gkernel.f,1.35,1.36

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

Update of /cvsroot/win32forth/win32forth-stc/src/kernel
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15094/win32forth-stc/src/kernel

Modified Files:
	gkernel.f 
Log Message:
gah: Modified to support class.f (partially TO still needs extending)

Index: gkernel.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth-stc/src/kernel/gkernel.f,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** gkernel.f	11 Apr 2007 20:18:30 -0000	1.35
--- gkernel.f	24 Apr 2007 08:55:47 -0000	1.36
***************
*** 255,259 ****
                  add     eax, ebx
                  next;
!                 
  
  \ ------------------------- Vector Variables --------------------------
--- 255,259 ----
                  add     eax, ebx
                  next;
! 
  
  \ ------------------------- Vector Variables --------------------------
***************
*** 496,500 ****
                  add     eax, [ebp]
                  next;
!                 
  code negate     ( n1 -- n2 ) \ negate n1, returning 2's complement n2
       1 1 in/out
--- 496,500 ----
                  add     eax, [ebp]
                  next;
! 
  code negate     ( n1 -- n2 ) \ negate n1, returning 2's complement n2
       1 1 in/out
***************
*** 995,1000 ****
              (comp-only) compilation> drop _r>drop (copy-code) ;
              0 0 in/out
!             
! ' r>drop alias rdrop            
  
  gcode _2>r                                    \ push two items onto the rstack
--- 995,1000 ----
              (comp-only) compilation> drop _r>drop (copy-code) ;
              0 0 in/out
! 
! ' r>drop alias rdrop
  
  gcode _2>r                                    \ push two items onto the rstack
***************
*** 2457,2461 ****
                  dup if
                    $6D8D code-w, code-c, \ lea ebp, n [ebp]
!                 else drop then 
                  ste-reset               \ reset
                  ;
--- 2457,2461 ----
                  dup if
                    $6D8D code-w, code-c, \ lea ebp, n [ebp]
!                 else drop then
                  ste-reset               \ reset
                  ;
***************
*** 2499,2505 ****
  9 constant tcre
  10 constant toff
! \ 10 constant tflt
! \ 11 constant tstr
! \ 12 constant tobj
  
  : mov-tos,#n  ( n -- )                        \ generate a mov eax, # n
--- 2499,2508 ----
  9 constant tcre
  10 constant toff
! \ 11 constant tflt
! \ 12 constant tstr
! 13 constant tobj
! 14 constant tcla
! 16 constant t|cl
! 17 constant tint
  
  : mov-tos,#n  ( n -- )                        \ generate a mov eax, # n
***************
*** 2565,2569 ****
              ( -- n )                          \ run time
              ['] dovar tvar dogen-# 0 ,
!             ['] (comp-cons) compiles-last 
              0 1 in/out
              ; 0 0 in/out
--- 2568,2572 ----
              ( -- n )                          \ run time
              ['] dovar tvar dogen-# 0 ,
!             ['] (comp-cons) compiles-last
              0 1 in/out
              ; 0 0 in/out
***************
*** 2577,2581 ****
              0 1 in/out
              ; 1 0 in/out
!             
  : 2literal  ( n m -- )                        \ run-time skeleton for 2literal
      (comp-only)                               \ compile only
--- 2580,2584 ----
              0 1 in/out
              ; 1 0 in/out
! 
  : 2literal  ( n m -- )                        \ run-time skeleton for 2literal
      (comp-only)                               \ compile only
***************
*** 3413,3417 ****
                  mov     eax, esi
                  next;
!                 
  
  : base@         ( n -- base n )   base @ ;
--- 3416,3420 ----
                  mov     eax, esi
                  next;
! 
  
  : base@         ( n -- base n )   base @ ;
***************
*** 4947,4951 ****
                  code-here swap voc>vxt !               \ set the xt for this name
                  mov-ecx,#n ['] dovoc xt-jmp,           \ set ecx, jmp to dovoc
!                 ofa-calc 
                  ;
  
--- 4950,4954 ----
                  code-here swap voc>vxt !               \ set the xt for this name
                  mov-ecx,#n ['] dovoc xt-jmp,           \ set ecx, jmp to dovoc
!                 ofa-calc
                  ;
  
***************
*** 4956,4960 ****
  
  : lexicon       ( -- )                   \ like a vocabulary, but in app space
!                 lexthreads #lexicon 
                  0 0 in/out
                  ; 0 0 in/out
--- 4959,4963 ----
  
  : lexicon       ( -- )                   \ like a vocabulary, but in app space
!                 lexthreads #lexicon
                  0 0 in/out
                  ; 0 0 in/out
***************
*** 4966,4970 ****
  
  : vocabulary    ( -- )
!                 vthreads #vocabulary 
                  0 0 in/out
                  ; 0 0 in/out
--- 4969,4973 ----
  
  : vocabulary    ( -- )
!                 vthreads #vocabulary
                  0 0 in/out
                  ; 0 0 in/out
***************
*** 5024,5028 ****
                    if drop (file-kernel) then
                  then ;
!                 
  : (viewtype)    ( line# c-addr -- )
                  s" in file " type count type
--- 5027,5031 ----
                    if drop (file-kernel) then
                  then ;
! 
  : (viewtype)    ( line# c-addr -- )
                  s" in file " type count type
***************
*** 5296,5304 ****
  \     that does a sequential scan through the PROCs list
  
! : find          ( addr -- addr false | xt -1 | xt 1 )
                  dup count find-name dup if        \ find the name
                    nip name>xtimm                  \ xt imm
                  then ;                            \ else str 0
  
  \ ----------------------- Local values support -------------------------------
  
--- 5299,5311 ----
  \     that does a sequential scan through the PROCs list
  
! defer find
! 
! : parmfind          ( addr -- addr false | xt -1 | xt 1 )
                  dup count find-name dup if        \ find the name
                    nip name>xtimm                  \ xt imm
                  then ;                            \ else str 0
  
+ ' parmfind is find
+ 
  \ ----------------------- Local values support -------------------------------