--- gforth/Attic/kernal.fs 1994/06/17 12:35:07 1.8 +++ gforth/Attic/kernal.fs 1994/07/27 13:37:02 1.13 @@ -79,13 +79,13 @@ DOES> ( n -- ) + c@ ; \ name> found 17dec92py : (name>) ( nfa -- cfa ) count $1F and + aligned ; -: name> ( nfa -- cfa ) +: name> ( nfa -- cfa ) cell+ dup (name>) swap c@ $80 and 0= IF @ THEN ; : found ( nfa -- cfa n ) cell+ dup c@ >r (name>) r@ $80 and 0= IF @ THEN -\ -1 r@ $40 and IF 1- THEN - -1 r> $20 and IF negate THEN ; + -1 r@ $40 and IF 1- THEN + r> $20 and IF negate THEN ; \ (find) 17dec92py @@ -142,7 +142,7 @@ Defer source dup count chars bounds ?DO I c@ toupper I c! 1 chars +LOOP ; : (name) ( -- addr ) bl word ; -: (cname) ( -- addr ) bl word capitalize ; +\ : (cname) ( -- addr ) bl word capitalize ; \ Literal 17dec92py @@ -194,15 +194,18 @@ 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 ! ; +: 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 ; : s>d ( n -- d ) dup 0< ; : number ( string -- d ) number? ?dup 0= abort" ?" 0< IF s>d THEN ; @@ -271,13 +274,14 @@ hex r> handler ! rdrop rdrop rdrop 0 ; : throw ( y1 .. ym error/0 -- y1 .. ym / z1 .. zn error ) - ?DUP IF - handler @ rp! - r> handler ! - r> lp! - r> fp! - r> swap >r sp! r> - THEN ; + ?DUP IF + [ here 4 cells ! ] + handler @ rp! + r> handler ! + r> lp! + r> fp! + r> swap >r sp! r> + THEN ; \ Bouncing is very fine, \ programming without wasting time... jaw @@ -302,7 +306,7 @@ Defer parser Defer name ' (name) IS name Defer notfound -: no.extensions ( string -- ) IF &-13 bounce THEN ; +: no.extensions ( string -- ) IF -&13 bounce THEN ; ' no.extensions IS notfound @@ -327,9 +331,6 @@ Defer notfound \ locals stuff needed for control structures -variable locals-size \ this is the current size of the locals stack - \ frame of the current word - : compile-lp+! ( n -- ) dup negate locals-size +! 0 over = if @@ -346,7 +347,7 @@ variable locals-size \ this is the curre here 0 , \ just a dummy, the real value of locals-list is patched into it in glocals.fs AConstant locals-list \ acts like a variable that contains - \ a linear list of locals names + \ a linear list of locals names variable dead-code \ true if normal code at "here" would be dead @@ -387,7 +388,7 @@ variable dead-code \ true if normal code over 0<> while over - cell+ name> >body @ max + name> >body @ max swap @ swap ( get next ) repeat faligned nip ; @@ -590,13 +591,12 @@ variable dead-code \ true if normal code \ we have to store more than just the address of the branch, so the \ traditional linked list approach is no longer viable. \ This is solved by storing the information about the leavings in a -\ special stack. The leavings of different DO-LOOPs are separated -\ by a 0 entry +\ special stack. \ !! remove the fixed size limit. 'Tis not hard. 20 constant leave-stack-size -create leave-stack 60 cells allot -Avariable leave-sp leave-stack leave-sp ! +create leave-stack 60 cells allot +Avariable leave-sp leave-stack 3 cells + leave-sp ! : clear-leave-stack ( -- ) leave-stack leave-sp ! ; @@ -617,67 +617,68 @@ Avariable leave-sp leave-stack leave-sp : leave> ( -- orig ) \ pop from leave-stack leave-sp @ - dup leave-stack <= abort" leave-stack empty" + dup leave-stack <= IF + drop 0 0 0 EXIT THEN cell - dup @ swap cell - dup @ swap cell - dup @ swap leave-sp ! ; -: done ( -- ) +: DONE ( orig -- ) drop >r drop \ !! the original done had ( addr -- ) begin leave> - dup + over r@ u>= while POSTPONE then repeat - 2drop drop ; immediate + >leave rdrop ; immediate restrict : LEAVE ( -- ) POSTPONE ahead - >leave ; immediate + >leave ; immediate restrict : ?LEAVE ( -- ) POSTPONE 0= POSTPONE if - >leave ; immediate + >leave ; immediate restrict : DO ( -- do-sys ) POSTPONE (do) POSTPONE begin drop do-dest - 0 0 0 >leave ; immediate + ( 0 0 0 >leave ) ; immediate restrict : ?DO ( -- do-sys ) - 0 0 0 >leave + ( 0 0 0 >leave ) POSTPONE (?do) >mark >leave - POSTPONE begin drop do-dest ; immediate + POSTPONE begin drop do-dest ; immediate restrict : FOR ( -- do-sys ) POSTPONE (for) POSTPONE begin drop do-dest - 0 0 0 >leave ; immediate + ( 0 0 0 >leave ) ; immediate restrict \ LOOP etc. are just like UNTIL : loop-like ( do-sys xt1 xt2 -- ) - rot do-dest? + >r >r 0 cs-pick swap cell - swap 1 cs-roll r> r> rot do-dest? until-like POSTPONE done POSTPONE unloop ; : LOOP ( do-sys -- ) - ['] (loop) ['] (loop)-lp+!# loop-like ; immediate + ['] (loop) ['] (loop)-lp+!# loop-like ; immediate restrict : +LOOP ( do-sys -- ) - ['] (+loop) ['] (+loop)-lp+!# loop-like ; immediate + ['] (+loop) ['] (+loop)-lp+!# loop-like ; immediate restrict \ A symmetric version of "+LOOP". I.e., "-high -low ?DO -inc S+LOOP" \ will iterate as often as "high low ?DO inc S+LOOP". For positive \ increments it behaves like "+LOOP". Use S+LOOP instead of +LOOP for \ negative increments. : S+LOOP ( do-sys -- ) - ['] (s+loop) ['] (s+loop)-lp+!# loop-like ; immediate + ['] (s+loop) ['] (s+loop)-lp+!# loop-like ; immediate restrict : NEXT ( do-sys -- ) - ['] (next) ['] (next)-lp+!# loop-like ; immediate + ['] (next) ['] (next)-lp+!# loop-like ; immediate restrict \ Structural Conditionals 12dec92py @@ -715,10 +716,12 @@ Avariable leave-sp leave-stack leave-sp \ Header states 23feb93py -: flag! ( 8b -- ) last @ cell+ tuck c@ xor swap c! ; +: flag! ( 8b -- ) + last @ dup 0= abort" last word was headerless" + cell+ tuck c@ xor swap c! ; : immediate $20 flag! ; -\ : restrict $40 flag! ; -' noop alias restrict +: restrict $40 flag! ; +\ ' noop alias restrict \ Header 23feb93py @@ -729,7 +732,9 @@ Avariable leave-sp leave-stack leave-sp defer header : name, ( "name" -- ) - name c@ 1+ chars allot align ; + 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, @@ -754,7 +759,7 @@ create nextname-buffer 32 chars allot \ the next name is given in the string : nextname ( c-addr u -- ) \ general - dup 31 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 ; @@ -777,7 +782,7 @@ create nextname-buffer 32 chars allot : name>string ( nfa -- addr count ) cell+ count $1F and ; -Create ??? ," ???" +Create ??? 0 , 3 c, char ? c, char ? c, char ? c, : >name ( cfa -- nfa ) $21 cell do dup i - count $9F and + aligned over $80 + = if @@ -852,7 +857,7 @@ Create ??? ," ???" state @ IF postpone ALiteral postpone @ ELSE @ THEN ; immediate : Defers ( "name" -- ) ' >body @ compile, ; - immediate restrict + immediate \ : ; 24feb93py @@ -863,7 +868,9 @@ defer ;-hook ( sys2 -- sys1 ) : ; ( colon-sys -- ) ;-hook ?struc postpone exit reveal postpone [ ; immediate restrict -: :noname ( -- xt colon-sys ) here [ :docol ] Literal cfa, 0 ] :-hook ; +: :noname ( -- xt colon-sys ) + 0 last ! + here [ :docol ] Literal cfa, 0 ] :-hook ; \ Search list handling 23feb93py @@ -899,14 +906,9 @@ 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 ! @@ -1001,14 +1003,14 @@ Create crtlkeys DEFER type \ defer type for a output buffer or fast \ screen write -: (type) ( addr len -- ) - bounds ?DO I c@ emit LOOP ; +\ : (type) ( addr len -- ) +\ bounds ?DO I c@ emit LOOP ; ' (TYPE) IS Type -\ DEFER Emit +DEFER Emit -\ ' (Emit) IS Emit +' (Emit) IS Emit \ : form ( -- rows cols ) &24 &80 ; \ form should be implemented using TERMCAPS or CURSES @@ -1020,15 +1022,15 @@ DEFER type \ defer type for a outpu : refill ( -- flag ) tib /line loadfile @ ?dup - IF dup file-position throw linestart 2! + IF \ dup file-position throw linestart 2! read-line throw - ELSE linestart @ IF 2drop false EXIT THEN + ELSE loadline @ 0< IF 2drop false EXIT THEN accept true THEN 1 loadline +! - swap #tib ! >in off ; + swap #tib ! 0 >in ! ; -: Query ( -- ) loadfile off refill drop ; +: Query ( -- ) 0 loadfile ! refill drop ; \ File specifiers 11jun93jaw @@ -1056,20 +1058,29 @@ 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> + ( linestart 2@ >r >r ) loadline @ >r loadfile @ >r + blk @ >r >tib @ >r #tib @ dup >r >tib +! >in @ >r >r ; - >tib +! loadfile ! +: pop-file ( -- ) r> + r> >in ! r> #tib ! r> >tib ! r> blk ! + r> loadfile ! r> loadline ! ( r> r> linestart 2! ) >r ; + +: include-file ( i*x fid -- j*x ) + push-file loadfile ! 0 loadline ! blk off BEGIN refill WHILE interpret REPEAT loadfile @ close-file throw - - r> >in ! r> #tib ! r> >tib ! r> blk ! - r> loadfile ! r> loadline ! r> linestart ! ; + pop-file ; : included ( i*x addr u -- j*x ) - r/o open-file throw include-file ; + loadfilename 2@ >r >r + dup allocate throw over loadfilename 2! + over loadfilename 2@ move + r/o open-file throw include-file + \ don't free filenames; they don't take much space + \ and are used for debugging + r> r> loadfilename 2! ; \ HEX DECIMAL 2may93jaw @@ -1087,11 +1098,14 @@ create nl$ 1 c, A c, 0 c, \ gnu includes \ RECURSE 17may93jaw -: recurse last @ cell+ name> a, ; immediate restrict -\ !! does not work with anonymous words; use lastxt compile, +: recurse ( -- ) + lastxt compile, ; immediate restrict +: recursive ( -- ) + reveal ; immediate \ */MOD */ 17may93jaw +\ !! I think */mod should have the same rounding behaviour as / - anton : */mod >r m* r> sm/rem ; : */ */mod nip ; @@ -1099,16 +1113,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 - - >tib +! dup #tib ! >tib @ swap move - >in off blk off loadfile off -1 linestart ! + push-file dup #tib ! >tib @ swap move + >in off blk off loadfile off -1 loadline ! BEGIN interpret >in @ #tib @ u>= UNTIL - r> >in ! r> #tib ! r> >tib ! r> blk ! - r> loadfile ! r> loadline ! r> linestart ! ; + pop-file ; : abort -1 throw ; @@ -1126,35 +1136,47 @@ Defer .status \ DOERROR (DOERROR) 13jun93jaw +: 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 + 9 + else + bl + then + emit + loop + drop ; + DEFER DOERROR : (DoError) ( throw-code -- ) - LoadFile @ - IF - ." Error in line: " Loadline @ . cr - THEN - cr source type cr - source drop >in @ -trailing - here c@ 1F min dup >r - 1- 0 max nip - dup spaces - IF - ." ^" - THEN - r> 0 ?DO - ." -" - LOOP - ." ^" - dup -2 = - IF - "error @ ?dup - IF - cr count type - THEN - drop - ELSE - .error - THEN - normal-dp dpp ! ; + 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 ! ; ' (DoError) IS DoError @@ -1181,25 +1203,57 @@ Variable env 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 +! ; +0 Value script? ( -- flag ) -: script? ( -- flag ) 0 arg 1 arg dup 3 pick - /string compare 0= ; +: ">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 true to script? included false to script? 1 + ELSE I 1+ arg do-option + THEN + +LOOP ; : cold ( -- ) - argc @ 1 > - IF script? - IF 1 arg ['] included ELSE get-args ['] interpret THEN - catch ?dup IF dup >r DoError cr r> (bye) THEN THEN - ." ANS FORTH-93 (c) 1993 by the ANS FORTH-93 Team" cr quit ; + argc @ 1 > + IF + ['] process-args catch ?dup + IF + dup >r DoError cr r> negate (bye) + THEN + THEN + 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! 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