--- gforth/glocals.fs	1998/10/10 10:28:34	1.36
+++ gforth/glocals.fs	2003/01/19 23:35:29	1.50
@@ -1,6 +1,6 @@
 \ A powerful locals implementation
 
-\ Copyright (C) 1995 Free Software Foundation, Inc.
+\ Copyright (C) 1995-2003 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,7 +16,7 @@
 
 \ You should have received a copy of the GNU General Public License
 \ along with this program; if not, write to the Free Software
-\ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 
 \ More documentation can be found in the manual and in
@@ -87,6 +87,7 @@
 
 require search.fs
 require float.fs
+require extend.fs \ for case
 
 : compile-@local ( n -- ) \ gforth compile-fetch-local
  case
@@ -129,7 +130,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
@@ -195,12 +196,12 @@ variable locals-dp \ so here's the speci
     faligned nip ;
 
 : set-locals-size-list ( list -- )
-    dup locals-list wordlist-id !
+    dup locals-list !
     list-size locals-size ! ;
 
 : check-begin ( list -- )
 \ warn if list is not a sublist of locals-list
- locals-list wordlist-id @ sub-list? 0= if
+ locals-list @ sub-list? 0= if
    \ !! print current position
    ." compiler was overly optimistic about locals at a BEGIN" cr
    \ !! print assumption and reality
@@ -292,8 +293,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<newline>' -- ; 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<close-paren>' -- ; 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 +325,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
 
@@ -324,11 +338,13 @@ create new-locals-map ( -- wordlist-map
 ' drop A, \ rehash method
 ' drop A,
 
-slowvoc @
-slowvoc on
-vocabulary new-locals
-slowvoc !
-new-locals-map ' new-locals >body wordlist-map A! \ !! use special access words
+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
 
@@ -337,7 +353,7 @@ variable old-dpp
     dp old-dpp !
     locals-dp dpp !
     lastxt get-current
-    also new-locals
+    get-order new-locals-wl swap 1+ set-order
     also locals definitions locals-types
     0 TO locals-wordlist
     0 postpone [ ; immediate
@@ -356,7 +372,7 @@ locals-types definitions
     locals-size @ alignlp-f locals-size ! \ the strictest alignment
     previous previous
     set-current lastcfa !
-    locals-list TO locals-wordlist ;
+    locals-list 0 wordlist-id - TO locals-wordlist ;
 
 : -- ( addr wid 0 ... -- ) \ gforth dash-dash
     }
@@ -460,9 +476,9 @@ forth definitions
     cs-push-part scopestart ; immediate
 
 : adjust-locals-list ( wid -- )
-    locals-list wordlist-id @ common-list
+    locals-list @ common-list
     dup list-size adjust-locals-size
-    locals-list wordlist-id ! ;
+    locals-list ! ;
 
 : endscope ( compilation scope -- ; run-time  -- ) \ gforth
     scope?
@@ -477,7 +493,7 @@ forth definitions
     clear-leave-stack
     0 locals-size !
     locals-buffer locals-dp !
-    0 locals-list wordlist-id !
+    0 locals-list !
     dead-code off
     defstart ;
 
@@ -617,9 +633,10 @@ forth definitions
     endif ;
 
 : >definer ( xt -- definer )
-    \ 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!
+    \G @var{Definer} is a unique identifier for the way the @var{xt}
+    \G was defined.  Words defined with different @code{does>}-codes
+    \G have different definers.  The definer can be used for
+    \G comparison and in @code{definer!}.
     dup >does-code
     ?dup-if
 	nip 1 or
@@ -628,7 +645,8 @@ forth definitions
     then ;
 
 : definer! ( definer xt -- )
-    \ gives the word represented by xt the behaviour associated with definer
+    \G The word represented by @var{xt} changes its behaviour to the
+    \G behaviour associated with @var{definer}.
     over 1 and if
 	swap [ 1 invert ] literal and does-code!
     else
@@ -667,7 +685,7 @@ interpret/compile: TO ( c|w|d|r "name" -
     \ don't use 'locals|'! use '{'! A portable and free '{'
     \ implementation is compat/anslocals.fs
     BEGIN
-	name 2dup s" |" compare 0<>
+	name 2dup s" |" str= 0=
     WHILE
 	(local)
     REPEAT