--- gforth/glocals.fs	1996/09/24 19:15:02	1.27
+++ gforth/glocals.fs	1998/10/10 10:28:34	1.36
@@ -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
@@ -183,24 +183,24 @@ 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 wordlist-id !
+    list-size locals-size ! ;
 
 : check-begin ( list -- )
 \ warn if list is not a sublist of locals-list
- locals-list @ sub-list? 0= if
+ locals-list wordlist-id @ sub-list? 0= if
    \ !! print current position
    ." compiler was overly optimistic about locals at a BEGIN" cr
    \ !! print assumption and reality
@@ -319,28 +319,32 @@ previous
   true abort" this should not happen: new-locals-reveal" ;
 
 create new-locals-map ( -- wordlist-map )
-' new-locals-find A, ' new-locals-reveal A,
+' 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
@@ -350,8 +354,8 @@ locals-types definitions
     repeat
     drop
     locals-size @ alignlp-f locals-size ! \ the strictest alignment
-    set-current
     previous previous
+    set-current lastcfa !
     locals-list TO locals-wordlist ;
 
 : -- ( addr wid 0 ... -- ) \ gforth dash-dash
@@ -448,32 +452,21 @@ forth definitions
 
 \ If this assumption is too optimistic, the compiler will warn the user.
 
-\ Implementation: migrated to kernel.fs
-
-\ THEN (another control flow from before joins the current one):
-\ The new locals-list is the intersection of the current locals-list and
-\ the orig-local-list. The new locals-size is the (alignment-adjusted)
-\ size of the new locals-list. The following code is generated:
-\ lp+!# (current-locals-size - orig-locals-size)
-\ <then>:
-\ lp+!# (orig-locals-size - new-locals-size)
-
-\ Of course "lp+!# 0" is not generated. Still this is admittedly a bit
-\ inefficient, e.g. if there is a locals declaration between IF and
-\ ELSE. However, if ELSE generates an appropriate "lp+!#" before the
-\ branch, there will be none after the target <then>.
+\ Implementation:
 
 \ explicit scoping
 
 : scope ( compilation  -- scope ; run-time  -- ) \ gforth
- cs-push-part scopestart ; immediate
+    cs-push-part scopestart ; immediate
+
+: adjust-locals-list ( wid -- )
+    locals-list wordlist-id @ common-list
+    dup list-size adjust-locals-size
+    locals-list wordlist-id ! ;
 
 : 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
 
@@ -484,7 +477,7 @@ forth definitions
     clear-leave-stack
     0 locals-size !
     locals-buffer locals-dp !
-    0 locals-list !
+    0 locals-list wordlist-id !
     dead-code off
     defstart ;
 
@@ -495,18 +488,31 @@ forth definitions
     lastcfa ! last !
     DEFERS ;-hook ;
 
-: (then-like) ( orig -- addr )
-    swap -rot dead-orig =
+\ THEN (another control flow from before joins the current one):
+\ The new locals-list is the intersection of the current locals-list and
+\ the orig-local-list. The new locals-size is the (alignment-adjusted)
+\ size of the new locals-list. The following code is generated:
+\ lp+!# (current-locals-size - orig-locals-size)
+\ <then>:
+\ lp+!# (orig-locals-size - new-locals-size)
+
+\ Of course "lp+!# 0" is not generated. Still this is admittedly a bit
+\ inefficient, e.g. if there is a locals declaration between IF and
+\ ELSE. However, if ELSE generates an appropriate "lp+!#" before the
+\ branch, there will be none after the target <then>.
+
+: (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 ;
 
@@ -570,10 +576,6 @@ forth definitions
 \ things above are not control flow joins. Everything should be taken
 \ over from the live flow. No lp+!# is generated.
 
-\ !! The lp gymnastics for UNTIL are also a real problem: locals cannot be
-\ used in signal handlers (or anything else that may be called while
-\ locals live beyond the lp) without changing the locals stack.
-
 \ About warning against uses of dead locals. There are several options:
 
 \ 1) Do not complain (After all, this is Forth;-)
@@ -618,10 +620,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 ;
@@ -635,7 +636,7 @@ forth definitions
     then ;
 
 :noname
-    ' dup >definer [ ' locals-wordlist >definer ] literal =
+    ' dup >definer [ ' locals-wordlist ] literal >definer =
     if
 	>body !
     else
@@ -643,10 +644,13 @@ forth definitions
     endif ;
 :noname
     0 0 0. 0.0e0 { c: clocal w: wlocal d: dlocal f: flocal }
-    ' dup >definer
+    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