From: George H. <geo...@us...> - 2007-05-21 13:51:49
|
Update of /cvsroot/win32forth/win32forth-stc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18936/win32forth-stc/src Modified Files: Class.f primutil.f Log Message: gah:modified inherit to set xt pointer in wordlist structure of :object definitions to the xt of [NoNameClass], a dummy word (whose type is set to tcla) so ?isclass works correctly with the class of :objects, and reverted to old ?isclass Index: primutil.f =================================================================== RCS file: /cvsroot/win32forth/win32forth-stc/src/primutil.f,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** primutil.f 20 May 2007 11:05:27 -0000 1.34 --- primutil.f 21 May 2007 13:51:45 -0000 1.35 *************** *** 157,163 **** : ?isClass ( cfa -- f ) >name n>tfa c@ dup tCla = ! over t|Cl = or ! swap tobj = or ! ; defer \n->crlf --- 157,161 ---- : ?isClass ( cfa -- f ) >name n>tfa c@ dup tCla = ! swap t|Cl = or ; defer \n->crlf Index: Class.f =================================================================== RCS file: /cvsroot/win32forth/win32forth-stc/src/Class.f,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Class.f 21 May 2007 08:38:46 -0000 1.9 --- Class.f 21 May 2007 13:51:45 -0000 1.10 *************** *** 532,535 **** --- 532,537 ---- internal + : [NoNameClass] ; tcla tfa! \ Fake header for :object classes + \ Build a class header with its superclass pointer : inherit ( pfa -- ) *************** *** 544,548 **** ^Class ^Self iclass ! \ store my class in SELF ^Class XFA dup @ 0max swap ! \ inherit indexing ! LatestXT @ ^class voc>vxt ! \ Set xt also ^class context ! definitions \ add to search order obj-class 0= if reveal then ; --- 546,551 ---- ^Class ^Self iclass ! \ store my class in SELF ^Class XFA dup @ 0max swap ! \ inherit indexing ! obj-class if ['] [NoNameClass] else LatestXT @ then ! ^class voc>vxt ! \ Set xt also ^class context ! definitions \ add to search order obj-class 0= if reveal then ; |