gforth: gforth/kernel/int.fs

Diff for /gforth/kernel/int.fs between version 1.101 and 1.173

-version 1.101, Fri Feb 28 10:59:13 2003 UTC
+version 1.173, Fri Jan  8 18:54:34 2010 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,2007,2009 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,
  Line 15
  Line 15
  Line 15
  \ 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
+ \ along with this program. If not, see http://www.gnu.org/licenses/.
- \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
  \ \ Revision-Log
- Line 29
+ Line 28
  Line 29
  Line 28
  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
- Line 55
+ Line 53
  Line 55
  Line 53
  \ 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 80
+ Line 85
  Line 80
  Line 85
  \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 89
+ Line 98
  Line 89
  Line 98
  : (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 101
+ Line 113
  Line 101
  Line 113
  \ \ Number parsing                                      23feb93py
- \ number? number                                       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 )
+ : ?dnegate ( d1 f -- d2 )
-     base @ >r  dpl on  getbase
+     if
-. 2swap
+         dnegate
+     then ;
+ has? os 0= [IF]
+ : x@+/string ( addr u -- addr' u' c )
+     over c@ >r 1 /string r> ;
+ [THEN]
+ : s'>unumber? ( addr u -- ud flag )
+     \ convert string "C" or "C'" to character code
+     dup 0= if
+         false exit
+     endif
+     x@+/string 0 s" '" 2rot string-prefix? ;
+ : s>unumber? ( c-addr u -- ud flag ) \ gforth
+     \G converts string c-addr u into ud, flag indicates success
+     dpl on
+     over c@ '' = if
+/string s'>unumber? exit
+     endif
+     base @ >r  getbase sign?
+     over if
+         >r 0. 2swap
      BEGIN ( d addr len )
          dup >r >number dup
      WHILE \ there are characters left
- Line 135
+ Line 175
  Line 135
  Line 175
      WHILE \ the current char is '.'
 /string
      REPEAT  THEN \ there are unparseable characters left
-drop false
+drop rdrop false
      ELSE
-         rdrop 2drop true
+             rdrop 2drop r> ?dnegate true
      THEN
+     ELSE
+         drop 2drop 0. false THEN
      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
          rdrop false
      ELSE \ no characters left, all ok
-         r>
+         r> ?dnegate
-         IF
-             dnegate
-         THEN
          true
      THEN ;
- Line 171
+ Line 210
  Line 171
  Line 210
 +
      THEN ;
- : number? ( string -- string 0 / n -1 / d 0> )
+ : (number?) ( string -- string 0 / n -1 / d 0> )
      dup >r count snumber? dup if
          rdrop
      else
- Line 179
+ Line 218
  Line 179
  Line 218
      then ;
  : number ( string -- d )
-     number? ?dup 0= abort" ?"  0<
+     (number?) ?dup 0= abort" ?"  0<
      IF
          s>d
      THEN ;
- Line 210
+ Line 249
  Line 210
  Line 249
      \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 229
+ Line 275
  Line 229
  Line 275
    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 239
+ Line 290
  Line 239
  Line 290
  Create f83search ( -- wordlist-map )
      ' f83find A,  ' drop A,  ' drop A, ' drop A,
- here G f83search T A, NIL A, NIL A, NIL A,
+ here f83search A, NIL A, NIL A, NIL A,
  AValue forth-wordlist \ variable, will be redefined by search.fs
  AVariable lookup        forth-wordlist lookup !
- Line 255
+ Line 306
  Line 255
  Line 306
  ' 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
  \ The constants are defined as 32 bits, but then erased
  \ and overwritten by the right ones
+ has? f83headerstring [IF]
+     \ to save space, Gforth EC limits words to 31 characters
+     \ also, there's no predule concept in Gforth EC
+     $80 constant alias-mask
+     $40 constant immediate-mask
+     $20 constant restrict-mask
+     $1f constant lcount-mask
+ [ELSE]
+ \ 32-bit systems cannot generate large 64-bit constant in the
+ \ cross-compiler, so we kludge it by generating a constant and then
+ \ storing the proper value into it (and that's another kludge).
  $80000000 constant alias-mask
 bits/char 1 - lshift
  -1 cells allot  bigendian [IF]   c, 0 1 cells 1- times
- Line 272
+ Line 355
  Line 272
  Line 355
 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
+ $10000000 constant prelude-mask
-bits/char 3 - lshift 1 -
+bits/char 4 - lshift
+ -1 cells allot  bigendian [IF]   c, 0 1 cells 1- times
+                           [ELSE] 0 1 cells 1- times c, [THEN]
+ $0fffffff constant lcount-mask
+bits/char 4 - 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 299
+ Line 387
  Line 299
  Line 387
  : (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 ;
- : name>string ( nt -- addr count ) \ gforth     head-to-string
+ has? f83headerstring [IF]
+ : name>string ( nt -- addr count ) \ gforth     name-to-string
+     \g @i{addr count} is the name of the word represented by @i{nt}.
+     cell+ count 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+ c@ dup alias-mask and 0=
+     IF
+         swap @ swap
+     THEN ;
+ [ELSE]
+ : name>string ( nt -- addr count ) \ gforth     name-to-string
      \g @i{addr count} is the name of the word represented by @i{nt}.
      cell+ dup cell+ swap @ lcount-mask and ;
- Line 320
+ Line 424
  Line 320
  Line 424
      IF
          swap @ swap
      THEN ;
+ [THEN]
- : name>int ( nt -- xt ) \ gforth
+ : name>int ( nt -- xt ) \ gforth name-to-int
      \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{ticking-compile-only-error}, which performs @code{-2048 throw}.
      (name>x) (x>int) ;
- : name?int ( nt -- xt ) \ gforth
+ : name?int ( nt -- xt ) \ gforth name-question-int
      \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
          ticking-compile-only-error \ does not return
      then
- Line 346
+ Line 451
  Line 346
  Line 451
          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) ( w xt )
-     swap immediate-mask and flag-sign ;
+     swap immediate-mask and [ has? rom [IF] ] 0= [ [THEN] ] flag-sign ;
+ [IFDEF] prelude-mask
+ : name>prelude ( nt -- xt )
+     dup cell+ @ prelude-mask and if
+         [ -1 cells ] literal + @
+     else
+         drop ['] noop
+     then ;
+ [THEN]
  const Create ???  0 , 3 , char ? c, char ? c, char ? c,
  \ ??? is used by dovar:, must be created/:dovar
- Line 388
+ Line 502
  Line 388
  Line 502
  : >head-noprim ( cfa -- nt ) \ gforth  to-head-noprim
      \ also heuristic
-     dup forthstart - max-name-length @ float+ cell+ min cell max cell ?do ( cfa )
+     dup forthstart - max-name-length @
+     [ has? float [IF] ] float+ [ [ELSE] ] cell+ [ [THEN] ] 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
- Line 422
+ Line 538
  Line 422
  Line 538
  [THEN]
- cell% 2* 0 0 field >body ( xt -- a_addr ) \ core
+ cell% 2* 0 0 field >body ( xt -- a_addr ) \ core to-body
  \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
- Line 445
+ Line 561
  Line 445
  Line 561
          drop 0
      endif ;
- ' ! alias code-address! ( c_addr xt -- ) \ gforth
+ has? prims [IF]
+     : flash! ! ;
+     : flashc! c! ;
+ [THEN]
+ has? flash [IF] ' flash! [ELSE] ' ! [THEN]
+ 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>}.
-     dodoes: over ! cell+ ! ;
+     [ has? flash [IF] ]
+     dodoes: over flash! cell+ flash!
+     [ [ELSE] ]
+     dodoes: over ! cell+ !
+     [ [THEN] ] ;
  ' drop alias does-handler! ( a_addr -- ) \ gforth
  \G Create a @code{DOES>}-handler at address @i{a-addr}. Normally,
- Line 462
+ Line 588
  Line 462
  Line 588
  [THEN]
- : (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) ;
  : sfind ( c-addr u -- 0 / xt +-1  ) \ gforth-obsolete
      find-name dup
      if ( nt )
- Line 518
+ Line 624
  Line 518
  Line 624
  \ ticks in interpreter
  : (') ( "name" -- nt ) \ gforth
-     name name-too-short?
+     parse-name name-too-short?
      find-name dup 0=
      IF
          drop -&13 throw
- Line 541
+ Line 647
  Line 541
  Line 647
  \ interpret                                            10mar92py
- Defer parser ( c-addr u -- )
+ Defer parser1 ( c-addr u -- ... xt)
- Defer parse-word ( "name" -- c-addr u ) \ 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 parse-word
+ ' (name) IS parse-name
+ ' parse-name alias parse-word ( -- c-addr u ) \ gforth-obsolete
+ \G old name for @code{parse-name}
- ' parse-word alias name ( -- c-addr u ) \ gforth-obsolete
+ ' parse-name alias name ( -- c-addr u ) \ gforth-obsolete
- \G old name for @code{parse-word}
+ \G old name for @code{parse-name}
- Defer compiler-notfound ( c-addr count -- )
+ Defer compiler-notfound1 ( c-addr count -- ... xt )
- Defer interpreter-notfound ( c-addr count -- )
+ 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 ( ... -- ... )
- [ has? backtrace [IF] ]
      rp@ backtrace-rp0 !
- [ [THEN] ]
      BEGIN
-         ?stack name dup
+         ?stack [ has? EC 0= [IF] ] before-word [ [THEN] ] parse-name dup
      WHILE
-         parser
+         parser1 execute
      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 ;
+ [ELSE]
+ : interpret ( ... -- ... )
+     BEGIN
+         ?stack [ has? EC 0= [IF] ] before-word [ [THEN] ] parse-name dup
+     WHILE
+         parser1 execute
+     REPEAT
+drop ;
+ [THEN]
  \ interpreter                                   30apr92py
+ [IFDEF] prelude-mask
+ : run-prelude ( nt|0 -- nt|0 )
+     \ run the prelude of the name identified by nt (if present).  This
+     \ is used in the text interpreter and similar stuff.
+     dup if
+         dup name>prelude execute
+     then ;
+ [THEN]
  \ not the most efficient implementations of interpreter and compiler
- : interpreter ( c-addr u -- )
+ : interpreter1 ( c-addr u -- ... xt )
-dup find-name dup
+dup find-name [ [IFDEF] prelude-mask ] run-prelude [ [THEN] ] 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
- Line 610
+ Line 749
  Line 610
  Line 749
  [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 625
+ Line 765
  Line 625
  Line 765
      \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] ]
- Line 634
+ Line 774
  Line 634
  Line 774
          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 673
+ Line 814
  Line 673
  Line 814
  : 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]
- Line 702
+ Line 843
  Line 702
  Line 843
      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] ]
- Line 718
+ Line 859
  Line 718
  Line 859
  Defer 'quit
+ has? os [IF]
  Defer .status
+ [ELSE]
+     [IFUNDEF] bye
+         : (bye)     ( 0 -- ) \ back to DOS
+             drop 5 emit ;
+         : bye ( -- )  0 (bye) ;
+     [THEN]
+ [THEN]
  : prompt        state @ IF ."  compiled" EXIT THEN ."  ok" ;
  : (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
+         [ has? ec [IF] ] cr [ [ELSE] ]
-         ['] cr catch if
+         .status ['] cr catch if
-             >stderr cr ." Can't print to stdout, leaving" cr
+             [ 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
+         endif [ [THEN] ]
-         query interpret prompt
+         refill  WHILE
-     AGAIN ;
+             interpret prompt
+     REPEAT
+     bye ;
  ' (quit) IS 'quit
  \ \ DOERROR (DOERROR)                                   13jun93jaw
+ has? os [IF]
 Constant max-errors
+has? file 2 and + Constant /error
  Variable error-stack  0 error-stack !
- max-errors has? file [IF] 6 [ELSE] 4 [THEN] * 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> ( -- addr u >in line# [addr u] )
+ : error> ( --  c-addr1 u1 c-addr2 u2 line# [addr u] )
      -1 error-stack +!
      error-stack dup @
-     [ has? file [IF] 6 [ELSE] 4 [THEN] ] Literal * cells + cell+
+     /error * cells + cell+
-     [ has? file [IF] 6 [ELSE] 4 [THEN] ] Literal cells bounds DO
+     /error cells bounds DO
          I @
          cell +LOOP ;
- : >error ( addr u >in line# [addr u] -- )
+ : >error ( c-addr1 u1 c-addr2 u2 line# [addr u] -- )
      error-stack dup @ dup 1+
      max-errors 1- min error-stack !
-     [ has? file [IF] 6 [ELSE] 4 [THEN] ] Literal * cells + cell+
+     /error * cells + cell+
-     [ has? file [IF] 6 [ELSE] 4 [THEN] 1- ] Literal cells bounds swap DO
+     /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 781
+ Line 939
  Line 781
  Line 939
      \ !! not used...
      [char] $ emit base @ swap hex u. base ! ;
- : typewhite ( addr n -- ) \ gforth
- \G Like type, but white space is printed instead of the characters.
-     \ bounds u+do
-max bounds ?do
-         i c@ #tab = if \ check for tab
-             #tab
-         else
-             bl
-         then
-         emit
-     loop ;
  : -trailing  ( c_addr u1 -- c_addr u2 ) \ string dash-trailing
  \G Adjust the string specified by @i{c-addr, u1} to remove all
  \G trailing spaces. @i{u2} is the length of the modified string.
      BEGIN
-- 2dup + c@ bl =
+         dup
      WHILE
-             dup 0=
+- 2dup + c@ bl <>
-         UNTIL
+     UNTIL  1+  THEN ;
-     ELSE
-+
-     THEN ;
  DEFER DOERROR
- Line 818
+ Line 961
  Line 818
  Line 961
    ELSE  .error
    THEN ;
- : .error-frame ( throwcode addr1 u1 n1 n2 [addr2 u2] -- throwcode )
+ : umin ( u1 u2 -- u )
- \ addr2 u2:     filename of included file - optional
+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] )
- [ has? file [IF] ]
+         [ has? file [IF] ] \ !! unbalanced stack effect
-     ." in file included from "
+           over IF
+               cr ." in file included from "
      type ." :"
- [ [THEN] ]
+dec.r  2drop 2drop
-     dec.r  drop 2drop
    ELSE
+drop 2drop 2drop drop
+           THEN
+           [ [THEN] ] ( throwcode addr1 u1 n0 n1 n2 )
+     ELSE ( throwcode addr1 u1 n0 n1 n2 [addr2 u2] )
  [ has? file [IF] ]
-       type ." :"
+             cr type ." :"
- [ [THEN] ]
+             [ [THEN] ] ( throwcode addr1 u1 n0 n1 n2 )
-       dup >r dec.r ." : " 3 pick .error-string
+         dup 0 dec.r ." : " 5 pick .error-string
-       r> IF \ if line# non-zero, there is a line
+         IF \ if line# non-zero, there is a line
-           cr dup 2over type cr drop
+             cr .error-line
-           nip -trailing 1- ( line-start index2 )
->r  BEGIN
-dup + c@ bl >  WHILE
-               r> 1+ >r  1- dup 0<  UNTIL  THEN  1+
-           ( line-start index1 )
-           typewhite
-           r> 1 max 0 ?do \ we want at least one "^", even if the length is 0
-               [char] ^ emit
-           loop
        ELSE
-drop drop
+drop 2drop
        THEN
    THEN ;
- Line 855
+ Line 1017
  Line 855
  Line 1017
    [ has? os [IF] ]
        >stderr
    [ [THEN] ]
-   source >in @ sourceline# [ has? file [IF] ]
+   input-error-data .error-frame
-       sourcefilename
-   [ [THEN] ] .error-frame
    error-stack @ 0 ?DO
      error>
      .error-frame
- Line 870
+ Line 1030
  Line 870
  Line 1030
  ' (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
- Line 880
+ Line 1048
  Line 880
  Line 1048
          [ has? compiler [IF] ]
          [compile] [
          [ [THEN] ]
+         \ stack depths may be arbitrary here
          ['] 'quit CATCH dup
      WHILE
          <# \ reset hold area, or we may get another error
          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] ]
- Line 894
+ Line 1065
  Line 894
  Line 1065
  \ \ Cold Boot                                           13feb93py
- : (bootmessage)
+ : (bootmessage) ( -- )
      ." Gforth " version-string type
-     ." , Copyright (C) 1995-2003 Free Software Foundation, Inc." cr
+     ." , Copyright (C) 1995-2009 Free Software Foundation, Inc." cr
      ." 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? os [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]
- AVariable init8 NIL init8 !
  : cold ( -- ) \ gforth
  [ has? backtrace [IF] ]
- Line 922
+ Line 1099
  Line 922
  Line 1099
  [ has? file [IF] ]
      os-cold
  [ [THEN] ]
+ [ has? os [IF] ]
+     set-encoding-fixed-width
      'cold
-     init8 chainperform
+ [ [THEN] ]
  [ has? file [IF] ]
-     s" *the terminal*" loadfilename 2!
      process-args
      loadline off
  [ [THEN] ]
- Line 940
+ Line 1118
  Line 940
  Line 1118
      [ 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 n **argv argc -- )
+ [ has? no-userspace 0= [IF] ]
      main-task up!
+ [ [THEN] ]
  [ has? os [IF] ]
      os-boot
  [ [THEN] ]
+ [ has? rom [IF] ]
+     ram-shadow dup @ dup -1 <> >r u> r> and IF
+         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
- Line 960
+ Line 1146
  Line 960
  Line 1146
      current-input off
  [ [THEN] ]
      clear-tibstack
+0 includefilename 2!
      rp@ rp0 !
  [ has? floating [IF] ]
      fp@ fp0 !
  [ [THEN] ]
+ [ has? os [IF] ]
      handler off
      ['] 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.101
 


changed lines


 
Added in v.1.173
 Legend:



Removed from v.1.101
 


changed lines


 
Added in v.1.173
-Removed from v.1.101
+Added in v.1.173

CVS Admin

gforth: gforth/kernel/int.fs

Diff for /gforth/kernel/int.fs between version 1.101 and 1.173

ViewCVS and CVS Help