gforth: gforth/kernel/int.fs

Diff for /gforth/kernel/int.fs between version 1.48 and 1.69

-version 1.48, Sat May 27 09:41:29 2000 UTC
+version 1.69, Sun Jan 28 22:43:39 2001 UTC
  Line 1
  Line 1
  Line 1
  \ definitions needed for interpreter only
- \ Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+ \ Copyright (C) 1995-2000 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.
  \ \ Revision-Log
  Line 28
  Line 28
  Line 28
  require ./io.fs         \ type ...
  require ./nio.fs        \ . <# ...
  require ./errore.fs     \ .error ...
- require ~+/kernel/version.fs    \ version-string
+ require kernel/version.fs       \ version-string
  require ./../chains.fs
+ has? new-input 0= [IF]
  : tib ( -- c-addr ) \ core-ext t-i-b
      \G @i{c-addr} is the address of the Terminal Input Buffer.
      \G OBSOLESCENT: @code{source} superceeds the function of this word.
- Line 44
+ Line 45
  Line 44
  Line 45
  : (source) ( -- c-addr u )
      tib #tib @ ;
  ' (source) IS source
+ [THEN]
  : (word) ( addr1 n1 char -- addr2 n2 )
    dup >r skip 2dup r> scan  nip - ;
- Line 95
+ Line 97
  Line 95
  Line 97
      dup 0= -&16 and throw ;
  : name-too-long? ( c-addr u -- c-addr u )
-     dup $1F u> -&19 and throw ;
+     dup lcount-mask u> -&19 and throw ;
  \ \ Number parsing                                      23feb93py
- Line 190
+ Line 192
  Line 190
  Line 192
      \G by cross.fs which doesn't have the same functionalty as makedoc.fs
      [char] ) parse 2drop ; immediate
- : \ ( -- ) \ thisone- core-ext,block-ext backslash
+ : \ ( compilation 'ccc<newline>' -- ; run-time -- ) \ thisone- core-ext,block-ext backslash
      \G ** this will not get annotated. The alias in glocals.fs will instead **
      \G It does not work to use "wordset-" prefix since this file is glossed
      \G by cross.fs which doesn't have the same functionalty as makedoc.fs
- Line 203
+ Line 205
  Line 203
  Line 205
      [ [THEN] ]
      source >in ! drop ; immediate
- : \G ( -- ) \ gforth backslash-gee
+ : \G ( compilation 'ccc<newline>' -- ; run-time -- ) \ gforth backslash-gee
      \G Equivalent to @code{\} but used as a tag to annotate definition
      \G comments into documentation.
      POSTPONE \ ; immediate
- Line 228
+ Line 230
  Line 228
  Line 230
  end-struct wordlist-struct
  : f83find      ( addr len wordlist -- nt / false )
-     wordlist-id @ (f83find) ;
+     wordlist-id @ (listlfind) ;
  : initvoc               ( wid -- )
    dup wordlist-map @ hash-method perform ;
- Line 255
+ Line 257
  Line 255
  Line 257
  \ \ header, finding, ticks                              17dec92py
- hex
+ \ The constants are defined as 32 bits, but then erased
-constant alias-mask \ set when the word is not an alias!
+ \ and overwritten by the right ones
-constant immediate-mask
-constant restrict-mask
+ $80000000 constant alias-mask
+bits/char 1 - lshift
+ -1 cells allot  bigendian [IF]   c, 0 1 cells 1- times
+                           [ELSE] 0 1 cells 1- times c, [THEN]
+ $40000000 constant immediate-mask
+bits/char 2 - lshift
+ -1 cells allot  bigendian [IF]   c, 0 1 cells 1- times
+                           [ELSE] 0 1 cells 1- times c, [THEN]
+ $20000000 constant restrict-mask
+bits/char 3 - lshift
+ -1 cells allot  bigendian [IF]   c, 0 1 cells 1- times
+                           [ELSE] 0 1 cells 1- times c, [THEN]
+ $1fffffff constant lcount-mask
+bits/char 3 - lshift 1 -
+ -1 cells allot  bigendian [IF]   c, $FF 1 cells 1- times
+                           [ELSE] $FF 1 cells 1- times c, [THEN]
  \ higher level parts of find
- Line 277
+ Line 294
  Line 277
  Line 294
      then
  [ [THEN] ] ;
- : (x>int) ( cfa b -- xt )
+ : (x>int) ( cfa w -- xt )
      \ get interpretation semantics of name
      restrict-mask and
      if
- Line 288
+ Line 305
  Line 288
  Line 305
  : name>string ( nt -- addr count ) \ gforth     head-to-string
      \g @i{addr count} is the name of the word represented by @i{nt}.
-     cell+ count $1F and ;
+     cell+ dup cell+ swap @ lcount-mask and ;
  : ((name>))  ( nfa -- cfa )
      name>string + cfaligned ;
- : (name>x) ( nfa -- cfa b )
+ : (name>x) ( nfa -- cfa w )
-     \ cfa is an intermediate cfa and b is the flags byte of nfa
+     \ cfa is an intermediate cfa and w is the flags cell of nfa
      dup ((name>))
-     swap cell+ c@ dup alias-mask and 0=
+     swap cell+ @ dup alias-mask and 0=
      IF
          swap @ swap
      THEN ;
- Line 330
+ Line 347
  Line 330
  Line 347
      ;
  : (name>intn) ( nfa -- xt +-1 )
-     (name>x) tuck (x>int) ( b xt )
+     (name>x) tuck (x>int) ( w xt )
      swap immediate-mask and flag-sign ;
  const Create ???  0 , 3 c, char ? c, char ? c, char ? c,
- Line 365
+ Line 382
  Line 365
  Line 382
      drop true ;
  : >head-noprim ( cfa -- nt ) \ gforth  to-head-noprim
+     \ also heuristic; finds only names with up to 32 chars
      $25 cell do ( cfa )
-         dup i - count $9F and + cfaligned over alias-mask + =
+         dup i - dup @ [ alias-mask lcount-mask or ] literal and ( cfa len|alias )
+         swap + cell + cfaligned over alias-mask + =
          if ( cfa )
              dup i - cell - dup head?
              if
- Line 381
+ Line 400
  Line 381
  Line 400
  : >head-noprim ( cfa -- nt ) \ gforth  to-head-noprim
      $25 cell do ( cfa )
-         dup i - count $9F and + cfaligned over alias-mask + =
+         dup i - dup @ [ alias-mask lcount-mask or ] literal and ( cfa len|alias )
+         swap + cell + cfaligned over alias-mask + =
          if ( cfa ) i - cell - unloop exit
          then
          cell +loop
- Line 395
+ Line 415
  Line 395
  Line 415
      dup wordlist-map @ find-method perform ;
  : search-wordlist ( c-addr count wid -- 0 | xt +-1 ) \ search
-     \G Search the word list identified by @i{wid}
+     \G Search the word list identified by @i{wid} for the definition
-     \G for the definition named by the string at @i{c-addr count}.
+     \G named by the string at @i{c-addr count}.  If the definition is
-     \G If the definition is not found, return 0. If the definition
+     \G not found, return 0. If the definition is found return 1 (if
-     \G is found return 1 (if the definition is immediate) or -1
+     \G the definition is immediate) or -1 (if the definition is not
-     \G (if the definition is not immediate) together with the @i{xt}.
+     \G immediate) together with the @i{xt}.  In Gforth, the @i{xt}
-     \G The @i{xt} returned represents the interpretation semantics.
+     \G returned represents the interpretation semantics.  ANS Forth
+     \G does not specify clearly what @i{xt} represents.
      (search-wordlist) dup if
          (name>intn)
      then ;
- Line 422
+ Line 443
  Line 422
  Line 443
     then ;
  : find ( c-addr -- xt +-1 | c-addr 0 ) \ core,search
-     \G Search all word lists in the current search order
+     \G Search all word lists in the current search order for the
-     \G for the definition named by the counted string at @i{c-addr}.
+     \G definition named by the counted string at @i{c-addr}.  If the
-     \G If the definition is not found, return 0. If the definition
+     \G definition is not found, return 0. If the definition is found
-     \G is found return 1 (if the definition is immediate) or -1
+     \G return 1 (if the definition has non-default compilation
-     \G (if the definition is not immediate) together with the @i{xt}.
+     \G semantics) or -1 (if the definition has default compilation
+     \G semantics).  The @i{xt} returned in interpret state represents
+     \G the interpretation semantics.  The @i{xt} returned in compile
+     \G state represented either the compilation semantics (for
+     \G non-default compilation semantics) or the run-time semantics
+     \G that the compilation semantics would @code{compile,} (for
+     \G default compilation semantics).  The ANS Forth standard does
+     \G not specify clearly what the returned @i{xt} represents (and
+     \G also talks about immediacy instead of non-default compilation
+     \G semantics), so this word is questionable in portable programs.
+     \G If non-portability is ok, @code{find-name} and friends are
+     \G better (@pxref{Name token}).
      dup count sfind dup
      if
          rot drop
- Line 460
+ Line 492
  Line 460
  Line 492
  Defer parser ( c-addr u -- )
  Defer name ( -- c-addr count ) \ gforth
- \ get the next word from the input buffer
+ \G Get the next word from the input buffer
  ' (name) IS name
  Defer compiler-notfound ( c-addr count -- )
  Defer interpreter-notfound ( c-addr count -- )
- Line 470
+ Line 502
  Line 470
  Line 502
  ' no.extensions IS compiler-notfound
  ' no.extensions IS interpreter-notfound
- : interpret ( ?? -- ?? ) \ gforth
+ : interpret1 ( ... -- ... )
-     \ interpret/compile the (rest of the) input buffer
  [ has? backtrace [IF] ]
      rp@ backtrace-rp0 !
  [ [THEN] ]
- Line 482
+ Line 513
  Line 482
  Line 513
      REPEAT
 drop ;
+ : interpret ( ?? -- ?? ) \ gforth
+     \ interpret/compile the (rest of the) input buffer
+ [ has? backtrace [IF] ]
+     backtrace-rp0 @ >r
+ [ [THEN] ]
+     ['] interpret1 catch
+ [ has? backtrace [IF] ]
+     r> backtrace-rp0 !
+     [ [THEN] ]
+     throw ;
  \ interpreter                                   30apr92py
  \ not the most efficient implementations of interpreter and compiler
- Line 505
+ Line 547
  Line 505
  Line 547
  has? file 0= [IF]
  : sourceline# ( -- n )  1 ;
+ [ELSE]
+ has? new-input 0= [IF]
+ Variable #fill-bytes
+ \G number of bytes read via (read-line) by the last refill
+ [THEN]
  [THEN]
+ has? new-input 0= [IF]
  : refill ( -- flag ) \ core-ext,block-ext,file-ext
      \G Attempt to fill the input buffer from the input source.  When
      \G the input source is the user input device, attempt to receive
- Line 527
+ Line 575
  Line 527
  Line 575
      tib /line
      [ has? file [IF] ]
          loadfile @ ?dup
-         IF    read-line throw
+         IF    (read-line) throw #fill-bytes !
          ELSE
              [ [THEN] ]
          sourceline# 0< IF 2drop false EXIT THEN
- Line 545
+ Line 593
  Line 545
  Line 593
      [ has? file [IF] ]
          blk off loadfile off
          [ [THEN] ]
-     tib /line accept #tib ! 0 >in ! ;
+     refill drop ;
+ [THEN]
  \ save-mem extend-mem
- Line 556
+ Line 605
  Line 556
  Line 605
      dup allocate throw
      swap 2dup r> -rot move ;
+ : free-mem-var ( addr -- )
+     \ addr is the address of a 2variable containing address and size
+     \ of a memory range; frees memory and clears the 2variable.
+     dup 2@ drop dup
+     if ( addr mem-start )
+         free throw
+0 rot 2!
+     else
+drop
+     then ;
  : extend-mem    ( addr1 u1 u -- addr addr2 u2 )
      \ extend memory block allocated from the heap by u aus
      \ the (possibly reallocated piece is addr2 u2, the extension is at addr
- Line 565
+ Line 625
  Line 565
  Line 625
  \ EVALUATE                                              17may93jaw
- has? file 0= [IF]
+ has? file 0= has? new-input 0= and [IF]
  : push-file  ( -- )  r>
    tibstack @ >r  >tib @ >r  #tib @ >r
    >tib @ tibstack @ = IF  r@ tibstack +!  THEN
- Line 576
+ Line 636
  Line 576
  Line 636
    r> >in !  r> #tib !  r> >tib !  r> tibstack !  >r ;
  [THEN]
+ has? new-input 0= [IF]
  : evaluate ( c-addr u -- ) \ core,block
      \G Save the current input source specification. Store @code{-1} in
      \G @code{source-id} and @code{0} in @code{blk}. Set @code{>IN} to
      \G @code{0} and make the string @i{c-addr u} the input source
      \G and input buffer. Interpret. When the parse area is empty,
      \G restore the input source specification.
+ [ has? file [IF] ]
+     loadfilename# @ >r
+loadfilename# ! \ "*evaluated string*"
+ [ [THEN] ]
      push-file #tib ! >tib !
      >in off
      [ has? file [IF] ]
          blk off loadfile off -1 loadline !
          [ [THEN] ]
      ['] interpret catch
-     pop-file throw ;
+     pop-file
+ [ has? file [IF] ]
+     r> loadfilename# !
+ [ [THEN] ]
+     throw ;
+ [THEN]
  \ \ Quit                                                13feb93py
- Line 598
+ Line 668
  Line 598
  Line 668
  : prompt        state @ IF ."  compiled" EXIT THEN ."  ok" ;
- : (Query)  ( -- )
-     [ has? file [IF] ]
-         loadfile off  blk off loadline off
-         [ [THEN] ]
-     refill drop ;
  : (quit) ( -- )
      \ exits only through THROW etc.
  \    sp0 @ cell - handler @ &12 + ! \ !! kludge: fix the stack pointer
- Line 611
+ Line 675
  Line 611
  Line 675
      \ after the next THROW it catches (it may be off due to BOUNCEs or
      \ because process-args left something on the stack)
      BEGIN
-         .status cr (query) interpret prompt
+         .status cr query interpret prompt
      AGAIN ;
  ' (quit) IS 'quit
- Line 620
+ Line 684
  Line 620
  Line 684
 Constant max-errors
  Variable error-stack  0 error-stack !
- max-errors 6 * cells allot
+ max-errors has? file [IF] 6 [ELSE] 4 [THEN] * cells allot
  \ format of one cell:
  \ source ( addr u )
  \ >in
  \ line-number
  \ Loadfilename ( addr u )
+ : error> ( -- addr u >in line# [addr u] )
+     -1 error-stack +!
+     error-stack dup @
+     [ has? file [IF] 6 [ELSE] 4 [THEN] ] Literal * cells + cell+
+     [ has? file [IF] 6 [ELSE] 4 [THEN] ] Literal cells bounds DO
+         I @
+         cell +LOOP ;
+ : >error ( addr u >in line# [addr u] -- )
+     error-stack dup @ dup 1+
+     max-errors 1- min error-stack !
+     [ has? file [IF] 6 [ELSE] 4 [THEN] ] Literal * cells + cell+
+     [ has? file [IF] 6 [ELSE] 4 [THEN] 1- ] Literal cells bounds swap DO
+         I !
+         -1 cells +LOOP ;
  : dec. ( n -- ) \ gforth
      \G Display @i{n} as a signed decimal number, followed by a space.
      \ !! not used...
- Line 666
+ Line 745
  Line 666
  Line 745
    ELSE  .error
    THEN ;
- : .error-frame ( throwcode addr1 u1 n1 n2 addr2 u2 -- throwcode )
+ : .error-frame ( throwcode addr1 u1 n1 n2 [addr2 u2] -- throwcode )
- \ addr2 u2:     filename of included file
+ \ addr2 u2:     filename of included file - optional
  \ n2:           line number
  \ n1:           error position in input line
  \ addr1 u1:     input line
    cr error-stack @
    IF
+ [ has? file [IF] ]
       ." in file included from "
-      type ." :" dec.r  drop 2drop
+     type ." :"
+ [ [THEN] ]
+     dec.r  drop 2drop
    ELSE
-      type ." :" dec.r ." : " 3 pick .error-string cr
+ [ has? file [IF] ]
-      dup 2over type cr drop
+       type ." :"
+ [ [THEN] ]
+       dup >r dec.r ." : " 3 pick .error-string
+       r> IF \ if line# non-zero, there is a line
+           cr dup 2over type cr drop
       nip -trailing 1- ( line-start index2 )
 >r  BEGIN
 dup + c@ bl >  WHILE
- Line 688
+ Line 773
  Line 688
  Line 773
       r> 1 max 0 ?do \ we want at least one "^", even if the length is 0
                    [char] ^ emit
       loop
+       ELSE
+drop drop
+       THEN
    THEN ;
  : (DoError) ( throw-code -- )
    [ has? os [IF] ]
        >stderr
    [ [THEN] ]
-   sourceline# IF
+   source >in @ sourceline# [ has? file [IF] ]
-       source >in @ sourceline# 0 0 .error-frame
+       sourcefilename
-   THEN
+   [ [THEN] ] .error-frame
    error-stack @ 0 ?DO
-     -1 error-stack +!
+     error>
-     error-stack dup @ 6 * cells + cell+
-cells bounds DO
-       I @
-     cell +LOOP
      .error-frame
    LOOP
    drop
- Line 717
+ Line 801
  Line 717
  Line 801
      \G Empty the return stack, make the user input device
      \G the input source, enter interpret state and start
      \G the text interpreter.
-     rp0 @ rp! handler off clear-tibstack >tib @ >r
+     rp0 @ rp! handler off clear-tibstack
+     [ has? new-input 0= [IF] ] >tib @ >r [ [THEN] ]
      BEGIN
          [ has? compiler [IF] ]
          postpone [
- Line 725
+ Line 810
  Line 725
  Line 810
          ['] 'quit CATCH dup
      WHILE
          <# \ reset hold area, or we may get another error
-         DoError r@ >tib ! r@ tibstack !
+         DoError
+         [ has? new-input [IF] ] clear-tibstack
+         [ [ELSE] ] r@ >tib ! r@ tibstack !
+         [ [THEN] ]
      REPEAT
-     drop r> >tib ! ;
+     drop [ has? new-input [IF] ] clear-tibstack
+     [ [ELSE] ] r> >tib !
+     [ [THEN] ] ;
  \ \ Cold Boot                                           13feb93py
  : (bootmessage)
      ." GForth " version-string type
-     ." , Copyright (C) 1998 Free Software Foundation, Inc." cr
+     ." , Copyright (C) 1995-2000 Free Software Foundation, Inc." cr
      ." GForth comes with ABSOLUTELY NO WARRANTY; for details type `license'"
  [ has? os [IF] ]
       cr ." Type `bye' to exit"
- Line 763
+ Line 853
  Line 763
  Line 853
      'cold
      init8 chainperform
  [ has? file [IF] ]
+     loadfilename# off
      process-args
      loadline off
  [ [THEN] ]
      bootmessage
      quit ;
+ has? new-input 0= [IF]
  : clear-tibstack ( -- )
  [ has? glocals [IF] ]
      lp@ forthstart 7 cells + @ -
- Line 780
+ Line 872
  Line 780
  Line 872
      [ [THEN] ]
  [ [THEN] ]
      dup >tib ! tibstack ! #tib off >in off ;
+ [THEN]
- : boot ( path **argv argc -- )
+ : boot ( path n **argv argc -- )
      main-task up!
  [ has? os [IF] ]
      stdout TO outfile-id
- Line 791
+ Line 884
  Line 791
  Line 884
      argc ! argv ! pathstring 2!
  [ [THEN] ]
      sp@ sp0 !
+ [ has? new-input [IF] ]
+     current-input off
+ [ [THEN] ]
      clear-tibstack
      rp@ rp0 !
  [ has? floating [IF] ]

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



Removed from v.1.48
 


changed lines


 
Added in v.1.69
 Legend:



Removed from v.1.48
 


changed lines


 
Added in v.1.69
-Removed from v.1.48
+Added in v.1.69

CVS Admin

gforth: gforth/kernel/int.fs

Diff for /gforth/kernel/int.fs between version 1.48 and 1.69

ViewCVS and CVS Help