--- gforth/glocals.fs	1998/10/10 10:28:34	1.36
+++ gforth/glocals.fs	1999/05/03 09:46:20	1.41
@@ -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.
 
@@ -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
@@ -195,12 +195,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 +292,19 @@ locals-types definitions
 	postpone laddr# @ lp-offset, ;
 
 \ you may want to make comments in a locals definitions group:
-' \ alias \ immediate
-' ( alias ( immediate
+' \ alias \ ( -- ) \ core-ext,block-ext backslash
+\G Line comment: if @code{BLK} contains 0, parse and discard the remainder
+\G of the parse area. Otherwise, parse and discard all subsequent characters in the
+\G parse area corresponding to the current line.
+immediate 
+
+' ( alias ( ( compilation 'ccc<close-paren>' -- ; run-time -- ) \ core,file	paren
+\G Comment: parse and discard all subsequent characters in the parse
+\G area until ")" is encountered. During interactive input, an end-of-line
+\G also acts as a comment terminator. For file input, it does not; if the
+\G end-of-file is encountered whilst parsing for the ")" delimiter, Gforth
+\G will generate a warning.
+immediate
 
 forth definitions
 
@@ -324,11 +335,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 +350,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 +369,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 +473,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 +490,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 ;