gforth: gforth/kernel/int.fs

Diff for /gforth/kernel/int.fs between version 1.58 and 1.152

-version 1.58, Sat Sep  9 20:32:58 2000 UTC
+version 1.152, Fri May 26 21:18:45 2006 UTC
  Line 1
  Line 1
  Line 1
  \ definitions needed for interpreter only
- \ Copyright (C) 1995-2000 Free Software Foundation, Inc.
+ \ Copyright (C) 1995-2000,2004,2005 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 29
  Line 29
  Line 29
  require ./nio.fs        \ . <# ...
  require ./errore.fs     \ .error ...
  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 44
  Line 44
  : (source) ( -- c-addr u )
      tib #tib @ ;
  ' (source) IS source
+ [THEN]
  : (word) ( addr1 n1 char -- addr2 n2 )
    dup >r skip 2dup r> scan  nip - ;
- Line 53
+ Line 54
  Line 53
  Line 54
  \ word parse                                           23feb93py
- : sword  ( char -- addr len ) \ gforth s-word
+ : sword  ( char -- addr len ) \ gforth-obsolete s-word
      \G Parses like @code{word}, but the output is like @code{parse} output.
      \G @xref{core-idef}.
    \ this word was called PARSE-WORD until 0.3.0, but Open Firmware and
    \ dpANS6 A.6.2.2008 have a word with that name that behaves
    \ differently (like NAME).
    source 2dup >r >r >in @ over min /string
-   rot dup bl = IF  drop (parse-white)  ELSE  (word)  THEN
+     rot dup bl = IF
+         drop (parse-white)
+     ELSE
+         (word)
+     THEN
+ [ has? new-input [IF] ]
+dup input-lexeme!
+ [ [THEN] ]
 dup + r> - 1+ r> min >in ! ;
  : word   ( char "<chars>ccc<char>-- c-addr ) \ core
- Line 78
+ Line 86
  Line 78
  Line 86
      \G Parse @i{ccc}, delimited by @i{char}, in the parse
      \G area. @i{c-addr u} specifies the parsed string within the
      \G parse area. If the parse area was empty, @i{u} is 0.
-     >r  source  >in @ over min /string  over  swap r>  scan >r
+     >r  source  >in @ over min /string ( c-addr1 u1 )
-   over - dup r> IF 1+ THEN  >in +! ;
+     over  swap r>  scan >r
+     over - dup r> IF 1+ THEN  >in +!
+ [ has? new-input [IF] ]
+dup input-lexeme!
+ [ [THEN] ] ;
  \ name                                                 13feb93py
- Line 87
+ Line 99
  Line 87
  Line 99
  : (name) ( -- c-addr count ) \ gforth
      source 2dup >r >r >in @ /string (parse-white)
+ [ has? new-input [IF] ]
+dup input-lexeme!
+ [ [THEN] ]
 dup + r> - 1+ r> min >in ! ;
  \    name count ;
  [THEN]
- Line 95
+ Line 110
  Line 95
  Line 110
      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
  \ number? number                                       23feb93py
  hex
- const Create bases   10 ,   2 ,   A , 100 ,
+ const Create bases   0A , 10 ,   2 ,   0A ,
- \                     16     2    10   character
+ \                    10   16     2     10
  \ !! protect BASE saving wrapper against exceptions
  : getbase ( addr u -- addr' u' )
-     over c@ [char] $ - dup 4 u<
+dup s" 0x" string-prefix? >r
+dup s" 0X" string-prefix? r> or
+     base @ &34 < and if
+         hex 2 /string
+     endif
+     over c@ [char] # - dup 4 u<
      IF
          cells bases + @ base ! 1 /string
      ELSE
          drop
      THEN ;
- : sign? ( addr u -- addr u flag )
+ : sign? ( addr u -- addr1 u1 flag )
      over c@ [char] - =  dup >r
      IF
 /string
      THEN
      r> ;
- : s>unumber? ( addr u -- ud flag )
+ : s'>unumber? ( addr u -- ud flag )
-     base @ >r  dpl on  getbase
+     \ convert string "C" or "C'" to character code
+     dup 0= if
+         false exit
+     endif
+     x@+/string 0 s" '" 2rot string-prefix? ;
+ : s>unumber? ( addr u -- ud flag ) \ gforth
+     \G converts string addr u into ud, flag indicates success
+     dpl on
+     over c@ '' = if
+/string s'>unumber? exit
+     endif
+     base @ >r  getbase
 . 2swap
      BEGIN ( d addr len )
          dup >r >number dup
- Line 140
+ Line 172
  Line 140
  Line 172
      r> base ! ;
  \ ouch, this is complicated; there must be a simpler way - anton
- : s>number? ( addr len -- d f )
+ : s>number? ( addr u -- d f ) \ gforth
-     \ converts string addr len into d, flag indicates success
+     \G converts string addr u into d, flag indicates success
      sign? >r
      s>unumber?
 = IF
- Line 208
+ Line 240
  Line 208
  Line 240
      \G comments into documentation.
      POSTPONE \ ; immediate
+ has? ec [IF]
+     AVariable forth-wordlist
+     : find-name ( c-addr u -- nt | 0 ) \ gforth
+         \g Find the name @i{c-addr u} in the current search
+         \g order. Return its @i{nt}, if found, otherwise 0.
+         forth-wordlist (f83find) ;
+ [ELSE]
  \ \ object oriented search list                         17mar93py
  \ word list structure:
- Line 227
+ Line 266
  Line 227
  Line 266
    cell% field wordlist-extend \ wordlist extensions (eg bucket offset)
  end-struct wordlist-struct
+ has? f83headerstring [IF]
  : f83find      ( addr len wordlist -- nt / false )
      wordlist-id @ (f83find) ;
+ [ELSE]
+ : f83find      ( addr len wordlist -- nt / false )
+     wordlist-id @ (listlfind) ;
+ [THEN]
  : initvoc               ( wid -- )
    dup wordlist-map @ hash-method perform ;
- Line 253
+ Line 297
  Line 253
  Line 297
  ' lookup is context
  forth-wordlist current !
+ : (search-wordlist)  ( addr count wid -- nt | false )
+     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} for the definition
+     \G named by the string at @i{c-addr count}.  If the definition is
+     \G not found, return 0. If the definition is found return 1 (if
+     \G the definition is immediate) or -1 (if the definition is not
+     \G immediate) together with the @i{xt}.  In Gforth, the @i{xt}
+     \G returned represents the interpretation semantics.  ANS Forth
+     \G does not specify clearly what @i{xt} represents.
+     (search-wordlist) dup if
+         (name>intn)
+     then ;
+ : find-name ( c-addr u -- nt | 0 ) \ gforth
+     \g Find the name @i{c-addr u} in the current search
+     \g order. Return its @i{nt}, if found, otherwise 0.
+     lookup @ (search-wordlist) ;
+ [THEN]
  \ \ 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
+ has? f83headerstring [IF]
+     \ to save space, Gforth EC limits words to 31 characters
+     $80 constant alias-mask
+     $40 constant immediate-mask
+     $20 constant restrict-mask
+     $1f constant lcount-mask
+ [ELSE]
+ $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, -1 1 cells 1- times
+                           [ELSE] -1 1 cells 1- times c, [THEN]
+ [THEN]
  \ higher level parts of find
- Line 266
+ Line 354
  Line 266
  Line 354
      \ true becomes 1, false -1
 = 2* 1+ ;
+ : ticking-compile-only-error ( ... -- )
+     -&2048 throw ;
  : compile-only-error ( ... -- )
      -&14 throw ;
- Line 277
+ Line 368
  Line 277
  Line 368
      then
  [ [THEN] ] ;
- : (x>int) ( cfa b -- xt )
+ : (x>int) ( cfa w -- xt )
      \ get interpretation semantics of name
-     restrict-mask and
+     restrict-mask and [ has? rom [IF] ] 0= [ [THEN] ]
      if
          drop ['] compile-only-error
      else
          (cfa>int)
      then ;
+ has? f83headerstring [IF]
  : 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+ count 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=
      IF
          swap @ swap
      THEN ;
+ [ELSE]
+ : name>string ( nt -- addr count ) \ gforth     head-to-string
+     \g @i{addr count} is the name of the word represented by @i{nt}.
+     cell+ dup cell+ swap @ lcount-mask and ;
+ : ((name>))  ( nfa -- cfa )
+     name>string + cfaligned ;
+ : (name>x) ( nfa -- cfa w )
+     \ cfa is an intermediate cfa and w is the flags cell of nfa
+     dup ((name>))
+     swap cell+ @ dup alias-mask and 0=
+     IF
+         swap @ swap
+     THEN ;
+ [THEN]
  : name>int ( nt -- xt ) \ gforth
      \G @i{xt} represents the interpretation semantics of the word
      \G @i{nt}. If @i{nt} has no interpretation semantics (i.e. is
      \G @code{compile-only}), @i{xt} is the execution token for
-     \G @code{compile-only-error}, which performs @code{-14 throw}.
+     \G @code{ticking-compile-only-error}, which performs @code{-2048 throw}.
      (name>x) (x>int) ;
  : name?int ( nt -- xt ) \ gforth
-     \G Like @code{name>int}, but perform @code{-14 throw} if @i{nt}
+     \G Like @code{name>int}, but perform @code{-2048 throw} if @i{nt}
      \G has no interpretation semantics.
-     (name>x) restrict-mask and
+     (name>x) restrict-mask and [ has? rom [IF] ] 0= [ [THEN] ]
      if
-         compile-only-error \ does not return
+         ticking-compile-only-error \ does not return
      then
      (cfa>int) ;
- Line 326
+ Line 434
  Line 326
  Line 434
          interpret/compile-comp @
      then
  [ [THEN] ]
-     r> immediate-mask and flag-sign
+     r> immediate-mask and [ has? rom [IF] ] 0= [ [THEN] ] flag-sign
      ;
  : (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 ;
+     swap immediate-mask and [ has? rom [IF] ] 0= [ [THEN] ] flag-sign ;
- const Create ???  0 , 3 c, char ? c, char ? c, char ? c,
+ const Create ???  0 , 3 , char ? c, char ? c, char ? c,
  \ ??? is used by dovar:, must be created/:dovar
  [IFDEF] forthstart
- Line 342
+ Line 450
  Line 342
  Line 450
  : head? ( addr -- f )
      \G heuristic check whether addr is a name token; may deliver false
-     \G positives; addr must be a valid address
+ \G positives; addr must be a valid address; returns 1 for
+ \G particularly unsafe positives
      \ we follow the link fields and check for plausibility; two
      \ iterations should catch most false addresses: on the first
      \ iteration, we may get an xt, on the second a code address (or
      \ some code), which is typically not in the dictionary.
-0 do
+     \ we added a third iteration for working with code and ;code words.
+0 do
          dup dup aligned <> if \ protect @ against unaligned accesses
              drop false unloop exit
          then
- Line 358
+ Line 468
  Line 358
  Line 468
                  drop false unloop exit
              then ( addr1 )
          else \ 0 in the link field, no further checks
-drop true unloop exit
+drop 1 unloop exit \ this is very unsure, so return 1
          then
      loop
      \ in dubio pro:
      drop true ;
  : >head-noprim ( cfa -- nt ) \ gforth  to-head-noprim
-     $25 cell do ( cfa )
+     \ also heuristic
-         dup i - count $9F and + cfaligned over alias-mask + =
+     dup forthstart - max-name-length @ float+ cell+ min cell max cell ?do ( cfa )
+         dup i - dup @ [ alias-mask lcount-mask or ] literal
+         [ 1 bits/char 3 - lshift 1 - 1 bits/char 1 - lshift or
+         -1 cells allot bigendian [IF]   c, -1 1 cells 1- times
+         [ELSE] -1 1 cells 1- times c, [THEN] ]
+         and ( cfa len|alias )
+         swap + cell+ cfaligned over alias-mask + =
          if ( cfa )
              dup i - cell - dup head?
              if
- Line 381
+ Line 497
  Line 381
  Line 497
  : >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
+         [ 1 bits/char 3 - lshift 1 - 1 bits/char 1 - lshift or
+         -1 cells allot bigendian [IF]   c, -1 1 cells 1- times
+         [ELSE] -1 1 cells 1- times c, [THEN] ]
+         and ( cfa len|alias )
+         swap + cell + cfaligned over alias-mask + =
          if ( cfa ) i - cell - unloop exit
          then
          cell +loop
- Line 389
+ Line 510
  Line 389
  Line 510
  [THEN]
- : body> 0 >body - ;
+ cell% 2* 0 0 field >body ( xt -- a_addr ) \ core
+ \G Get the address of the body of the word represented by @i{xt} (the
+ \G address of the word's data field).
+ drop drop
+ cell% -2 * 0 0 field body> ( xt -- a_addr )
+     drop drop
+ has? standardthreading has? compiler and [IF]
+ ' @ alias >code-address ( xt -- c_addr ) \ gforth
+ \G @i{c-addr} is the code address of the word @i{xt}.
+ : >does-code ( xt -- a_addr ) \ gforth
+ \G If @i{xt} is the execution token of a child of a @code{DOES>} word,
+ \G @i{a-addr} is the start of the Forth code after the @code{DOES>};
+ \G Otherwise @i{a-addr} is 0.
+     dup @ dodoes: = if
+         cell+ @
+     else
+         drop 0
+     endif ;
- : (search-wordlist)  ( addr count wid -- nt | false )
+ has? flash [IF] ' flash! [ELSE] ' ! [THEN]
-     dup wordlist-map @ find-method perform ;
+ alias code-address! ( c_addr xt -- ) \ gforth
+ \G Create a code field with code address @i{c-addr} at @i{xt}.
+ : does-code! ( a_addr xt -- ) \ gforth
+ \G Create a code field at @i{xt} for a child of a @code{DOES>}-word;
+ \G @i{a-addr} is the start of the Forth code after @code{DOES>}.
+     [ has? flash [IF] ]
+     dodoes: over flash! cell+ flash!
+     [ [ELSE] ]
+     dodoes: over ! cell+ !
+     [ [THEN] ] ;
- : search-wordlist ( c-addr count wid -- 0 | xt +-1 ) \ search
+ ' drop alias does-handler! ( a_addr -- ) \ gforth
-     \G Search the word list identified by @i{wid} for the definition
+ \G Create a @code{DOES>}-handler at address @i{a-addr}. Normally,
-     \G named by the string at @i{c-addr count}.  If the definition is
+ \G @i{a-addr} points just behind a @code{DOES>}.
-     \G not found, return 0. If the definition is found return 1 (if
-     \G the definition is immediate) or -1 (if the definition is not
-     \G immediate) together with the @i{xt}.  In Gforth, the @i{xt}
-     \G returned represents the interpretation semantics.  ANS Forth
-     \G does not specify clearly what @i{xt} represents.
-     (search-wordlist) dup if
-         (name>intn)
-     then ;
- : find-name ( c-addr u -- nt | 0 ) \ gforth
+cells constant /does-handler ( -- n ) \ gforth
-     \g Find the name @i{c-addr u} in the current search
+ \G The size of a @code{DOES>}-handler (includes possible padding).
-     \g order. Return its @i{nt}, if found, otherwise 0.
-     lookup @ (search-wordlist) ;
+ [THEN]
  : sfind ( c-addr u -- 0 / xt +-1  ) \ gforth-obsolete
      find-name dup
- Line 447
+ Line 591
  Line 447
  Line 591
  \ ticks in interpreter
  : (') ( "name" -- nt ) \ gforth
-     name name-too-short?
+     parse-name name-too-short?
      find-name dup 0=
      IF
          drop -&13 throw
- Line 470
+ Line 614
  Line 470
  Line 614
  \ interpret                                            10mar92py
- Defer parser ( c-addr u -- )
+ Defer parser1 ( c-addr u -- ... xt)
- Defer name ( -- c-addr count ) \ gforth
+ \ "... xt" is the action to be performed by the text-interpretation of c-addr u
+ : parser ( c-addr u -- ... )
+ \ text-interpret the word/number c-addr u, possibly producing a number
+     parser1 execute ;
+ has? ec [IF]
+     ' (name) Alias parse-name
+     : no.extensions  2drop -&13 throw ;
+     ' no.extensions Alias compiler-notfound1
+     ' no.extensions Alias interpreter-notfound1
+ [ELSE]
+ Defer parse-name ( "name" -- c-addr u ) \ gforth
  \G Get the next word from the input buffer
- ' (name) IS name
+ ' (name) IS parse-name
- Defer compiler-notfound ( c-addr count -- )
- Defer interpreter-notfound ( c-addr count -- )
+ ' parse-name alias parse-word ( -- c-addr u ) \ gforth-obsolete
+ \G old name for @code{parse-name}
+ ' parse-name alias name ( -- c-addr u ) \ gforth-obsolete
+ \G old name for @code{parse-name}
+ Defer compiler-notfound1 ( c-addr count -- ... xt )
+ Defer interpreter-notfound1 ( c-addr count -- ... xt )
  : no.extensions  ( addr u -- )
 drop -&13 throw ;
- ' no.extensions IS compiler-notfound
+ ' no.extensions IS compiler-notfound1
- ' no.extensions IS interpreter-notfound
+ ' no.extensions IS interpreter-notfound1
+ Defer before-word ( -- ) \ gforth
+ \ called before the text interpreter parses the next word
+ ' noop IS before-word
+ [THEN]
+ has? backtrace [IF]
+ : interpret1 ( ... -- ... )
+     rp@ backtrace-rp0 !
+     BEGIN
+         ?stack [ has? EC 0= [IF] ] before-word [ [THEN] ] parse-name dup
+     WHILE
+         parser1 execute
+     REPEAT
+drop ;
  : interpret ( ?? -- ?? ) \ gforth
      \ interpret/compile the (rest of the) input buffer
- [ has? backtrace [IF] ]
+     backtrace-rp0 @ >r
-     rp@ backtrace-rp0 !
+     ['] interpret1 catch
- [ [THEN] ]
+     r> backtrace-rp0 !
+     throw>error ;
+ [ELSE]
+ : interpret ( ... -- ... )
      BEGIN
-         ?stack name dup
+         ?stack [ has? EC 0= [IF] ] before-word [ [THEN] ] parse-name dup
      WHILE
-         parser
+         parser1 execute
      REPEAT
 drop ;
+ [THEN]
  \ interpreter                                   30apr92py
  \ not the most efficient implementations of interpreter and compiler
- : interpreter ( c-addr u -- )
+ : interpreter1 ( c-addr u -- ... xt )
 dup find-name dup
      if
-         nip nip name>int execute
+         nip nip name>int
      else
          drop
 dup 2>r snumber?
          IF
-rdrop
+rdrop ['] noop
          ELSE
-r> interpreter-notfound
+r> interpreter-notfound1
          THEN
      then ;
- ' interpreter  IS  parser
+ ' interpreter1  IS  parser1
  \ \ Query Evaluate                                      07apr93py
  has? file 0= [IF]
  : sourceline# ( -- n )  1 ;
- [THEN]
+ [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]
+ : input-start-line ( -- )  >in off ;
  : 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 537
+ Line 723
  Line 537
  Line 723
      \G and return true; otherwise, return false.  A successful result
      \G includes receipt of a line containing 0 characters.
      [ has? file [IF] ]
-         blk @  IF  1 blk +!  true  0 >in !  EXIT  THEN
+         blk @  IF  1 blk +!  true  EXIT  THEN
          [ [THEN] ]
      tib /line
      [ has? file [IF] ]
          loadfile @ ?dup
-         IF    (read-line) #fill-bytes ! throw
+         IF    (read-line) throw #fill-bytes !
          ELSE
              [ [THEN] ]
          sourceline# 0< IF 2drop false EXIT THEN
-         accept true
+         accept eof @ 0=
          [ has? file [IF] ]
          THEN
 loadline +!
          [ [THEN] ]
-     swap #tib ! 0 >in ! ;
+     swap #tib !
+     input-start-line ;
  : query   ( -- ) \ core-ext
      \G Make the user input device the input source. Receive input into
- Line 560
+ Line 747
  Line 560
  Line 747
      [ has? file [IF] ]
          blk off loadfile off
          [ [THEN] ]
-     tib /line accept #tib ! 0 >in ! ;
+     refill drop ;
+ [THEN]
  \ save-mem extend-mem
- Line 571
+ Line 759
  Line 571
  Line 759
      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
+     \ the (possibly reallocated) piece is addr2 u2, the extension is at addr
      over >r + dup >r resize throw
      r> over r> + -rot ;
  [THEN]
  \ 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 591
+ Line 790
  Line 591
  Line 790
    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.
-     loadfilename# @ >r
+ [ has? file [IF] ]
-loadfilename# ! \ "\evaluated string/"
+     s" *evaluated string*" loadfilename>r
+ [ [THEN] ]
      push-file #tib ! >tib !
-     >in off
+     input-start-line
      [ has? file [IF] ]
          blk off loadfile off -1 loadline !
          [ [THEN] ]
      ['] interpret catch
      pop-file
-     r> loadfilename# !
+ [ has? file [IF] ]
+     r>loadfilename
+ [ [THEN] ]
      throw ;
+ [THEN]
  \ \ Quit                                                13feb93py
  Defer 'quit
+ has? ec 0= [IF]
  Defer .status
+ [THEN]
  : 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
-     \ stored in the system's CATCH frame, so the stack depth will be 0
-     \ 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
+         [ has? ec [IF] ] cr [ [ELSE] ]
-     AGAIN ;
+         .status ['] cr catch if
+             [ has? OS [IF] ] >stderr [ [THEN] ]
+             cr ." Can't print to stdout, leaving" cr
+             \ if stderr does not work either, already DoError causes a hang
+(bye)
+         endif [ [THEN] ]
+         refill  WHILE
+             interpret prompt
+     REPEAT
+     bye ;
  ' (quit) IS 'quit
  \ \ DOERROR (DOERROR)                                   13jun93jaw
+ has? ec 0= [IF]
 Constant max-errors
+has? file 2 and + Constant /error
  Variable error-stack  0 error-stack !
- max-errors 6 * cells allot
+ max-errors /error * cells allot
  \ format of one cell:
- \ source ( addr u )
+ \ source ( c-addr u )
- \ >in
+ \ last parsed lexeme ( c-addr u )
  \ line-number
  \ Loadfilename ( addr u )
+ : error> ( --  c-addr1 u1 c-addr2 u2 line# [addr u] )
+     -1 error-stack +!
+     error-stack dup @
+     /error * cells + cell+
+     /error cells bounds DO
+         I @
+     cell +LOOP ;
+ : >error ( c-addr1 u1 c-addr2 u2 line# [addr u] -- )
+     error-stack dup @ dup 1+
+     max-errors 1- min error-stack !
+     /error * cells + cell+
+     /error 1- cells bounds swap DO
+         I !
+     -1 cells +LOOP ;
+ : input-error-data ( -- c-addr1 u1 c-addr2 u2 line# [addr u] )
+     \ error data for the current input, to be used by >error or .error-frame
+     source input-lexeme 2@ sourceline#
+     [ has? file [IF] ] sourcefilename [ [THEN] ] ;
  : dec. ( n -- ) \ gforth
      \G Display @i{n} as a signed decimal number, followed by a space.
      \ !! not used...
      base @ decimal swap . base ! ;
- : dec.r ( u -- ) \ gforth
+ : dec.r ( u n -- ) \ gforth
-     \G Display @i{u} as a unsigned decimal number
+     \G Display @i{u} as a unsigned decimal number in a field @i{n}
-     base @ decimal swap 0 .r base ! ;
+     \G characters wide.
+     base @ >r decimal .r r> base ! ;
  : hex. ( u -- ) \ gforth
      \G Display @i{u} as an unsigned hex number, prefixed with a "$" and
- Line 661
+ Line 890
  Line 661
  Line 890
      \ !! not used...
      [char] $ emit base @ swap hex u. base ! ;
- : typewhite ( addr u -- ) \ gforth
+ : -trailing  ( c_addr u1 -- c_addr u2 ) \ string dash-trailing
-     \G Like type, but white space is printed instead of the characters.
+ \G Adjust the string specified by @i{c-addr, u1} to remove all
-     bounds ?do
+ \G trailing spaces. @i{u2} is the length of the modified string.
-         i c@ #tab = if \ check for tab
+     BEGIN
-             #tab
+         dup
-         else
+     WHILE
-             bl
+- 2dup + c@ bl <>
-         then
+     UNTIL  1+  THEN ;
-         emit
-     loop ;
  DEFER DOERROR
- Line 685
+ Line 912
  Line 685
  Line 912
    ELSE  .error
    THEN ;
- : .error-frame ( throwcode addr1 u1 n1 n2 addr2 u2 -- throwcode )
+ : umin ( u1 u2 -- u )
- \ addr2 u2:     filename of included file
+dup u>
+     if
+         swap
+     then
+     drop ;
+ Defer mark-start
+ Defer mark-end
+ :noname ." >>>" ; IS mark-start
+ :noname ." <<<" ; IS mark-end
+ : part-type ( addr1 u1 u -- addr2 u2 )
+     \ print first u characters of addr1 u1, addr2 u2 is the rest
+     over umin 2 pick over type /string ;
+ : .error-line ( c-addr1 u1 c-addr2 u2 -- )
+     \ print error in line c-addr1 u1, where the error-causing lexeme
+     \ is c-addr2 u2
+     >r 2 pick - part-type ( c-addr3 u3 R: u2 )
+     mark-start r> part-type mark-end ( c-addr4 u4 )
+     type ;
+ : .error-frame ( throwcode addr1 u1 addr2 u2 n2 [addr3 u3] -- throwcode )
+     \ addr3 u3: filename of included file - optional
  \ n2:           line number
- \ n1:           error position in input line
+     \ addr2 u2: parsed lexeme (should be marked as causing the error)
  \ addr1 u1:     input line
-   cr error-stack @
+     error-stack @
-   IF
+     IF ( throwcode addr1 u1 n0 n1 n2 [addr2 u2] )
-      ." in file included from "
+         [ has? file [IF] ] \ !! unbalanced stack effect
-      type ." :" dec.r  drop 2drop
+           over IF
+               cr ." in file included from "
+               type ." :"
+dec.r  2drop 2drop
    ELSE
-       type ." :" dup >r dec.r ." : " 3 pick .error-string
+drop 2drop 2drop drop
-       r> IF \ if line# non-zero, there is a line
+           THEN
-           cr dup 2over type cr drop
+           [ [THEN] ] ( throwcode addr1 u1 n0 n1 n2 )
-           nip -trailing 1- ( line-start index2 )
+     ELSE ( throwcode addr1 u1 n0 n1 n2 [addr2 u2] )
->r  BEGIN
+         [ has? file [IF] ]
-dup + c@ bl >  WHILE
+             cr type ." :"
-               r> 1+ >r  1- dup 0<  UNTIL  THEN  1+
+             [ [THEN] ] ( throwcode addr1 u1 n0 n1 n2 )
-           ( line-start index1 )
+         dup 0 dec.r ." : " 5 pick .error-string
-           typewhite
+         IF \ if line# non-zero, there is a line
-           r> 1 max 0 ?do \ we want at least one "^", even if the length is 0
+             cr .error-line
-               [char] ^ emit
-           loop
        ELSE
-drop drop
+drop 2drop
        THEN
    THEN ;
- Line 716
+ Line 968
  Line 716
  Line 968
    [ has? os [IF] ]
        >stderr
    [ [THEN] ]
-   source >in @ sourceline# sourcefilename .error-frame
+   input-error-data .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 733
+ Line 981
  Line 733
  Line 981
  ' (DoError) IS DoError
+ [ELSE]
+     : dec.  base @ >r decimal . r> base ! ;
+     : DoError ( throw-code -- )
+         cr source drop >in @ type ." <<< "
+         dup -2 =  IF  "error @ type  drop  EXIT  THEN
+         .error ;
+ [THEN]
  : quit ( ?? -- ?? ) \ core
      \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 [
+             [compile] [
          [ [THEN] ]
+         \ stack depths may be arbitrary here
          ['] 'quit CATCH dup
      WHILE
          <# \ reset hold area, or we may get another error
-         DoError r@ >tib ! r@ tibstack !
+             DoError
+             \ stack depths may be arbitrary still (or again), so clear them
+             clearstacks
+             [ 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
+     ." Gforth " version-string type
-     ." , Copyright (C) 1995-2000 Free Software Foundation, Inc." cr
+     ." , Copyright (C) 1995-2006 Free Software Foundation, Inc." cr
-     ." GForth comes with ABSOLUTELY NO WARRANTY; for details type `license'"
+     ." Gforth comes with ABSOLUTELY NO WARRANTY; for details type `license'"
  [ has? os [IF] ]
       cr ." Type `bye' to exit"
  [ [THEN] ] ;
- defer bootmessage
+ defer bootmessage \ gforth
+ \G Hook (deferred word) executed right after interpreting the OS
+ \G command-line arguments.  Normally prints the Gforth startup
+ \G message.
+ has? file [IF]
  defer process-args
+ [THEN]
  ' (bootmessage) IS bootmessage
+ has? ec 0= [IF]
  Defer 'cold ( -- ) \ gforth  tick-cold
- \ hook (deferred word) for things to do right before interpreting the
+ \G Hook (deferred word) for things to do right before interpreting the
- \ command-line arguments
+ \G OS command-line arguments.  Normally does some initializations that
+ \G you also want to perform.
  ' noop IS 'cold
+ [THEN]
- Variable init8
  : cold ( -- ) \ gforth
  [ has? backtrace [IF] ]
      rp@ backtrace-rp0 !
  [ [THEN] ]
  [ has? file [IF] ]
-     pathstring 2@ fpath only-path
+     os-cold
-     init-included-files
  [ [THEN] ]
+ [ has? ec 0= [IF] ]
+     set-encoding-fixed-width
      'cold
-     init8 chainperform
+ [ [THEN] ]
  [ has? file [IF] ]
      process-args
      loadline off
-     loadfilename# off
  [ [THEN] ]
      bootmessage
      quit ;
+ has? new-input 0= [IF]
  : clear-tibstack ( -- )
  [ has? glocals [IF] ]
      lp@ forthstart 7 cells + @ -
- Line 797
+ Line 1069
  Line 797
  Line 1069
      [ has? os [IF] ]
      r0 @ forthstart 6 cells + @ -
      [ [ELSE] ]
-     sp@ $10 cells +
+     sp@ cell+
      [ [THEN] ]
  [ [THEN] ]
-     dup >tib ! tibstack ! #tib off >in off ;
+     dup >tib ! tibstack ! #tib off
+     input-start-line ;
+ [THEN]
- : boot ( path **argv argc -- )
+ : boot ( path n **argv argc -- )
+ [ has? no-userspace 0= [IF] ]
      main-task up!
+ [ [THEN] ]
  [ has? os [IF] ]
-     stdout TO outfile-id
+     os-boot
-     stdin  TO infile-id
+ [ [THEN] ]
- \ !! [ [THEN] ]
+ [ has? rom [IF] ]
- \ !! [ has? file [IF] ]
+     ram-shadow dup @ dup -1 <> >r u> r> and IF
-     argc ! argv ! pathstring 2!
+         ram-shadow 2@  ELSE
+         ram-mirror ram-size  THEN  ram-start swap move
  [ [THEN] ]
      sp@ sp0 !
+ [ has? peephole [IF] ]
+     \ only needed for greedy static superinstruction selection
+     \ primtable prepare-peephole-table TO peeptable
+ [ [THEN] ]
+ [ has? new-input [IF] ]
+     current-input off
+ [ [THEN] ]
      clear-tibstack
+0 includefilename 2!
      rp@ rp0 !
  [ has? floating [IF] ]
      fp@ fp0 !
  [ [THEN] ]
+ [ has? ec 0= [IF] ]
      handler off
-     ['] cold catch DoError cr
+     ['] cold catch dup -&2049 <> if \ broken pipe?
+         DoError cr
+     endif
+ [ [ELSE] ]
+     cold
+ [ [THEN] ]
  [ has? os [IF] ]
 (bye) \ !! determin exit code from throw code?
  [ [THEN] ]

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



Removed from v.1.58
 


changed lines


 
Added in v.1.152
 Legend:



Removed from v.1.58
 


changed lines


 
Added in v.1.152
-Removed from v.1.58
+Added in v.1.152

CVS Admin

gforth: gforth/kernel/int.fs

Diff for /gforth/kernel/int.fs between version 1.58 and 1.152

ViewCVS and CVS Help