--- gforth/Attic/kernal.fs 1994/07/27 13:37:02 1.13 +++ gforth/Attic/kernal.fs 1994/09/02 15:23:36 1.18 @@ -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 @@ -489,7 +540,7 @@ 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 -- ) @@ -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 @@ -839,11 +891,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 @@ -911,11 +966,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 ; @@ -936,8 +991,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 @@ -947,14 +1008,16 @@ 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 0D constant #cr \ the newline key code +0C constant #ff 0A constant #lf : bell #bell emit ; @@ -1000,18 +1063,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 +1086,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 +1125,31 @@ 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 ; : included ( i*x addr u -- j*x ) loadfilename 2@ >r >r @@ -1116,9 +1194,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 ; @@ -1136,47 +1214,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