--- gforth/glocals.fs 1996/09/30 13:16:10 1.28 +++ gforth/glocals.fs 2000/08/09 20:04:05 1.44 @@ -1,6 +1,6 @@ \ A powerful locals implementation -\ Copyright (C) 1995 Free Software Foundation, Inc. +\ Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc. \ This file is part of Gforth. @@ -85,7 +85,7 @@ \ Currently locals may only be \ defined at the outer level and TO is not supported. -require search-order.fs +require search.fs require float.fs : compile-@local ( n -- ) \ gforth compile-fetch-local @@ -129,7 +129,7 @@ require float.fs slowvoc @ slowvoc on \ we want a linked list for the vocabulary locals vocabulary locals \ this contains the local variables -' locals >body ' locals-list >body ! +' locals >body wordlist-id ' locals-list >body ! slowvoc ! create locals-buffer 1000 allot \ !! limited and unsafe @@ -183,20 +183,20 @@ variable locals-dp \ so here's the speci = ; : list-size ( list -- u ) \ gforth-internal -\ size of the locals frame represented by list - 0 ( list n ) - begin - over 0<> - while - over - ((name>)) >body @ max - swap @ swap ( get next ) - repeat - faligned nip ; + \ size of the locals frame represented by list + 0 ( list n ) + begin + over 0<> + while + over + ((name>)) >body @ max + swap @ swap ( get next ) + repeat + faligned nip ; : set-locals-size-list ( list -- ) - dup locals-list ! - list-size locals-size ! ; + dup locals-list ! + list-size locals-size ! ; : check-begin ( list -- ) \ warn if list is not a sublist of locals-list @@ -292,8 +292,21 @@ locals-types definitions postpone laddr# @ lp-offset, ; \ you may want to make comments in a locals definitions group: -' \ alias \ immediate -' ( alias ( immediate +' \ alias \ ( compilation 'ccc' -- ; run-time -- ) \ core-ext,block-ext backslash +\G Comment till the end of the line if @code{BLK} contains 0 (i.e., +\G while not loading a block), parse and discard the remainder of the +\G parse area. Otherwise, parse and discard all subsequent characters +\G in the parse area corresponding to the current line. +immediate + +' ( alias ( ( compilation 'ccc' -- ; run-time -- ) \ core,file paren +\G Comment, usually till the next @code{)}: parse and discard all +\G subsequent characters in the parse area until ")" is +\G encountered. During interactive input, an end-of-line also acts as +\G a comment terminator. For file input, it does not; if the +\G end-of-file is encountered whilst parsing for the ")" delimiter, +\G Gforth will generate a warning. +immediate forth definitions @@ -311,7 +324,7 @@ also locals-types \ the returned nfa denotes a word that produces what W: produces \ !! do the whole thing without nextname drop nextname - ['] W: >name ; + ['] W: >head-noprim ; previous @@ -319,28 +332,34 @@ previous true abort" this should not happen: new-locals-reveal" ; create new-locals-map ( -- wordlist-map ) -' new-locals-find A, ' new-locals-reveal A, - -slowvoc @ -slowvoc on -vocabulary new-locals -slowvoc ! -new-locals-map ' new-locals >body cell+ A! \ !! use special access words +' new-locals-find A, +' new-locals-reveal A, +' drop A, \ rehash method +' drop A, + +new-locals-map mappedwordlist Constant new-locals-wl + +\ slowvoc @ +\ slowvoc on +\ vocabulary new-locals +\ slowvoc ! +\ new-locals-map ' new-locals >body wordlist-map A! \ !! use special access words variable old-dpp \ and now, finally, the user interface words -: { ( -- addr wid 0 ) \ gforth open-brace +: { ( -- lastxt wid 0 ) \ gforth open-brace dp old-dpp ! locals-dp dpp ! - also new-locals - also get-current locals definitions locals-types + lastxt get-current + get-order new-locals-wl swap 1+ set-order + also locals definitions locals-types 0 TO locals-wordlist 0 postpone [ ; immediate locals-types definitions -: } ( addr wid 0 a-addr1 xt1 ... -- ) \ gforth close-brace +: } ( lastxt wid 0 a-addr1 xt1 ... -- ) \ gforth close-brace \ ends locals definitions ] old-dpp @ dpp ! begin @@ -350,9 +369,9 @@ locals-types definitions repeat drop locals-size @ alignlp-f locals-size ! \ the strictest alignment - set-current previous previous - locals-list TO locals-wordlist ; + set-current lastcfa ! + locals-list 0 wordlist-id - TO locals-wordlist ; : -- ( addr wid 0 ... -- ) \ gforth dash-dash } @@ -453,14 +472,16 @@ forth definitions \ explicit scoping : scope ( compilation -- scope ; run-time -- ) \ gforth - cs-push-part scopestart ; immediate + cs-push-part scopestart ; immediate + +: adjust-locals-list ( wid -- ) + locals-list @ common-list + dup list-size adjust-locals-size + locals-list ! ; : endscope ( compilation scope -- ; run-time -- ) \ gforth - scope? - drop - locals-list @ common-list - dup list-size adjust-locals-size - locals-list ! ; immediate + scope? + drop adjust-locals-list ; immediate \ adapt the hooks @@ -495,18 +516,18 @@ forth definitions \ ELSE. However, if ELSE generates an appropriate "lp+!#" before the \ branch, there will be none after the target . -: (then-like) ( orig -- addr ) - swap -rot dead-orig = +: (then-like) ( orig -- ) + dead-orig = if - drop + >resolve drop else dead-code @ if - set-locals-size-list dead-code off + >resolve set-locals-size-list dead-code off else \ both live - dup list-size adjust-locals-size - locals-list @ common-list dup list-size adjust-locals-size - locals-list ! + over list-size adjust-locals-size + >resolve + adjust-locals-list then then ; @@ -614,10 +635,9 @@ forth definitions \ this gives a unique identifier for the way the xt was defined \ words defined with different does>-codes have different definers \ the definer can be used for comparison and in definer! - dup >code-address [ ' spaces >code-address ] Literal = - \ !! this definition will not work on some implementations for `bits' - if \ if >code-address delivers the same value for all does>-def'd words - >does-code 1 or \ bit 0 marks special treatment for does codes + dup >does-code + ?dup-if + nip 1 or else >code-address then ; @@ -631,7 +651,7 @@ forth definitions then ; :noname - ' dup >definer [ ' locals-wordlist >definer ] literal = + ' dup >definer [ ' locals-wordlist ] literal >definer = if >body ! else @@ -641,8 +661,11 @@ forth definitions 0 0 0. 0.0e0 { c: clocal w: wlocal d: dlocal f: flocal } comp' drop dup >definer case - [ ' locals-wordlist >definer ] literal \ value + [ ' locals-wordlist ] literal >definer \ value OF >body POSTPONE Aliteral POSTPONE ! ENDOF + \ !! dependent on c: etc. being does>-defining words + \ this works, because >definer uses >does-code in this case, + \ which produces a relocatable address [ comp' clocal drop >definer ] literal OF POSTPONE laddr# >body @ lp-offset, POSTPONE c! ENDOF [ comp' wlocal drop >definer ] literal