--- gforth/Attic/kernal.fs 1994/08/19 17:47:23 1.14 +++ gforth/Attic/kernal.fs 1994/08/31 19:42:48 1.17 @@ -142,7 +142,10 @@ Defer source dup count chars bounds ?DO I c@ toupper I c! 1 chars +LOOP ; : (name) ( -- addr ) bl word ; -\ : (cname) ( -- addr ) bl word capitalize ; +: sname ( -- c-addr count ) + source 2dup >r >r >in @ /string (parse-white) + 2dup + r> - 1+ r> min >in ! ; +\ name count ; \ Literal 17dec92py @@ -203,9 +206,20 @@ Create bases 10 , 2 , A , 100 , 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 count s>number dpl @ 0= IF 2drop false EXIT THEN - rot drop dpl @ dup 0> 0= IF nip THEN ; + 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 ; @@ -304,30 +318,67 @@ 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 ; - -\ interpreter compiler 30apr92py - -: interpreter ( name -- ) find ?dup - IF 1 and IF execute EXIT THEN -&14 throw THEN - number? 0= IF notfound THEN ; + BEGIN + ?stack sname dup + WHILE + parser + REPEAT + 2drop ; + +\ sinterpreter scompiler 30apr92py + +: sinterpreter ( 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 +' sinterpreter 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 ; +: scompiler ( 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 ; +: [ ['] sinterpreter IS parser state off ; immediate +: ] ['] scompiler IS parser state on ; \ locals stuff needed for control structures @@ -705,7 +756,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 @@ -729,7 +781,8 @@ 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@ @@ -742,9 +795,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 @@ -762,7 +815,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 ! @@ -770,7 +823,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 @@ -839,11 +892,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 @@ -936,8 +992,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 ) + search @ 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 @@ -947,13 +1009,15 @@ Variable warnings G -1 warnings T ! : rehash ( wid -- ) dup cell+ @ cell+ cell+ @ execute ; -: ' ( "name" -- addr ) name find 0= no.extensions ; +: ' ( "name" -- addr ) name find 0= if drop -&13 bounce then ; : ['] ( "name" -- addr ) ' postpone ALiteral ; immediate \ Input 13feb93py 07 constant #bell 08 constant #bs +09 constant #tab 7F constant #del +0C constant #ff 0D constant #cr \ the newline key code 0A constant #lf @@ -1000,18 +1064,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 ; @@ -1020,17 +1087,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 @@ -1059,19 +1126,21 @@ 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 ; + 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 + pop-file throw throw ; : included ( i*x addr u -- j*x ) loadfilename 2@ >r >r @@ -1116,9 +1185,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 ;