--- gforth/Attic/kernal.fs 1994/08/31 16:37:48 1.16 +++ gforth/Attic/kernal.fs 1994/09/05 17:36:20 1.19 @@ -110,12 +110,28 @@ Defer source \ (word) 22feb93py -: scan ( addr1 n1 char -- addr2 n2 ) >r - BEGIN dup WHILE over c@ r@ <> WHILE 1 /string - REPEAT THEN rdrop ; -: skip ( addr1 n1 char -- addr2 n2 ) >r - BEGIN dup WHILE over c@ r@ = WHILE 1 /string - REPEAT THEN rdrop ; +: scan ( addr1 n1 char -- addr2 n2 ) + \ skip all characters not equal to char + >r + BEGIN + dup + WHILE + over c@ r@ <> + WHILE + 1 /string + REPEAT THEN + rdrop ; +: skip ( addr1 n1 char -- addr2 n2 ) + \ skip all characters equal to char + >r + BEGIN + dup + WHILE + over c@ r@ = + WHILE + 1 /string + REPEAT THEN + rdrop ; : (word) ( addr1 n1 char -- addr2 n2 ) dup >r skip 2dup r> scan nip - ; @@ -756,7 +772,8 @@ Avariable leave-sp leave-stack 3 cells : ." state @ IF postpone (.") ," align ELSE [char] " parse type THEN ; immediate : ( [char] ) parse 2drop ; immediate -: \ source >in ! drop ; immediate +: \ blk @ IF >in @ c/l / 1+ c/l * >in ! EXIT THEN + source >in ! drop ; immediate \ error handling 22feb93py \ 'abort thrown out! 11may93jaw @@ -780,14 +797,12 @@ Avariable leave-sp leave-stack 3 cells \ information through global variables), but they are useful for dealing \ with existing/independent defining words -defer (header) -defer header ' (header) IS header +defer header : name, ( "name" -- ) name c@ dup $1F u> -&19 and throw ( is name too long? ) 1+ chars allot align ; - : input-stream-header ( "name" -- ) \ !! this is f83-implementation-dependent align here last ! -1 A, @@ -795,9 +810,9 @@ defer header ' (header) IS header : input-stream ( -- ) \ general \ switches back to getting the name from the input stream ; - ['] input-stream-header IS (header) ; + ['] input-stream-header IS header ; -' input-stream-header IS (header) +' input-stream-header IS header \ !! make that a 2variable create nextname-buffer 32 chars allot @@ -815,7 +830,7 @@ create nextname-buffer 32 chars allot dup $1F u> -&19 and throw ( is name too long? ) nextname-buffer c! ( c-addr ) nextname-buffer count move - ['] nextname-header IS (header) ; + ['] nextname-header IS header ; : noname-header ( -- ) 0 last ! @@ -823,7 +838,7 @@ create nextname-buffer 32 chars allot : noname ( -- ) \ general \ the next defined word remains anonymous. The xt of that word is given by lastxt - ['] noname-header IS (header) ; + ['] noname-header IS header ; : lastxt ( -- xt ) \ general \ xt is the execution token of the last word defined. The main purpose of this word is to get the xt of words defined using noname @@ -967,11 +982,11 @@ AVariable current Create f83search ' f83find A, ' (reveal) A, ' drop A, Create forth-wordlist NIL A, G f83search T A, NIL A, NIL A, -AVariable search G forth-wordlist search T ! +AVariable lookup G forth-wordlist lookup T ! G forth-wordlist current T ! : (search-wordlist) ( addr count wid -- nfa / false ) - dup ( @ swap ) cell+ @ @ execute ; + dup cell+ @ @ execute ; : search-wordlist ( addr count wid -- 0 / xt +-1 ) (search-wordlist) dup IF found THEN ; @@ -993,7 +1008,7 @@ Variable warnings G -1 warnings T ! 2drop 2drop ; : sfind ( c-addr u -- xt n / 0 ) - search @ search-wordlist ; + lookup @ search-wordlist ; : find ( addr -- cfa +-1 / string false ) \ !! not ANS conformant: returns +-2 for restricted words @@ -1018,8 +1033,8 @@ Variable warnings G -1 warnings T ! 09 constant #tab 7F constant #del 0D constant #cr \ the newline key code -0A constant #lf 0C constant #ff +0A constant #lf : bell #bell emit ; @@ -1064,18 +1079,21 @@ Create crtlkeys \ Output 13feb93py -DEFER type \ defer type for a output buffer or fast +Defer type \ defer type for a output buffer or fast \ screen write \ : (type) ( addr len -- ) \ bounds ?DO I c@ emit LOOP ; -' (TYPE) IS Type +' (type) IS Type -DEFER Emit +Defer emit ' (Emit) IS Emit +Defer key +' (key) IS key + \ : form ( -- rows cols ) &24 &80 ; \ form should be implemented using TERMCAPS or CURSES \ : rows form drop ; @@ -1084,17 +1102,17 @@ DEFER Emit \ Query 07apr93py : refill ( -- flag ) + blk @ IF 1 blk +! true EXIT THEN tib /line loadfile @ ?dup - IF \ dup file-position throw linestart 2! - read-line throw + IF read-line throw ELSE loadline @ 0< IF 2drop false EXIT THEN accept true THEN 1 loadline +! swap #tib ! 0 >in ! ; -: Query ( -- ) 0 loadfile ! refill drop ; +: Query ( -- ) loadfile off blk off refill drop ; \ File specifiers 11jun93jaw @@ -1123,25 +1141,61 @@ create nl$ 1 c, A c, 0 c, \ gnu includes \ include-file 07apr93py : push-file ( -- ) r> - ( linestart 2@ >r >r ) loadline @ >r loadfile @ >r + loadline @ >r loadfile @ >r blk @ >r >tib @ >r #tib @ dup >r >tib +! >in @ >r >r ; -: pop-file ( -- ) r> - r> >in ! r> #tib ! r> >tib ! r> blk ! - r> loadfile ! r> loadline ! ( r> r> linestart 2! ) >r ; +: pop-file ( throw-code -- throw-code ) + dup IF + source >in @ loadline @ loadfilename 2@ + error-stack dup @ dup 1+ + max-errors 1- min error-stack ! + 6 * cells + cell+ + 5 cells bounds swap DO + I ! + -1 cells +LOOP + THEN + r> + r> >in ! r> #tib ! r> >tib ! r> blk ! + r> loadfile ! r> loadline ! >r ; + +: read-loop ( i*x -- j*x ) + BEGIN refill WHILE interpret REPEAT ; : include-file ( i*x fid -- j*x ) push-file loadfile ! - 0 loadline ! blk off - BEGIN refill WHILE interpret REPEAT - loadfile @ close-file throw - pop-file ; + 0 loadline ! blk off ['] read-loop catch + loadfile @ close-file swap + pop-file throw throw ; + +create pathfilenamebuf 256 chars allot \ !! make this grow on demand + +: open-path-file ( c-addr1 u1 -- file-id c-addr2 u2 ) + \ opens a file for reading, searching in the path for it; c-addr2 + \ u2 is the full filename (valid until the next call); if the file + \ is not found (or in case of other errors for each try), -38 + \ (non-existant file) is thrown. Opening for other access modes + \ makes little sense, as the path will usually contain dirs that + \ are only readable for the user + \ !! check for "/", "./", "../" in original filename; check for "~/"? + pathdirs 2@ 0 + ?DO ( c-addr1 u1 dirnamep ) + dup >r 2@ dup >r pathfilenamebuf swap cmove ( addr u ) + 2dup pathfilenamebuf r@ chars + swap cmove ( addr u ) + pathfilenamebuf over r> + dup >r r/o open-file 0= + if ( addr u file-id ) + nip nip r> rdrop 0 leave + then + rdrop drop r> cell+ cell+ + LOOP + 0<> -&38 and throw ( file-id u2 ) + pathfilenamebuf swap ; : included ( i*x addr u -- j*x ) loadfilename 2@ >r >r - dup allocate throw over loadfilename 2! - over loadfilename 2@ move - r/o open-file throw include-file + open-path-file ( file-id c-addr2 u2 ) + dup allocate throw over loadfilename 2! ( file-id c-addr2 u2 ) + drop loadfilename 2@ move + include-file \ don't free filenames; they don't take much space \ and are used for debugging r> r> loadfilename 2! ; @@ -1180,9 +1234,9 @@ create nl$ 1 c, A c, 0 c, \ gnu includes push-file dup #tib ! >tib @ swap move >in off blk off loadfile off -1 loadline ! - BEGIN interpret >in @ #tib @ u>= UNTIL - - pop-file ; +\ BEGIN interpret >in @ #tib @ u>= UNTIL + ['] interpret catch + pop-file throw ; : abort -1 throw ; @@ -1200,47 +1254,76 @@ Defer .status \ DOERROR (DOERROR) 13jun93jaw +8 Constant max-errors +Variable error-stack 0 error-stack ! +max-errors 6 * cells allot +\ format of one cell: +\ source ( addr u ) +\ >in +\ line-number +\ Loadfilename ( addr u ) + : dec. ( n -- ) \ print value in decimal representation base @ decimal swap . base ! ; : typewhite ( addr u -- ) \ like type, but white space is printed instead of the characters - 0 ?do - dup i + c@ 9 = if \ check for tab + bounds ?do + i c@ 9 = if \ check for tab 9 else bl then emit loop - drop ; +; DEFER DOERROR +: .error-frame ( addr1 u1 n1 n2 addr2 u2 -- ) + cr error-stack @ + IF + ." in file included from " + type ." :" dec. drop 2drop + ELSE + type ." :" dec. + cr dup 2over type cr drop + nip -trailing ( line-start index2 ) + 0 >r BEGIN + 1- 2dup + c@ bl > WHILE + r> 1+ >r 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 + THEN +; + : (DoError) ( throw-code -- ) - LoadFile @ - IF - cr loadfilename 2@ type ." :" Loadline @ dec. - THEN - cr source type cr - source drop >in @ -trailing ( throw-code line-start index2 ) - here c@ 1F min dup >r - 0 max ( throw-code line-start index1 ) - typewhite - r> 1 max 0 ?do \ we want at least one "^", even if the length is 0 - ." ^" - loop - dup -2 = - IF - "error @ ?dup - IF - cr count type - THEN - drop - ELSE - .error - THEN - normal-dp dpp ! ; + loadline @ IF + source >in @ loadline @ 0 0 .error-frame + THEN + error-stack @ 0 ?DO + -1 error-stack +! + error-stack dup @ 6 * cells + cell+ + 6 cells bounds DO + I @ + cell +LOOP + .error-frame + LOOP + dup -2 = + IF + "error @ ?dup + IF + cr count type + THEN + drop + ELSE + .error + THEN + normal-dp dpp ! ; ' (DoError) IS DoError @@ -1259,16 +1342,41 @@ DEFER DOERROR \ : words listwords @ \ BEGIN @ dup WHILE dup .name REPEAT drop ; -: >len ( cstring -- addr n ) 100 0 scan 0 swap 100 - /string ; -: arg ( n -- addr count ) cells argv @ + @ >len ; +: cstring>sstring ( cstring -- addr n ) -1 0 scan 0 swap 1+ /string ; +: arg ( n -- addr count ) cells argv @ + @ cstring>sstring ; : #! postpone \ ; immediate -Variable env +Create pathstring 2 cells allot \ string +Create pathdirs 2 cells allot \ dir string array, pointer and count Variable argv Variable argc 0 Value script? ( -- flag ) +: process-path ( addr1 u1 -- addr2 u2 ) + \ addr1 u1 is a path string, addr2 u2 is an array of dir strings + here >r + BEGIN + over >r [char] : scan + over r> tuck - ( rest-str this-str ) + dup + IF + 2dup 1- chars + c@ [char] / <> + IF + 2dup chars + [char] / swap c! + 1+ + THEN + 2, + ELSE + 2drop + THEN + dup + WHILE + 1 /string + REPEAT + 2drop + here r> tuck - 2 cells / ; + : ">tib ( addr len -- ) dup #tib ! >in off tib swap move ; : do-option ( addr1 len1 addr2 len2 -- n ) 2swap @@ -1277,14 +1385,19 @@ Variable argc IF 2drop ">tib interpret 2 EXIT THEN ." Unknown option: " type cr 2drop 1 ; -: process-args ( -- ) argc @ 1 - ?DO I arg over c@ [char] - <> - IF true to script? included false to script? 1 - ELSE I 1+ arg do-option - THEN - +LOOP ; +: process-args ( -- ) + argc @ 1 + ?DO + I arg over c@ [char] - <> + IF + true to script? included false to script? 1 + ELSE + I 1+ arg do-option + THEN + +LOOP ; -: cold ( -- ) +: cold ( -- ) + pathstring 2@ process-path pathdirs 2! argc @ 1 > IF ['] process-args catch ?dup @@ -1313,8 +1426,8 @@ Variable argc ." along with this program; if not, write to the Free Software" cr ." Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." cr ; -: boot ( **env **argv argc -- ) - argc ! argv ! env ! main-task up! +: boot ( path **argv argc -- ) + argc ! argv ! cstring>sstring pathstring 2! main-task up! sp@ dup s0 ! $10 + >tib ! rp@ r0 ! fp@ f0 ! cold ; : bye script? 0= IF cr THEN 0 (bye) ;