--- gforth/Attic/kernal.fs 1994/07/13 19:21:03 1.11 +++ gforth/Attic/kernal.fs 1994/09/12 19:00:32 1.20 @@ -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 - ; @@ -138,11 +154,13 @@ Defer source \ name 13feb93py -: capitalize ( addr -- addr ) - dup count chars bounds +: capitalize ( addr len -- addr len ) + 2dup chars chars bounds ?DO I c@ toupper I c! 1 chars +LOOP ; -: (name) ( -- addr ) bl word ; -: (cname) ( -- addr ) bl word capitalize ; +: (name) ( -- c-addr count ) + source 2dup >r >r >in @ /string (parse-white) + 2dup + r> - 1+ r> min >in ! ; +\ name count ; \ Literal 17dec92py @@ -157,7 +175,7 @@ Defer source : (compile) ( -- ) r> dup cell+ >r @ A, ; : postpone ( "name" -- ) - name find dup 0= abort" Can't compile " + name sfind dup 0= abort" Can't compile " 0> IF A, ELSE postpone (compile) A, THEN ; immediate restrict @@ -194,15 +212,29 @@ Create bases 10 , 2 , A , 100 , \ !! this saving and restoring base is an abomination! - anton : getbase ( addr u -- addr' u' ) over c@ [char] $ - dup 4 u< IF cells bases + @ base ! 1 /string ELSE drop THEN ; -: number? ( string -- string 0 / n -1 ) base @ >r - dup count over c@ [char] - = dup >r IF 1 /string THEN +: s>number ( addr len -- d ) base @ >r dpl on + over c@ '- = dup >r IF 1 /string THEN getbase dpl on 0 0 2swap BEGIN dup >r >number dup WHILE dup r> - WHILE dup dpl ! over c@ [char] . = WHILE 1 /string - REPEAT THEN 2drop 2drop rdrop false r> base ! EXIT THEN - 2drop rot drop rdrop r> IF dnegate THEN - dpl @ dup 0< IF nip THEN r> base ! ; + REPEAT THEN 2drop rdrop dpl off ELSE + 2drop rdrop r> IF dnegate THEN + THEN r> base ! ; +: snumber? ( c-addr u -- 0 / n -1 / d 0> ) + s>number dpl @ 0= + IF + 2drop false EXIT + THEN + dpl @ dup 0> 0= IF + nip + THEN ; +: number? ( string -- string 0 / n -1 / d 0> ) + dup >r count snumber? dup if + rdrop + else + r> swap + then ; : s>d ( n -- d ) dup 0< ; : number ( string -- d ) number? ?dup 0= abort" ?" 0< IF s>d THEN ; @@ -301,27 +333,64 @@ hex Defer parser Defer name ' (name) IS name -Defer notfound +Defer notfound ( c-addr count -- ) -: no.extensions ( string -- ) IF &-13 bounce THEN ; +: no.extensions ( addr u -- ) 2drop -&13 bounce ; ' no.extensions IS notfound : interpret - BEGIN ?stack name dup c@ WHILE parser REPEAT drop ; + BEGIN + ?stack name dup + WHILE + parser + REPEAT + 2drop ; \ interpreter compiler 30apr92py -: interpreter ( name -- ) find ?dup - IF 1 and IF execute EXIT THEN -&14 throw THEN - number? 0= IF notfound THEN ; +: interpreter ( c-addr u -- ) + \ interpretation semantics for the name/number c-addr u + 2dup sfind dup + IF + 1 and + IF \ not restricted to compile state? + nip nip execute EXIT + THEN + -&14 throw + THEN + drop + 2dup 2>r snumber? + IF + 2rdrop + ELSE + 2r> notfound + THEN ; ' interpreter IS parser -: compiler ( name -- ) find ?dup - IF 0> IF execute EXIT THEN compile, EXIT THEN number? dup - IF 0> IF swap postpone Literal THEN postpone Literal - ELSE drop notfound THEN ; +: compiler ( c-addr u -- ) + \ compilation semantics for the name/number c-addr u + 2dup sfind dup + IF + 0> + IF + nip nip execute EXIT + THEN + compile, 2drop EXIT + THEN + drop + 2dup snumber? dup + IF + 0> + IF + swap postpone Literal + THEN + postpone Literal + 2drop + ELSE + drop notfound + THEN ; : [ ['] interpreter IS parser state off ; immediate : ] ['] compiler IS parser state on ; @@ -331,9 +400,9 @@ Defer notfound : compile-lp+! ( n -- ) dup negate locals-size +! 0 over = if - else -4 over = if postpone -4lp+! - else 8 over = if postpone 8lp+! - else 16 over = if postpone 16lp+! + else -1 cells over = if postpone lp- + else 1 floats over = if postpone lp+ + else 2 floats over = if postpone lp+2 else postpone lp+!# dup , then then then then drop ; @@ -486,23 +555,18 @@ variable dead-code \ true if normal code \ This is the preferred alternative to the idiom "?DUP IF", since it can be \ better handled by tools like stack checkers POSTPONE ?dup POSTPONE if ; immediate restrict -: ?DUP-NOT-IF \ general +: ?DUP-0=-IF \ general POSTPONE ?dup POSTPONE 0= POSTPONE if ; immediate restrict : THEN ( orig -- ) dup orig? - dead-code @ + dead-orig = if - dead-orig = - if - >resolve drop - else - >resolve set-locals-size-list dead-code off - then + >resolve drop else - dead-orig = - if - >resolve drop + dead-code @ + if + >resolve set-locals-size-list dead-code off else \ both live over list-size adjust-locals-size >resolve @@ -702,7 +766,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 @@ -726,12 +791,13 @@ 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) +defer header ' (header) IS header : name, ( "name" -- ) - name c@ - dup $1F u> &-19 and throw ( is name too long? ) - 1+ chars allot align ; + name + dup $1F u> -&19 and throw ( is name too long? ) + dup c, here swap chars dup allot move align ; : input-stream-header ( "name" -- ) \ !! this is f83-implementation-dependent align here last ! -1 A, @@ -739,9 +805,9 @@ defer 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 @@ -756,10 +822,10 @@ create nextname-buffer 32 chars allot \ the next name is given in the string : nextname ( c-addr u -- ) \ general - dup $1F u> &-19 and throw ( is name too long? ) + 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 ! @@ -767,7 +833,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 @@ -836,11 +902,14 @@ Create ??? 0 , 3 c, char ? c, char ? c, \ IS Defer What's Defers TO 24feb93py -: Defer - Create ( -- ) - ['] noop A, - DOES> ( ??? ) - @ execute ; +: Defer ( -- ) + \ !! shouldn't it be initialized with abort or something similar? + Header Reveal [ :dodefer ] Literal cfa, + ['] noop A, ; +\ Create ( -- ) +\ ['] noop A, +\ DOES> ( ??? ) +\ @ execute ; : IS ( addr "name" -- ) ' >body @@ -854,7 +923,7 @@ Create ??? 0 , 3 c, char ? c, char ? c, state @ IF postpone ALiteral postpone @ ELSE @ THEN ; immediate : Defers ( "name" -- ) ' >body @ compile, ; - immediate restrict + immediate \ : ; 24feb93py @@ -903,21 +972,16 @@ AVariable current \ end-struct wordlist-struct : f83find ( addr len wordlist -- nfa / false ) @ (f83find) ; -: f83casefind ( addr len wordlist -- nfa / false ) @ (f83casefind) ; \ Search list table: find reveal -Create f83search ' f83casefind A, ' (reveal) A, ' drop A, - -: caps-name ['] (cname) IS name ['] f83find f83search ! ; -: case-name ['] (name) IS name ['] f83casefind f83search ! ; -: case-sensitive ['] (name) IS name ['] f83find f83search ! ; +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 ; @@ -938,8 +1002,14 @@ Variable warnings G -1 warnings T ! then 2drop 2drop ; -: find ( addr -- cfa +-1 / string false ) dup - count search @ search-wordlist dup IF rot drop THEN ; +: sfind ( c-addr u -- xt n / 0 ) + lookup @ search-wordlist ; + +: find ( addr -- cfa +-1 / string false ) + \ !! not ANS conformant: returns +-2 for restricted words + dup count sfind dup if + rot drop + then ; : reveal ( -- ) last? if @@ -949,14 +1019,16 @@ Variable warnings G -1 warnings T ! : rehash ( wid -- ) dup cell+ @ cell+ cell+ @ execute ; -: ' ( "name" -- addr ) name find 0= no.extensions ; +: ' ( "name" -- addr ) name sfind 0= if -&13 bounce then ; : ['] ( "name" -- addr ) ' postpone ALiteral ; immediate \ Input 13feb93py 07 constant #bell 08 constant #bs +09 constant #tab 7F constant #del 0D constant #cr \ the newline key code +0C constant #ff 0A constant #lf : bell #bell emit ; @@ -1002,18 +1074,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 ; @@ -1022,17 +1097,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 - ELSE linestart @ IF 2drop false EXIT THEN + 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 @@ -1060,26 +1135,65 @@ create nl$ 1 c, A c, 0 c, \ gnu includes \ include-file 07apr93py -: include-file ( i*x fid -- j*x ) - linestart @ >r loadline @ >r loadfile @ >r - blk @ >r >tib @ >r #tib @ dup >r >in @ >r +: push-file ( -- ) r> + loadline @ >r loadfile @ >r + blk @ >r >tib @ >r #tib @ dup >r >tib +! >in @ >r >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 ; - >tib +! loadfile ! - 0 loadline ! blk off - BEGIN refill WHILE interpret REPEAT - loadfile @ close-file throw +: read-loop ( i*x -- j*x ) + BEGIN refill WHILE interpret REPEAT ; - r> >in ! r> #tib ! r> >tib ! r> blk ! - r> loadfile ! r> loadline ! r> linestart ! ; +: include-file ( i*x fid -- j*x ) + push-file loadfile ! + 0 loadline ! blk off ['] read-loop catch + loadfile @ close-file swap 2dup or + pop-file drop 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 catch \ don't free filenames; they don't take much space \ and are used for debugging - r> r> loadfilename 2! ; + r> r> loadfilename 2! throw ; \ HEX DECIMAL 2may93jaw @@ -1093,7 +1207,7 @@ create nl$ 1 c, A c, 0 c, \ gnu includes \ INCLUDE 9may93jaw : include ( "file" -- ) - bl word count included ; + name included ; \ RECURSE 17may93jaw @@ -1104,6 +1218,7 @@ create nl$ 1 c, A c, 0 c, \ gnu includes \ */MOD */ 17may93jaw +\ !! I think */mod should have the same rounding behaviour as / - anton : */mod >r m* r> sm/rem ; : */ */mod nip ; @@ -1111,16 +1226,12 @@ create nl$ 1 c, A c, 0 c, \ gnu includes \ EVALUATE 17may93jaw : evaluate ( c-addr len -- ) - linestart @ >r loadline @ >r loadfile @ >r - blk @ >r >tib @ >r #tib @ dup >r >in @ >r + push-file dup #tib ! >tib @ swap move + >in off blk off loadfile off -1 loadline ! - >tib +! dup #tib ! >tib @ swap move - >in off blk off loadfile off -1 linestart ! - - BEGIN interpret >in @ #tib @ u>= UNTIL - - r> >in ! r> #tib ! r> >tib ! r> blk ! - r> loadfile ! r> loadline ! r> linestart ! ; +\ BEGIN interpret >in @ #tib @ u>= UNTIL + ['] interpret catch + pop-file throw ; : abort -1 throw ; @@ -1138,47 +1249,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 1- ( line-start index2 ) + 0 >r BEGIN + 2dup + 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 + 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 @@ -1197,43 +1337,95 @@ 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 -: get-args ( -- ) #tib off - argc @ 1 ?DO I arg 2dup source + swap move - #tib +! drop bl source + c! 1 #tib +! LOOP - >in off #tib @ 0<> #tib +! ; - -: script? ( -- flag ) 0 arg 1 arg dup 3 pick - /string compare 0= ; +0 Value script? ( -- flag ) -: cold ( -- ) - argc @ 1 > - IF script? +: 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 + 2dup s" -e" compare 0= >r + 2dup s" -evaluate" compare 0= r> or + IF 2drop ">tib interpret 2 EXIT THEN + ." Unknown option: " type cr 2drop 1 ; + +: process-args ( -- ) + argc @ 1 + ?DO + I arg over c@ [char] - <> IF - 1 arg ['] included + true to script? included false to script? 1 ELSE - get-args ['] interpret + I 1+ arg do-option THEN - catch ?dup + +LOOP ; + +: cold ( -- ) + pathstring 2@ process-path pathdirs 2! + argc @ 1 > + IF + ['] process-args catch ?dup IF - dup >r DoError cr r> (bye) + dup >r DoError cr r> negate (bye) THEN THEN - cr ." GNU Forth 0.0alpha, Copyright (C) 1994 Free Software Foundation" - cr ." GNU Forth comes with ABSOLUTELY NO WARRANTY; for details type `license'" - cr quit ; + cr + ." GNU Forth 0.0alpha, Copyright (C) 1994 Free Software Foundation, Inc." cr + ." GNU Forth comes with ABSOLUTELY NO WARRANTY; for details type `license'" cr + ." Type `bye' to exit" + quit ; + +: license ( -- ) cr + ." This program is free software; you can redistribute it and/or modify" cr + ." it under the terms of the GNU General Public License as published by" cr + ." the Free Software Foundation; either version 2 of the License, or" cr + ." (at your option) any later version." cr cr + + ." This program is distributed in the hope that it will be useful," cr + ." but WITHOUT ANY WARRANTY; without even the implied warranty of" cr + ." MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the" cr + ." GNU General Public License for more details." cr cr + + ." You should have received a copy of the GNU General Public License" cr + ." 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 cr 0 (bye) ; +: bye script? 0= IF cr THEN 0 (bye) ; \ **argv may be scanned by the C starter to get some important \ information, as -display and -geometry for an X client FORTH