gforth: gforth/glocals.fs

Diff for /gforth/glocals.fs between version 1.39 and 1.59

-version 1.39, Wed Feb  3 00:10:21 1999 UTC
+version 1.59, Mon Dec 31 17:34:58 2007 UTC
  Line 1
  Line 1
  Line 1
  \ A powerful locals implementation
- \ Copyright (C) 1995,1996,1997,1998 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.
  Line 16
  Line 16
  Line 16
  \ 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
  Line 87
  Line 87
  Line 87
  require search.fs
  require float.fs
+ require extend.fs \ for case
  : compile-@local ( n -- ) \ gforth compile-fetch-local
   case
- Line 292
+ Line 293
  Line 292
  Line 293
          postpone laddr# @ lp-offset, ;
  \ you may want to make comments in a locals definitions group:
- ' \ alias \ ( -- ) \ core-ext,block-ext backslash
+ ' \ alias \ ( compilation 'ccc<newline>' -- ; run-time -- ) \ core-ext,block-ext backslash
- \G Line comment: if @code{BLK} contains 0, parse and discard the remainder
+ \G Comment till the end of the line if @code{BLK} contains 0 (i.e.,
- \G of the parse area. Otherwise, parse and discard all subsequent characters in the
+ \G while not loading a block), parse and discard the remainder of the
- \G parse area corresponding to the current line.
+ \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: parse and discard all subsequent characters in the parse
+ \G Comment, usually till the next @code{)}: parse and discard all
- \G area until ")" is encountered. During interactive input, an end-of-line
+ \G subsequent characters in the parse area until ")" is
- \G also acts as a comment terminator. For file input, it does not; if the
+ \G encountered. During interactive input, an end-of-line also acts as
- \G end-of-file is encountered whilst parsing for the ")" delimiter, Gforth
+ \G a comment terminator. For file input, it does not; if the
- \G will generate a warning.
+ \G end-of-file is encountered whilst parsing for the ")" delimiter,
+ \G Gforth will generate a warning.
  immediate
  forth definitions
+ also locals-types
+ \ these "locals" are used for comparison in TO
+ c: some-clocal 2drop
+ d: some-dlocal 2drop
+ f: some-flocal 2drop
+ w: some-wlocal 2drop
  \ the following gymnastics are for declaring locals without type specifier.
  \ we exploit a feature of our dictionary: every wordlist
- Line 314
+ Line 325
  Line 314
  Line 325
  \ 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
  \ 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
- Line 335
+ Line 344
  Line 335
  Line 344
  ' drop A, \ rehash method
  ' drop A,
- slowvoc @
+ new-locals-map mappedwordlist Constant new-locals-wl
- slowvoc on
- vocabulary new-locals
+ \ slowvoc @
- slowvoc !
+ \ slowvoc on
- new-locals-map ' new-locals >body wordlist-map A! \ !! use special access words
+ \ vocabulary new-locals
+ \ 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
+ : { ( -- latestxt wid 0 ) \ gforth open-brace
      dp old-dpp !
      locals-dp dpp !
-     lastxt get-current
+     latestxt get-current
-     also new-locals
+     get-order new-locals-wl swap 1+ set-order
      also locals definitions locals-types
 TO locals-wordlist
 postpone [ ; immediate
  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
- Line 484
+ Line 495
  Line 484
  Line 495
  : 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
 locals-size !
      locals-buffer locals-dp !
- Line 627
+ Line 638
  Line 627
  Line 638
 drop
      endif ;
- : >definer ( xt -- definer )
+ : >definer ( xt -- definer ) \ gforth
-     \ this gives a unique identifier for the way the xt was defined
+     \G @var{Definer} is a unique identifier for the way the @var{xt}
-     \ words defined with different does>-codes have different definers
+     \G was defined.  Words defined with different @code{does>}-codes
-     \ the definer can be used for comparison and in definer!
+     \G have different definers.  The definer can be used for
+     \G comparison and in @code{definer!}.
      dup >does-code
      ?dup-if
          nip 1 or
- Line 638
+ Line 650
  Line 638
  Line 650
          >code-address
      then ;
- : definer! ( definer xt -- )
+ : definer! ( definer xt -- ) \ gforth
-     \ gives the word represented by xt the behaviour associated with definer
+     \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
- Line 654
+ Line 667
  Line 654
  Line 667
          -&32 throw
      endif ;
  :noname
-0 0. 0.0e0 { c: clocal w: wlocal d: dlocal f: flocal }
      comp' drop dup >definer
      case
          [ ' locals-wordlist ] literal >definer \ value
- Line 662
+ Line 674
  Line 662
  Line 674
          \ !! 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

-Generate output suitable for use with a patch program
+Legend:



Removed from v.1.39
 


changed lines


 
Added in v.1.59
 Legend:



Removed from v.1.39
 


changed lines


 
Added in v.1.59
-Removed from v.1.39
+Added in v.1.59

CVS Admin

gforth: gforth/glocals.fs

Diff for /gforth/glocals.fs between version 1.39 and 1.59

ViewCVS and CVS Help