--- gforth/glocals.fs	1998/12/08 22:02:44	1.38
+++ gforth/glocals.fs	2001/09/16 10:20:39	1.47
@@ -1,6 +1,6 @@
 \ A powerful locals implementation
 
-\ Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000 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
@@ -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