--- gforth/glocals.fs	1997/03/04 17:49:51	1.30
+++ gforth/glocals.fs	1998/12/08 22:02:44	1.38
@@ -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
@@ -322,27 +322,29 @@ create new-locals-map ( -- wordlist-map
 ' new-locals-find A,
 ' new-locals-reveal A,
 ' drop A, \ rehash method
+' drop A,
 
 slowvoc @
 slowvoc on
 vocabulary new-locals
 slowvoc !
-new-locals-map ' new-locals >body cell+ A! \ !! use special access words
+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 !
+    lastxt get-current
     also new-locals
-    also get-current locals definitions  locals-types
+    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
@@ -352,9 +354,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
     }
@@ -455,14 +457,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
 
@@ -508,8 +512,7 @@ forth definitions
 	else \ both live
 	    over list-size adjust-locals-size
 	    >resolve
-	    locals-list @ common-list dup list-size adjust-locals-size
-	    locals-list !
+	    adjust-locals-list
 	then
     then ;
 
@@ -633,7 +636,7 @@ forth definitions
     then ;
 
 :noname
-    ' dup >definer [ ' locals-wordlist >definer ] literal =
+    ' dup >definer [ ' locals-wordlist ] literal >definer =
     if
 	>body !
     else
@@ -645,13 +648,16 @@ forth definitions
     case
 	[ ' locals-wordlist ] literal >definer \ value
 	OF >body POSTPONE Aliteral POSTPONE ! ENDOF
-	[ comp' clocal drop ] literal >definer
+	\ !! 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 ] literal >definer
+	[ comp' wlocal drop >definer ] literal
 	OF POSTPONE laddr# >body @ lp-offset, POSTPONE ! ENDOF
-	[ comp' dlocal drop ] literal >definer
+	[ comp' dlocal drop >definer ] literal
 	OF POSTPONE laddr# >body @ lp-offset, POSTPONE 2! ENDOF
-	[ comp' flocal drop ] literal >definer
+	[ comp' flocal drop >definer ] literal
 	OF POSTPONE laddr# >body @ lp-offset, POSTPONE f! ENDOF
 	-&32 throw
     endcase ;