--- gforth/glocals.fs	2000/09/23 15:46:56	1.46
+++ gforth/glocals.fs	2011/12/21 18:00:00	1.61
@@ -1,12 +1,12 @@
 \ A powerful locals implementation
 
-\ Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2007 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
 \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License
-\ as published by the Free Software Foundation; either version 2
+\ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.
 
 \ This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
 \ GNU General Public License for more details.
 
 \ 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., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
 
 \ More documentation can be found in the manual and in
@@ -87,6 +86,7 @@
 
 require search.fs
 require float.fs
+require extend.fs \ for case
 
 : compile-@local ( n -- ) \ gforth compile-fetch-local
  case
@@ -224,9 +224,12 @@ variable locals-dp \ so here's the speci
 : create-local ( " name" -- a-addr )
     \ defines the local "name"; the offset of the local shall be
     \ stored in a-addr
+    dp
+    locals-dp dpp !
     create
-	immediate restrict
-	here 0 , ( place for the offset ) ;
+    immediate restrict
+    here 0 , ( place for the offset )
+    swap dpp ! ;
 
 : lp-offset ( n1 -- n2 )
 \ converts the offset from the frame start to an offset from lp and
@@ -309,15 +312,23 @@ immediate
 immediate
 
 forth definitions
+also locals-types
+    
+\ these "locals" are used for comparison in TO
 
+here locals-dp !
+c: some-clocal 2drop
+d: some-dlocal 2drop
+f: some-flocal 2drop
+w: some-wlocal 2drop
+locals-dp @ dp !
+    
 \ the following gymnastics are for declaring locals without type specifier.
 \ we exploit a feature of our dictionary: every wordlist
 \ has it's own methods for finding words etc.
 \ So we create a vocabulary new-locals, that creates a 'w:' local named x
 \ when it is asked if it contains x.
 
-also locals-types
-
 : new-locals-find ( caddr u w -- nfa )
 \ this is the find method of the new-locals vocabulary
 \ make a new local with name caddr u; w is ignored
@@ -345,13 +356,9 @@ new-locals-map mappedwordlist Constant n
 \ slowvoc !
 \ new-locals-map ' new-locals >body wordlist-map A! \ !! use special access words
 
-variable old-dpp
-
 \ and now, finally, the user interface words
-: { ( -- lastxt wid 0 ) \ gforth open-brace
-    dp old-dpp !
-    locals-dp dpp !
-    lastxt get-current
+: { ( -- latestxt wid 0 ) \ gforth open-brace
+    latestxt get-current
     get-order new-locals-wl swap 1+ set-order
     also locals definitions locals-types
     0 TO locals-wordlist
@@ -359,9 +366,9 @@ variable old-dpp
 
 locals-types definitions
 
-: } ( lastxt wid 0 a-addr1 xt1 ... -- ) \ gforth close-brace
+: } ( latestxt wid 0 a-addr1 xt1 ... -- ) \ gforth close-brace
     \ ends locals definitions
-    ] old-dpp @ dpp !
+    ]
     begin
 	dup
     while
@@ -488,7 +495,7 @@ forth definitions
 : locals-:-hook ( sys -- sys addr xt n )
     \ addr is the nfa of the defined word, xt its xt
     DEFERS :-hook
-    last @ lastcfa @
+    latest latestxt
     clear-leave-stack
     0 locals-size !
     locals-buffer locals-dp !
@@ -631,10 +638,11 @@ forth definitions
 	2drop
     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!
+: >definer ( xt -- definer ) \ gforth
+    \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
@@ -642,8 +650,9 @@ forth definitions
 	>code-address
     then ;
 
-: definer! ( definer xt -- )
-    \ gives the word represented by xt the behaviour associated with definer
+: definer! ( definer xt -- ) \ gforth
+    \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
@@ -658,7 +667,6 @@ forth definitions
 	-&32 throw
     endif ;
 :noname
-    0 0 0. 0.0e0 { c: clocal w: wlocal d: dlocal f: flocal }
     comp' drop dup >definer
     case
 	[ ' locals-wordlist ] literal >definer \ value
@@ -666,23 +674,23 @@ forth definitions
 	\ !! 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
+	[ comp' some-clocal drop ] literal >definer
 	OF POSTPONE laddr# >body @ lp-offset, POSTPONE c! ENDOF
-	[ comp' wlocal drop >definer ] literal
+	[ comp' some-wlocal drop ] literal >definer
 	OF POSTPONE laddr# >body @ lp-offset, POSTPONE ! ENDOF
-	[ comp' dlocal drop >definer ] literal
+	[ comp' some-dlocal drop ] literal >definer
 	OF POSTPONE laddr# >body @ lp-offset, POSTPONE 2! ENDOF
-	[ comp' flocal drop >definer ] literal
+	[ comp' some-flocal drop ] literal >definer
 	OF POSTPONE laddr# >body @ lp-offset, POSTPONE f! ENDOF
 	-&32 throw
     endcase ;
 interpret/compile: TO ( c|w|d|r "name" -- ) \ core-ext,local
 
-: locals|
+: locals| ( ... "name ..." -- ) \ local-ext locals-bar
     \ 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