--- gforth/Attic/kernal.fs 1995/04/30 23:18:23 1.36 +++ gforth/Attic/kernal.fs 1996/07/16 20:57:11 1.60 @@ -1,7 +1,24 @@ -\ KERNAL.FS GNU FORTH kernal 17dec92py -\ $ID: +\ KERNAL.FS GForth kernal 17dec92py + +\ Copyright (C) 1995 Free Software Foundation, Inc. + +\ This file is part of Gforth. + +\ Gforth is free software; you can redistribute it and/or +\ modify it under the terms of the GNU General Public License +\ as published by the Free Software Foundation; either version 2 +\ of the License, or (at your option) any later version. + +\ This program is distributed in the hope that it will be useful, +\ but WITHOUT ANY WARRANTY; without even the implied warranty of +\ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +\ GNU General Public License for more details. + +\ You should have received a copy of the GNU General Public License +\ along with this program; if not, write to the Free Software +\ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + \ Idea and implementation: Bernd Paysan (py) -\ Copyright 1992 by the ANSI figForth Development Group \ Log: ', '- usw. durch [char] ... ersetzt \ man sollte die unterschiedlichen zahlensysteme @@ -31,97 +48,154 @@ HEX +\ labels for some code addresses + +: docon: ( -- addr ) \ gforth + \ the code address of a @code{CONSTANT} + ['] bl >code-address ; + +: docol: ( -- addr ) \ gforth + \ the code address of a colon definition + ['] docon: >code-address ; + +: dovar: ( -- addr ) \ gforth + \ the code address of a @code{CREATE}d word + ['] udp >code-address ; + +: douser: ( -- addr ) \ gforth + \ the code address of a @code{USER} variable + ['] s0 >code-address ; + +: dodefer: ( -- addr ) \ gforth + \ the code address of a @code{defer}ed word + ['] source >code-address ; + +: dofield: ( -- addr ) \ gforth + \ the code address of a @code{field} + ['] reveal-method >code-address ; + +NIL AConstant NIL \ gforth + \ Bit string manipulation 06oct92py -Create bits 80 c, 40 c, 20 c, 10 c, 8 c, 4 c, 2 c, 1 c, -DOES> ( n -- ) + c@ ; +\ Create bits 80 c, 40 c, 20 c, 10 c, 8 c, 4 c, 2 c, 1 c, +\ DOES> ( n -- ) + c@ ; -: >bit ( addr n -- c-addr mask ) 8 /mod rot + swap bits ; -: +bit ( addr n -- ) >bit over c@ or swap c! ; +\ : >bit ( addr n -- c-addr mask ) 8 /mod rot + swap bits ; +\ : +bit ( addr n -- ) >bit over c@ or swap c! ; -: relinfo ( -- addr ) forthstart dup @ + ; -: >rel ( addr -- n ) forthstart - ; -: relon ( addr -- ) relinfo swap >rel cell / +bit ; +\ : relinfo ( -- addr ) forthstart dup @ + !!bug!! ; +\ : >rel ( addr -- n ) forthstart - ; +\ : relon ( addr -- ) relinfo swap >rel cell / +bit ; \ here allot , c, A, 17dec92py -: dp ( -- addr ) dpp @ ; -: here ( -- here ) dp @ ; -: allot ( n -- ) dp +! ; -: c, ( c -- ) here 1 chars allot c! ; -: , ( x -- ) here cell allot ! ; -: 2, ( w1 w2 -- ) \ general +: dp ( -- addr ) \ gforth + dpp @ ; +: here ( -- here ) \ core + dp @ ; +: allot ( n -- ) \ core + dp +! ; +: c, ( c -- ) \ core + here 1 chars allot c! ; +: , ( x -- ) \ core + here cell allot ! ; +: 2, ( w1 w2 -- ) \ gforth here 2 cells allot 2! ; -: aligned ( addr -- addr' ) - [ cell 1- ] Literal + [ -1 cells ] Literal and ; -: align ( -- ) here dup aligned swap ?DO bl c, LOOP ; - -: faligned ( addr -- f-addr ) - [ 1 floats 1- ] Literal + [ -1 floats ] Literal and ; - -: falign ( -- ) - here dup faligned swap - ?DO - bl c, - LOOP ; +\ : aligned ( addr -- addr' ) \ core +\ [ cell 1- ] Literal + [ -1 cells ] Literal and ; +: align ( -- ) \ core + here dup aligned swap ?DO bl c, LOOP ; + +\ : faligned ( addr -- f-addr ) \ float +\ [ 1 floats 1- ] Literal + [ -1 floats ] Literal and ; + +: falign ( -- ) \ float + here dup faligned swap + ?DO + bl c, + LOOP ; \ !! this is machine-dependent, but works on all but the strangest machines -' faligned Alias maxaligned -' falign Alias maxalign +' faligned Alias maxaligned ( addr1 -- addr2 ) \ gforth +' falign Alias maxalign ( -- ) \ gforth -\ the code field is aligned if its body is maxaligned \ !! machine-dependent and won't work if "0 >body" <> "0 >body maxaligned" -' maxaligned Alias cfaligned -' maxalign Alias cfalign +' maxaligned Alias cfaligned ( addr1 -- addr2 ) \ gforth +\ the code field is aligned if its body is maxaligned +' maxalign Alias cfalign ( -- ) \ gforth + +: chars ( n1 -- n2 ) \ core +; immediate + -: chars ; immediate +\ : A! ( addr1 addr2 -- ) \ gforth +\ dup relon ! ; +\ : A, ( addr -- ) \ gforth +\ here cell allot A! ; +' ! alias A! ( addr1 addr2 -- ) \ gforth +' , alias A, ( addr -- ) \ gforth -: A! ( addr1 addr2 -- ) dup relon ! ; -: A, ( addr -- ) here cell allot A! ; \ on off 23feb93py -: on ( addr -- ) true swap ! ; -: off ( addr -- ) false swap ! ; +: on ( addr -- ) \ gforth + true swap ! ; +: off ( addr -- ) \ gforth + false swap ! ; + +\ dabs roll 17may93jaw + +: dabs ( d1 -- d2 ) \ double + dup 0< IF dnegate THEN ; + +: roll ( x0 x1 .. xn n -- x1 .. xn x0 ) \ core-ext + dup 1+ pick >r + cells sp@ cell+ dup cell+ rot move drop r> ; \ name> found 17dec92py -: (name>) ( nfa -- cfa ) - count $1F and + cfaligned ; -: name> ( nfa -- cfa ) +$80 constant alias-mask \ set when the word is not an alias! +$40 constant immediate-mask +$20 constant restrict-mask + +: (name>) ( nfa+cell -- cfa ) + 1 cells - name>string + cfaligned ; +: name> ( nfa -- cfa ) \ gforth 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 - r> $20 and IF negate THEN ; + dup (name>) swap c@ alias-mask and 0= IF @ THEN ; \ (find) 17dec92py \ : (find) ( addr count nfa1 -- nfa2 / false ) \ BEGIN dup WHILE dup >r -\ cell+ count $1F and dup >r 2over r> = +\ name>string dup >r 2over r> = \ IF -text 0= IF 2drop r> EXIT THEN \ ELSE 2drop drop THEN r> @ \ REPEAT nip nip ; \ place bounds 13feb93py -: place ( addr len to -- ) over >r rot over 1+ r> move c! ; -: bounds ( beg count -- end beg ) over + swap ; +: place ( addr len to -- ) \ gforth + over >r rot over 1+ r> move c! ; +: bounds ( beg count -- end beg ) \ gforth + over + swap ; \ input stream primitives 23feb93py -: tib >tib @ ; -Defer source -: (source) ( -- addr count ) tib #tib @ ; +: tib ( -- c-addr ) \ core-ext + \ obsolescent + >tib @ ; +Defer source ( -- addr count ) \ core +\ used by dodefer:, must be defer +: (source) ( -- addr count ) + tib #tib @ ; ' (source) IS source \ (word) 22feb93py -: scan ( addr1 n1 char -- addr2 n2 ) +: scan ( addr1 n1 char -- addr2 n2 ) \ gforth \ skip all characters not equal to char >r BEGIN @@ -132,7 +206,7 @@ Defer source 1 /string REPEAT THEN rdrop ; -: skip ( addr1 n1 char -- addr2 n2 ) +: skip ( addr1 n1 char -- addr2 n2 ) \ gforth \ skip all characters equal to char >r BEGIN @@ -152,20 +226,20 @@ Defer source \ word parse 23feb93py -: parse-word ( char -- addr len ) +: parse-word ( char -- addr len ) \ gforth source 2dup >r >r >in @ over min /string rot dup bl = IF drop (parse-white) ELSE (word) THEN 2dup + r> - 1+ r> min >in ! ; -: word ( char -- addr ) +: word ( char -- addr ) \ core parse-word here place bl here count + c! here ; -: parse ( char -- addr len ) +: parse ( char -- addr len ) \ core-ext >r source >in @ over min /string over swap r> scan >r over - dup r> IF 1+ THEN >in +! ; \ name 13feb93py -: capitalize ( addr len -- addr len ) +: capitalize ( addr len -- addr len ) \ gforth 2dup chars chars bounds ?DO I c@ toupper I c! 1 chars +LOOP ; : (name) ( -- c-addr count ) @@ -181,26 +255,31 @@ Defer source \ Literal 17dec92py -: Literal ( n -- ) state @ IF postpone lit , THEN ; - immediate -: ALiteral ( n -- ) state @ IF postpone lit A, THEN ; - immediate - -: char ( 'char' -- n ) bl word char+ c@ ; -: [char] ( 'char' -- n ) char postpone Literal ; immediate -' [char] Alias Ascii immediate - -: (compile) ( -- ) r> dup cell+ >r @ compile, ; -: postpone ( "name" -- ) +: Literal ( compilation n -- ; run-time -- n ) \ core + postpone lit , ; immediate restrict +: ALiteral ( compilation addr -- ; run-time -- addr ) \ gforth + postpone lit A, ; immediate restrict + +: char ( 'char' -- n ) \ core + bl word char+ c@ ; +: [char] ( compilation 'char' -- ; run-time -- n ) + char postpone Literal ; immediate restrict + +: (compile) ( -- ) \ gforth + r> dup cell+ >r @ compile, ; +: postpone ( "name" -- ) \ core name sfind dup 0= abort" Can't compile " - 0> IF compile, ELSE postpone (compile) A, THEN ; - immediate restrict + 0> IF compile, ELSE postpone (compile) A, THEN ; immediate restrict + +: special: ( interp comp "name" -- ) + Create immediate swap A, A, + DOES> state @ IF cell+ THEN perform ; \ Use (compile) for the old behavior of compile! \ digit? 17dec92py -: digit? ( char -- digit true/ false ) +: digit? ( char -- digit true/ false ) \ gforth base @ $100 = IF true EXIT @@ -218,26 +297,57 @@ Defer source : accumulate ( +d0 addr digit - +d1 addr ) swap >r swap base @ um* drop rot base @ um* d+ r> ; -: >number ( d addr count -- d addr count ) - 0 ?DO count digit? WHILE accumulate LOOP 0 - ELSE 1- I' I - UNLOOP THEN ; + +: >number ( d addr count -- d addr count ) \ core + 0 + ?DO + count digit? + WHILE + accumulate + LOOP + 0 + ELSE + 1- I' I - + UNLOOP + THEN ; \ number? number 23feb93py Create bases 10 , 2 , A , 100 , \ 16 2 10 Zeichen \ !! 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 ; -: 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 rdrop dpl off ELSE - 2drop rdrop r> IF dnegate THEN - THEN r> base ! ; +: getbase ( addr u -- addr' u' ) + over c@ [char] $ - dup 4 u< + IF + cells bases + @ base ! 1 /string + ELSE + drop + 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 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 @@ -252,57 +362,86 @@ Create bases 10 , 2 , A , 100 , else r> swap then ; -: s>d ( n -- d ) dup 0< ; +: s>d ( n -- d ) \ core s-to-d + dup 0< ; : number ( string -- d ) - number? ?dup 0= abort" ?" 0< IF s>d THEN ; + number? ?dup 0= abort" ?" 0< + IF + s>d + THEN ; \ space spaces ud/mod 21mar93py decimal -Create spaces bl 80 times \ times from target compiler! 11may93jaw -DOES> ( u -- ) swap - 0 max 0 ?DO I' I - &80 min 2dup type +LOOP drop ; -Create backspaces 08 80 times \ times from target compiler! 11may93jaw -DOES> ( u -- ) swap - 0 max 0 ?DO I' I - &80 min 2dup type +LOOP drop ; +Create spaces ( u -- ) \ core +bl 80 times \ times from target compiler! 11may93jaw +DOES> ( u -- ) + swap + 0 max 0 ?DO I' I - &80 min 2dup type +LOOP drop ; +Create backspaces +08 80 times \ times from target compiler! 11may93jaw +DOES> ( u -- ) + swap + 0 max 0 ?DO I' I - &80 min 2dup type +LOOP drop ; hex -: space 1 spaces ; +: space ( -- ) \ core + 1 spaces ; -: ud/mod ( ud1 u2 -- urem udquot ) >r 0 r@ um/mod r> swap >r - um/mod r> ; +: ud/mod ( ud1 u2 -- urem udquot ) \ gforth + >r 0 r@ um/mod r> swap >r + um/mod r> ; -: pad ( -- addr ) +: pad ( -- addr ) \ core-ext here [ $20 8 2* cells + 2 + cell+ ] Literal + aligned ; \ hold <# #> sign # #s 25jan92py -: hold ( char -- ) pad cell - -1 chars over +! @ c! ; +: hold ( char -- ) \ core + pad cell - -1 chars over +! @ c! ; -: <# pad cell - dup ! ; +: <# ( -- ) \ core less-number-sign + pad cell - dup ! ; -: #> ( 64b -- addr +n ) 2drop pad cell - dup @ tuck - ; +: #> ( xd -- addr u ) \ core number-sign-greater + 2drop pad cell - dup @ tuck - ; -: sign ( n -- ) 0< IF [char] - hold THEN ; +: sign ( n -- ) \ core + 0< IF [char] - hold THEN ; -: # ( +d1 -- +d2 ) base @ 2 max ud/mod rot 9 over < - IF [ char A char 9 - 1- ] Literal + THEN [char] 0 + hold ; +: # ( ud1 -- ud2 ) \ core number-sign + base @ 2 max ud/mod rot 9 over < + IF + [ char A char 9 - 1- ] Literal + + THEN + [char] 0 + hold ; -: #s ( +d -- 0 0 ) BEGIN # 2dup d0= UNTIL ; +: #s ( +d -- 0 0 ) \ core number-sign-s + BEGIN + # 2dup d0= + UNTIL ; \ print numbers 07jun92py -: d.r >r tuck dabs <# #s rot sign #> - r> over - spaces type ; - -: ud.r >r <# #s #> r> over - spaces type ; - -: .r >r s>d r> d.r ; -: u.r 0 swap ud.r ; - -: d. 0 d.r space ; -: ud. 0 ud.r space ; - -: . s>d d. ; -: u. 0 ud. ; +: d.r ( d n -- ) \ double d-dot-r + >r tuck dabs <# #s rot sign #> + r> over - spaces type ; + +: ud.r ( ud n -- ) \ gforth u-d-dot-r + >r <# #s #> r> over - spaces type ; + +: .r ( n1 n2 -- ) \ core-ext dot-r + >r s>d r> d.r ; +: u.r ( u n -- ) \ core-ext u-dot-r + 0 swap ud.r ; + +: d. ( d -- ) \ double d-dot + 0 d.r space ; +: ud. ( ud -- ) \ gforth u-d-dot + 0 ud.r space ; + +: . ( n -- ) \ core dot + s>d d. ; +: u. ( u -- ) \ core u-dot + 0 ud. ; \ catch throw 23feb93py \ bounce 08jun93jaw @@ -310,10 +449,10 @@ hex \ !! allow the user to add rollback actions anton \ !! use a separate exception stack? anton -: lp@ ( -- addr ) +: lp@ ( -- addr ) \ gforth l-p-fetch laddr# [ 0 , ] ; -: catch ( x1 .. xn xt -- y1 .. ym 0 / z1 .. zn error ) +: catch ( x1 .. xn xt -- y1 .. ym 0 / z1 .. zn error ) \ exception >r sp@ r> swap >r \ don't count xt! jaw fp@ >r lp@ >r @@ -322,9 +461,9 @@ hex execute r> handler ! rdrop rdrop rdrop 0 ; -: throw ( y1 .. ym error/0 -- y1 .. ym / z1 .. zn error ) +: throw ( y1 .. ym error/0 -- y1 .. ym / z1 .. zn error ) \ exception ?DUP IF - [ here 4 cells ! ] + [ here 9 cells ! ] handler @ rp! r> handler ! r> lp! @@ -334,7 +473,7 @@ hex \ Bouncing is very fine, \ programming without wasting time... jaw -: bounce ( y1 .. ym error/0 -- y1 .. ym error / y1 .. ym ) +: bounce ( y1 .. ym error/0 -- y1 .. ym error / y1 .. ym ) \ gforth \ a throw without data or fp stack restauration ?DUP IF handler @ rp! @@ -346,20 +485,32 @@ hex \ ?stack 23feb93py -: ?stack ( ?? -- ?? ) sp@ s0 @ > IF -4 throw THEN ; +: ?stack ( ?? -- ?? ) \ gforth + sp@ s0 @ > IF -4 throw THEN + fp@ f0 @ > IF -&45 throw THEN ; \ ?stack should be code -- it touches an empty stack! \ interpret 10mar92py Defer parser -Defer name ' (name) IS name -Defer notfound ( c-addr count -- ) - -: no.extensions ( addr u -- ) 2drop -&13 bounce ; +Defer name ( -- c-addr count ) \ gforth +\ get the next word from the input buffer +' (name) IS name +Defer compiler-notfound ( c-addr count -- ) +Defer interpreter-notfound ( c-addr count -- ) + +: no.extensions ( addr u -- ) + 2drop -&13 bounce ; +' no.extensions IS compiler-notfound +' no.extensions IS interpreter-notfound + +: compile-only ( ... -- ) + -&14 throw ; +Defer interpret-special ( c-addr u xt -- ) \ !! use nfa instead of xt? +' compile-only IS interpret-special -' no.extensions IS notfound - -: interpret +: interpret ( ?? -- ?? ) \ gforth + \ interpret/compile the (rest of the) input buffer BEGIN ?stack name dup WHILE @@ -369,29 +520,29 @@ Defer notfound ( c-addr count -- ) \ interpreter compiler 30apr92py -: interpreter ( c-addr u -- ) +: interpreter ( c-addr u -- ) \ gforth \ interpretation semantics for the name/number c-addr u - 2dup sfind dup + 2dup (sfind) dup IF 1 and IF \ not restricted to compile state? nip nip execute EXIT THEN - -&14 throw + interpret-special exit THEN drop 2dup 2>r snumber? IF 2rdrop ELSE - 2r> notfound + 2r> interpreter-notfound THEN ; ' interpreter IS parser -: compiler ( c-addr u -- ) +: compiler ( c-addr u -- ) \ gforth \ compilation semantics for the name/number c-addr u - 2dup sfind dup + 2dup (sfind) dup IF 0> IF @@ -409,15 +560,17 @@ Defer notfound ( c-addr count -- ) postpone Literal 2drop ELSE - drop notfound + drop compiler-notfound THEN ; -: [ ['] interpreter IS parser state off ; immediate -: ] ['] compiler IS parser state on ; +: [ ( -- ) \ core left-bracket + ['] interpreter IS parser state off ; immediate +: ] ( -- ) \ core right-bracket + ['] compiler IS parser state on ; \ locals stuff needed for control structures -: compile-lp+! ( n -- ) +: compile-lp+! ( n -- ) \ gforth compile-l-p-plus-store dup negate locals-size +! 0 over = if else -1 cells over = if postpone lp- @@ -426,7 +579,7 @@ Defer notfound ( c-addr count -- ) else postpone lp+!# dup , then then then then drop ; -: adjust-locals-size ( n -- ) +: adjust-locals-size ( n -- ) \ gforth \ sets locals-size to n and generates an appropriate lp+! locals-size @ swap - compile-lp+! ; @@ -442,12 +595,12 @@ variable backedge-locals \ the back edge if the BEGIN is unreachable from above. Set by \ ASSUME-LIVE, reset by UNREACHABLE. -: UNREACHABLE ( -- ) +: UNREACHABLE ( -- ) \ gforth \ declares the current point of execution as unreachable dead-code on 0 backedge-locals ! ; immediate -: ASSUME-LIVE ( orig -- orig ) +: ASSUME-LIVE ( orig -- orig ) \ gforth \ used immediateliy before a BEGIN that is not reachable from \ above. causes the BEGIN to assume that the same locals are live \ as at the orig point @@ -456,7 +609,7 @@ variable backedge-locals \ locals list operations -: common-list ( list1 list2 -- list3 ) +: common-list ( list1 list2 -- list3 ) \ gforth-internal \ list1 and list2 are lists, where the heads are at higher addresses than \ the tail. list3 is the largest sublist of both lists. begin @@ -470,7 +623,7 @@ variable backedge-locals repeat drop ; -: sub-list? ( list1 list2 -- f ) +: sub-list? ( list1 list2 -- f ) \ gforth-internal \ true iff list1 is a sublist of list2 begin 2dup u< @@ -479,7 +632,7 @@ variable backedge-locals repeat = ; -: list-size ( list -- u ) +: list-size ( list -- u ) \ gforth-internal \ size of the locals frame represented by list 0 ( list n ) begin @@ -540,13 +693,13 @@ variable backedge-locals 3 constant cs-item-size -: CS-PICK ( ... u -- ... destu ) +: CS-PICK ( ... u -- ... destu ) \ tools-ext 1+ cs-item-size * 1- >r r@ pick r@ pick r@ pick rdrop dup non-orig? ; -: CS-ROLL ( destu/origu .. dest0/orig0 u -- .. dest0/orig0 destu/origu ) +: CS-ROLL ( destu/origu .. dest0/orig0 u -- .. dest0/orig0 destu/origu ) \ tools-ext 1+ cs-item-size * 1- >r r@ roll r@ roll r@ roll rdrop @@ -572,53 +725,58 @@ variable backedge-locals : >resolve ( addr -- ) here over - swap ! ; : mark POSTPONE unreachable ; immediate restrict +: AHEAD ( compilation -- orig ; run-time -- ) \ tools-ext + POSTPONE branch >mark POSTPONE unreachable ; immediate restrict -: IF ( -- orig ) +: IF ( compilation -- orig ; run-time f -- ) \ core POSTPONE ?branch >mark ; immediate restrict -: ?DUP-IF \ general +: ?DUP-IF ( compilation -- orig ; run-time n -- n| ) \ gforth question-dupe-if \ 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-0=-IF \ general - POSTPONE ?dup POSTPONE 0= POSTPONE if ; immediate restrict +\ better handled by tools like stack checkers. Besides, it's faster. + POSTPONE ?dup-?branch >mark ; immediate restrict -: THEN ( orig -- ) - dup orig? - dead-orig = +: ?DUP-0=-IF ( compilation -- orig ; run-time n -- n| ) \ gforth question-dupe-zero-equals-if + POSTPONE ?dup-0=-?branch >mark ; immediate restrict + +: then-like ( orig -- addr ) + swap -rot dead-orig = if - >resolve drop + drop else dead-code @ if - >resolve set-locals-size-list dead-code off + set-locals-size-list dead-code off else \ both live - over list-size adjust-locals-size - >resolve + dup list-size adjust-locals-size locals-list @ common-list dup list-size adjust-locals-size locals-list ! then - then ; immediate restrict + then ; -' THEN alias ENDIF immediate restrict \ general +: THEN ( compilation orig -- ; run-time -- ) \ core + dup orig? then-like >resolve ; immediate restrict + +' THEN alias ENDIF ( compilation orig -- ; run-time -- ) \ gforth +immediate restrict \ Same as "THEN". This is what you use if your program will be seen by \ people who have not been brought up with Forth (or who have been \ brought up with fig-Forth). -: ELSE ( orig1 -- orig2 ) +: ELSE ( compilation orig1 -- orig2 ; run-time f -- ) \ core POSTPONE ahead 1 cs-roll POSTPONE then ; immediate restrict -: BEGIN ( -- dest ) +: BEGIN ( compilation -- dest ; run-time -- ) \ core dead-code @ if \ set up an assumption of the locals visible here. if the \ users want something to be visible, they have to declare @@ -633,13 +791,13 @@ variable backedge-locals \ issue a warning (see below). The following code is generated: \ lp+!# (current-local-size - dest-locals-size) \ branch -: AGAIN ( dest -- ) - dest? + +: again-like ( dest -- addr ) over list-size adjust-locals-size - POSTPONE branch - r drop begin @@ -721,26 +879,40 @@ Avariable leave-sp leave-stack 3 cells repeat >leave rdrop ; immediate restrict -: LEAVE ( -- ) +: LEAVE ( compilation -- ; run-time loop-sys -- ) \ core POSTPONE ahead >leave ; immediate restrict -: ?LEAVE ( -- ) +: ?LEAVE ( compilation -- ; run-time f | f loop-sys -- ) \ gforth question-leave POSTPONE 0= POSTPONE if >leave ; immediate restrict -: DO ( -- do-sys ) +: DO ( compilation -- do-sys ; run-time w1 w2 -- loop-sys ) \ core POSTPONE (do) POSTPONE begin drop do-dest ( 0 0 0 >leave ) ; immediate restrict -: ?DO ( -- do-sys ) +: ?do-like ( -- do-sys ) ( 0 0 0 >leave ) - POSTPONE (?do) >mark >leave - POSTPONE begin drop do-dest ; immediate restrict + POSTPONE begin drop do-dest ; + +: ?DO ( compilation -- do-sys ; run-time w1 w2 -- | loop-sys ) \ core-ext question-do + POSTPONE (?do) ?do-like ; immediate restrict + +: +DO ( compilation -- do-sys ; run-time n1 n2 -- | loop-sys ) \ gforth plus-do + POSTPONE (+do) ?do-like ; immediate restrict -: FOR ( -- do-sys ) +: U+DO ( compilation -- do-sys ; run-time u1 u2 -- | loop-sys ) \ gforth u-plus-do + POSTPONE (u+do) ?do-like ; immediate restrict + +: -DO ( compilation -- do-sys ; run-time n1 n2 -- | loop-sys ) \ gforth minus-do + POSTPONE (-do) ?do-like ; immediate restrict + +: U-DO ( compilation -- do-sys ; run-time u1 u2 -- | loop-sys ) \ gforth u-minus-do + POSTPONE (u-do) ?do-like ; immediate restrict + +: FOR ( compilation -- do-sys ; run-time u -- loop-sys ) \ gforth POSTPONE (for) POSTPONE begin drop do-dest ( 0 0 0 >leave ) ; immediate restrict @@ -751,30 +923,34 @@ Avariable leave-sp leave-stack 3 cells >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 ( compilation do-sys -- ; run-time loop-sys1 -- | loop-sys2 ) \ core ['] (loop) ['] (loop)-lp+!# loop-like ; immediate restrict -: +LOOP ( do-sys -- ) +: +LOOP ( compilation do-sys -- ; run-time loop-sys1 n -- | loop-sys2 ) \ core plus-loop ['] (+loop) ['] (+loop)-lp+!# loop-like ; immediate restrict +\ !! should the compiler warn about +DO..-LOOP? +: -LOOP ( compilation do-sys -- ; run-time loop-sys1 u -- | loop-sys2 ) \ gforth minus-loop + ['] (-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 ( compilation do-sys -- ; run-time loop-sys1 n -- | loop-sys2 ) \ gforth s-plus-loop ['] (s+loop) ['] (s+loop)-lp+!# loop-like ; immediate restrict -: NEXT ( do-sys -- ) +: NEXT ( compilation do-sys -- ; run-time loop-sys1 -- | loop-sys2 ) \ gforth ['] (next) ['] (next)-lp+!# loop-like ; immediate restrict \ Structural Conditionals 12dec92py -: EXIT ( -- ) +: EXIT ( compilation -- ; run-time nest-sys -- ) \ core 0 adjust-locals-size POSTPONE ;s POSTPONE unreachable ; immediate restrict -: ?EXIT ( -- ) +: ?EXIT ( -- ) ( compilation -- ; run-time nest-sys f -- | nest-sys ) \ gforth POSTPONE if POSTPONE exit POSTPONE then ; immediate restrict \ Strings 22feb93py @@ -785,22 +961,17 @@ Avariable leave-sp leave-stack 3 cells r> r> dup count + aligned >r swap >r ; restrict : (.") "lit count type ; restrict : (S") "lit count ; restrict -: SLiteral postpone (S") here over char+ allot place align ; +: SLiteral ( Compilation c-addr1 u ; run-time -- c-addr2 u ) \ string + postpone (S") here over char+ allot place align ; immediate restrict -create s"-buffer /line chars allot -: S" ( run-time: -- c-addr u ) - [char] " parse - state @ - IF - postpone SLiteral - ELSE - /line min >r s"-buffer r@ cmove - s"-buffer r> - THEN ; - immediate -: ." state @ IF postpone (.") ," align - ELSE [char] " parse type THEN ; immediate -: ( [char] ) parse 2drop ; immediate +: ( ( compilation 'ccc' -- ; run-time -- ) \ core,file paren + BEGIN + >in @ [char] ) parse nip >in @ rot - = + WHILE + loadfile @ IF + refill 0= abort" missing ')' in paren comment" + THEN + REPEAT ; immediate : \ ( -- ) \ core-ext backslash blk @ IF @@ -809,24 +980,37 @@ create s"-buffer /line chars allot THEN source >in ! drop ; immediate -: \G ( -- ) \ new backslash +: \G ( -- ) \ gforth backslash POSTPONE \ ; immediate \ error handling 22feb93py \ 'abort thrown out! 11may93jaw -: (abort") "lit >r IF r> "error ! -2 throw THEN - rdrop ; -: abort" postpone (abort") ," ; immediate restrict +: (abort") + "lit >r + IF + r> "error ! -2 throw + THEN + rdrop ; +: abort" ( compilation 'ccc"' -- ; run-time f -- ) \ core,exception-ext abort-quote + postpone (abort") ," ; immediate restrict \ Header states 23feb93py -: 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 +: cset ( bmask c-addr -- ) + tuck c@ or swap c! ; +: creset ( bmask c-addr -- ) + tuck c@ swap invert and swap c! ; +: ctoggle ( bmask c-addr -- ) + tuck c@ xor swap c! ; + +: lastflags ( -- c-addr ) + \ the address of the flags byte in the last header + \ aborts if the last defined word was headerless + last @ dup 0= abort" last word was headerless" cell+ ; + +: immediate immediate-mask lastflags cset ; +: restrict restrict-mask lastflags cset ; \ Header 23feb93py @@ -835,20 +1019,23 @@ create s"-buffer /line chars allot \ with existing/independent defining words defer (header) -defer header ' (header) IS header +defer header ( -- ) \ gforth +' (header) IS header -: string, ( c-addr u -- ) +: string, ( c-addr u -- ) \ gforth \ puts down string as cstring dup c, here swap chars dup allot move ; -: name, ( "name" -- ) - name name-too-short? name-too-long? - string, cfalign ; -: input-stream-header ( "name" -- ) - \ !! this is f83-implementation-dependent - align here last ! -1 A, - name, $80 flag! ; +: header, ( c-addr u -- ) \ gforth + name-too-long? + align here last ! + current @ 1 or A, \ link field; before revealing, it contains the + \ tagged reveal-into wordlist + string, cfalign + alias-mask lastflags cset ; +: input-stream-header ( "name" -- ) + name name-too-short? header, ; : input-stream ( -- ) \ general \ switches back to getting the name from the input stream ; ['] input-stream-header IS (header) ; @@ -859,15 +1046,11 @@ defer header ' (header) IS header create nextname-buffer 32 chars allot : nextname-header ( -- ) - \ !! f83-implementation-dependent - nextname-buffer count - align here last ! -1 A, - string, cfalign - $80 flag! + nextname-buffer count header, input-stream ; \ the next name is given in the string -: nextname ( c-addr u -- ) \ general +: nextname ( c-addr u -- ) \ gforth name-too-long? nextname-buffer c! ( c-addr ) nextname-buffer count move @@ -877,70 +1060,70 @@ create nextname-buffer 32 chars allot 0 last ! cfalign input-stream ; -: noname ( -- ) \ general +: noname ( -- ) \ gforth \ the next defined word remains anonymous. The xt of that word is given by lastxt ['] noname-header IS (header) ; -: lastxt ( -- xt ) \ general +: lastxt ( -- xt ) \ gforth \ 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 lastcfa @ ; -: Alias ( cfa "name" -- ) - Header reveal , $80 flag! ; +: Alias ( cfa "name" -- ) \ gforth + Header reveal + alias-mask lastflags creset + dup A, lastcfa ! ; -: name>string ( nfa -- addr count ) +: name>string ( nfa -- addr count ) \ gforth name-to-string cell+ count $1F and ; Create ??? 0 , 3 c, char ? c, char ? c, char ? c, -: >name ( cfa -- nfa ) +: >name ( cfa -- nfa ) \ gforth to-name $21 cell do - dup i - count $9F and + cfaligned over $80 + = if + dup i - count $9F and + cfaligned over alias-mask + = if i - cell - unloop exit then cell +loop drop ??? ( wouldn't 0 be better? ) ; -\ indirect threading 17mar93py +\ threading 17mar93py -: cfa, ( code-address -- ) - here lastcfa ! - here 0 A, 0 , code-address! ; -: compile, ( xt -- ) A, ; -: !does ( addr -- ) lastcfa @ does-code! ; -: (;code) ( R: addr -- ) r> /does-handler + !does ; +: cfa, ( code-address -- ) \ gforth cfa-comma + here + dup lastcfa ! + 0 A, 0 , code-address! ; +: compile, ( xt -- ) \ core-ext compile-comma + A, ; +: !does ( addr -- ) \ gforth store-does + lastxt does-code! ; +: (does>) ( R: addr -- ) + r> /does-handler + !does ; : dodoes, ( -- ) here /does-handler allot does-handler! ; -\ direct threading is implementation dependent - -: Create Header reveal [ :dovar ] Literal cfa, ; - -\ DOES> 17mar93py - -: DOES> ( compilation: -- ) - state @ - IF - ;-hook postpone (;code) dodoes, - ELSE - dodoes, here !does 0 ] - THEN - :-hook ; immediate +: Create ( -- ) \ core + Header reveal dovar: cfa, ; \ Create Variable User Constant 17mar93py -: Variable Create 0 , ; -: AVariable Create 0 A, ; +: Variable ( -- ) \ core + Create 0 , ; +: AVariable ( -- ) \ gforth + Create 0 A, ; : 2VARIABLE ( "name" -- ) \ double create 0 , 0 , ; -: User Variable ; -: AUser AVariable ; +: User + Variable ; +: AUser + AVariable ; + +: (Constant) Header reveal docon: cfa, ; +: Constant ( w -- ) \ core + (Constant) , ; +: AConstant ( addr -- ) \ gforth + (Constant) A, ; -: (Constant) Header reveal [ :docon ] Literal cfa, ; -: Constant (Constant) , ; -: AConstant (Constant) A, ; - -: 2Constant +: 2Constant ( d -- ) \ double Create ( w1 w2 "name" -- ) 2, DOES> ( -- w1 w2 ) @@ -948,57 +1131,42 @@ Create ??? 0 , 3 c, char ? c, char ? c, \ IS Defer What's Defers TO 24feb93py -: Defer ( -- ) +: Defer ( -- ) \ gforth \ !! shouldn't it be initialized with abort or something similar? - Header Reveal [ :dodefer ] Literal cfa, + Header Reveal dodefer: cfa, ['] noop A, ; \ Create ( -- ) \ ['] noop A, \ DOES> ( ??? ) -\ @ execute ; +\ perform ; -: IS ( addr "name" -- ) - ' >body - state @ - IF postpone ALiteral postpone ! - ELSE ! - THEN ; immediate -' IS Alias TO immediate - -: What's ( "name" -- addr ) ' >body - state @ IF postpone ALiteral postpone @ ELSE @ THEN ; - immediate -: Defers ( "name" -- ) ' >body @ compile, ; - immediate +: Defers ( "name" -- ) \ gforth + ' >body @ compile, ; immediate \ : ; 24feb93py defer :-hook ( sys1 -- sys2 ) defer ;-hook ( sys2 -- sys1 ) -: : ( -- colon-sys ) Header [ :docol ] Literal cfa, defstart ] :-hook ; -: ; ( colon-sys -- ) ;-hook ?struc postpone exit reveal postpone [ ; - immediate restrict +: : ( -- colon-sys ) \ core colon + Header docol: cfa, defstart ] :-hook ; +: ; ( compilation colon-sys -- ; run-time nest-sys ) \ core semicolon + ;-hook ?struc postpone exit reveal postpone [ ; immediate restrict -: :noname ( -- xt colon-sys ) +: :noname ( -- xt colon-sys ) \ core-ext colon-no-name 0 last ! - here [ :docol ] Literal cfa, 0 ] :-hook ; + here docol: cfa, 0 ] :-hook ; \ Search list handling 23feb93py -AVariable current +AVariable current ( -- addr ) \ gforth -: last? ( -- false / nfa nfa ) last @ ?dup ; -: (reveal) ( -- ) - last? - IF - dup @ 0< - IF - current @ @ over ! current @ ! - ELSE - drop - THEN - THEN ; +: last? ( -- false / nfa nfa ) + last @ ?dup ; +: (reveal) ( nfa wid -- ) + ( wid>wordlist-id ) dup >r + @ over ( name>link ) ! + r> ! ; \ object oriented search list 17mar93py @@ -1006,7 +1174,7 @@ AVariable current struct 1 cells: field find-method \ xt: ( c_addr u wid -- name-id ) - 1 cells: field reveal-method \ xt: ( -- ) + 1 cells: field reveal-method \ xt: ( nfa wid -- ) \ used by dofield:, must be field 1 cells: field rehash-method \ xt: ( wid -- ) \ \ !! what else end-struct wordlist-map-struct @@ -1018,26 +1186,82 @@ struct 1 cells: field wordlist-extend \ points to wordlist extensions (eg hash) end-struct wordlist-struct -: f83find ( addr len wordlist -- nfa / false ) @ (f83find) ; +: f83find ( addr len wordlist -- nfa / false ) + ( wid>wordlist-id ) @ (f83find) ; \ Search list table: find reveal -Create f83search ' f83find A, ' (reveal) A, ' drop A, +Create f83search ( -- wordlist-map ) + ' f83find A, ' (reveal) A, ' drop A, Create forth-wordlist NIL A, G f83search T A, NIL A, NIL A, AVariable lookup G forth-wordlist lookup T ! G forth-wordlist current T ! +\ higher level parts of find + +: special? ( xt -- flag ) + >does-code ['] S" >does-code = ; + +: xt>i ( xt -- xt ) + dup special? IF >body @ THEN ; + +: xt>c ( xt -- xt ) + dup special? IF >body cell+ @ THEN ; + +: xt>s ( xt -- xt ) + dup special? IF >body state @ IF cell+ THEN @ THEN ; + +: found ( nfa -- cfa n ) \ gforth + cell+ dup c@ >r (name>) + r@ alias-mask and 0= IF @ THEN -1 + r@ restrict-mask and IF 1- THEN + r> immediate-mask and IF negate THEN ; + : (search-wordlist) ( addr count wid -- nfa / false ) - dup wordlist-map @ find-method @ execute ; + dup wordlist-map @ find-method perform ; -: search-wordlist ( addr count wid -- 0 / xt +-1 ) - (search-wordlist) dup IF found THEN ; +: search-wordlist ( addr count wid -- 0 / xt +-1 ) \ search + (search-wordlist) dup IF found swap xt>s swap THEN ; -Variable warnings G -1 warnings T ! +: (sfind) ( c-addr u -- xt n / 0 ) + lookup @ (search-wordlist) dup IF found THEN ; + +: sfind ( c-addr u -- xt n / 0 ) \ gforth + lookup @ search-wordlist ; + +: find ( addr -- cfa +-1 / string false ) \ core,search + dup count sfind dup IF + rot drop + THEN + dup 1 and 0= IF 2/ THEN ; + +: (') ( "name" -- xt ) \ gforth paren-tick + name (sfind) 0= IF -&13 bounce THEN ; +: [(')] ( compilation "name" -- ; run-time -- addr ) \ gforth bracket-paren-tick + (') postpone ALiteral ; immediate restrict + +: ' ( "name" -- xt ) \ core tick + (') xt>i ; +: ['] ( compilation "name" -- ; run-time -- addr ) \ core bracket-tick + ' postpone ALiteral ; immediate restrict + +: C' ( "name" -- xt ) \ gforth c-tick + (') xt>c ; +: [C'] ( compilation "name" -- ; run-time -- addr ) \ gforth bracket-c-tick + C' postpone ALiteral ; immediate restrict + +: S' ( "name" -- xt ) \ gforth s-tick + (') xt>s ; +: [S'] ( compilation "name" -- ; run-time -- addr ) \ gforth bracket-s-tick + S' postpone ALiteral ; immediate restrict + +\ reveal words + +Variable warnings ( -- addr ) \ gforth +G -1 warnings T ! : check-shadow ( addr count wid -- ) \ prints a warning if the string is already present in the wordlist -\ !! should be refined so the user can suppress the warnings >r 2dup 2dup r> (search-wordlist) warnings @ and ?dup if ." redefined " name>string 2dup type compare 0<> if @@ -1049,74 +1273,65 @@ Variable warnings G -1 warnings T ! then 2drop 2drop ; -: 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 +: reveal ( -- ) \ gforth + last? + if \ the last word has a header + dup ( name>link ) @ 1 and + if \ it is still hidden + dup ( name>link ) @ 1 xor ( nfa wid ) + 2dup >r name>string r> check-shadow ( nfa wid ) + dup wordlist-map @ reveal-method perform + then then ; -: reveal ( -- ) - last? if - name>string current @ check-shadow - then - current @ wordlist-map @ reveal-method @ execute ; - -: rehash ( wid -- ) dup wordlist-map @ rehash-method @ execute ; +: rehash ( wid -- ) + dup wordlist-map @ rehash-method perform ; -: ' ( "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 +07 constant #bell ( -- c ) \ gforth +08 constant #bs ( -- c ) \ gforth +09 constant #tab ( -- c ) \ gforth +7F constant #del ( -- c ) \ gforth +0D constant #cr ( -- c ) \ gforth +\ the newline key code +0C constant #ff ( -- c ) \ gforth +0A constant #lf ( -- c ) \ gforth : bell #bell emit ; +: cr ( -- ) \ core + \ emit a newline + #lf ( sic! ) emit ; \ : backspaces 0 ?DO #bs emit LOOP ; -: >string ( span addr pos1 -- span addr pos1 addr2 len ) - over 3 pick 2 pick chars /string ; -: type-rest ( span addr pos1 -- span addr pos1 back ) - >string tuck type ; -: (del) ( max span addr pos1 -- max span addr pos2 ) - 1- >string over 1+ -rot move - rot 1- -rot #bs emit type-rest bl emit 1+ backspaces ; -: (ins) ( max span addr pos1 char -- max span addr pos2 ) - >r >string over 1+ swap move 2dup chars + r> swap c! - rot 1+ -rot type-rest 1- backspaces 1+ ; -: ?del ( max span addr pos1 -- max span addr pos2 0 ) - dup IF (del) THEN 0 ; -: (ret) type-rest drop true space ; -: back dup IF 1- #bs emit ELSE #bell emit THEN 0 ; -: forw 2 pick over <> IF 2dup + c@ emit 1+ ELSE #bell emit THEN 0 ; + +: (ins) ( max span addr pos1 key -- max span addr pos2 ) + >r 2dup + r@ swap c! r> emit 1+ rot 1+ -rot ; +: (bs) ( max span addr pos1 -- max span addr pos2 flag ) + dup IF + #bs emit bl emit #bs emit 1- rot 1- -rot + THEN false ; +: (ret) true space ; Create ctrlkeys - ] false false back false false false forw false - ?del false (ret) false false (ret) false false + ] false false false false false false false false + (bs) false (ret) false false (ret) false false false false false false false false false false false false false false false false false false [ +defer insert-char +' (ins) IS insert-char defer everychar ' noop IS everychar : decode ( max span addr pos1 key -- max span addr pos2 flag ) everychar dup #del = IF drop #bs THEN \ del is rubout - dup bl < IF cells ctrlkeys + @ execute EXIT THEN + dup bl < IF cells ctrlkeys + perform EXIT THEN >r 2over = IF rdrop bell 0 EXIT THEN - r> (ins) 0 ; + r> insert-char 0 ; -\ decode should better use a table for control key actions -\ to define keyboard bindings later - -: accept ( addr len -- len ) +: accept ( addr len -- len ) \ core dup 0< IF abs over dup 1 chars - c@ tuck type \ this allows to edit given strings ELSE 0 THEN rot over @@ -1125,40 +1340,42 @@ defer everychar \ Output 13feb93py -Defer type \ defer type for a output buffer or fast - \ screen write +: (type) ( c-addr u -- ) \ gforth + outfile-id write-file drop \ !! use ?DUP-IF THROW ENDIF instead of DROP ? +; -\ : (type) ( addr len -- ) -\ bounds ?DO I c@ emit LOOP ; +Defer type ( c-addr u -- ) \ core +\ defer type for a output buffer or fast +\ screen write ' (type) IS Type -Defer emit +: (emit) ( c -- ) \ gforth + outfile-id emit-file drop \ !! use ?DUP-IF THROW ENDIF instead of DROP ? +; +Defer emit ( c -- ) \ core ' (Emit) IS Emit -Defer key +Defer key ( -- c ) \ core ' (key) IS key -\ : form ( -- rows cols ) &24 &80 ; -\ form should be implemented using TERMCAPS or CURSES -\ : rows form drop ; -\ : cols form nip ; - \ Query 07apr93py -: refill ( -- flag ) - blk @ IF 1 blk +! true EXIT THEN +: refill ( -- flag ) \ core-ext,block-ext,file-ext + blk @ IF 1 blk +! true 0 >in ! EXIT THEN tib /line loadfile @ ?dup IF read-line throw - ELSE loadline @ 0< IF 2drop false EXIT THEN + ELSE sourceline# 0< IF 2drop false EXIT THEN accept true THEN 1 loadline +! swap #tib ! 0 >in ! ; -: Query ( -- ) loadfile off blk off refill drop ; +: Query ( -- ) \ core-ext + \ obsolescent + loadfile off blk off refill drop ; \ File specifiers 11jun93jaw @@ -1166,33 +1383,40 @@ Defer key \ 1 c, here char r c, 0 c, 0 c, 0 c, char b c, 0 c, \ 2 c, here char r c, char + c, 0 c, \ 2 c, here char w c, char + c, 0 c, align -4 Constant w/o -2 Constant r/w -0 Constant r/o +4 Constant w/o ( -- fam ) \ file w-o +2 Constant r/w ( -- fam ) \ file r-w +0 Constant r/o ( -- fam ) \ file r-o \ BIN WRITE-LINE 11jun93jaw \ : bin dup 1 chars - c@ \ r/o 4 chars + over - dup >r swap move r> ; -: bin 1 or ; +: bin ( fam1 -- fam2 ) \ file + 1 or ; create nl$ 1 c, A c, 0 c, \ gnu includes usually a cr in dos \ or not unix environments if \ bin is not selected -: write-line dup >r write-file ?dup IF r> drop EXIT THEN - nl$ count r> write-file ; +: write-line ( c-addr u fileid -- ior ) \ file + dup >r write-file + ?dup IF + r> drop EXIT + THEN + nl$ count r> write-file ; \ include-file 07apr93py : push-file ( -- ) r> - loadline @ >r loadfile @ >r - blk @ >r >tib @ >r #tib @ dup >r >tib +! >in @ >r >r ; + sourceline# >r loadfile @ >r + blk @ >r tibstack @ >r >tib @ >r #tib @ >r + >tib @ tibstack @ = IF r@ tibstack +! THEN + tibstack @ >tib ! >in @ >r >r ; : pop-file ( throw-code -- throw-code ) dup IF - source >in @ loadline @ loadfilename 2@ + source >in @ sourceline# sourcefilename error-stack dup @ dup 1+ max-errors 1- min error-stack ! 6 * cells + cell+ @@ -1201,13 +1425,13 @@ create nl$ 1 c, A c, 0 c, \ gnu includes -1 cells +LOOP THEN r> - r> >in ! r> #tib ! r> >tib ! r> blk ! + r> >in ! r> #tib ! r> >tib ! r> tibstack ! 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 ) +: include-file ( i*x fid -- j*x ) \ file push-file loadfile ! 0 loadline ! blk off ['] read-loop catch loadfile @ close-file swap 2dup or @@ -1215,45 +1439,90 @@ create nl$ 1 c, A c, 0 c, \ gnu includes create pathfilenamebuf 256 chars allot \ !! make this grow on demand -: check-file-prefix ( addr len -- addr' len' flag ) - dup 0= IF true EXIT THEN - over c@ '/ = IF true EXIT THEN - over 2 S" ./" compare 0= IF true EXIT THEN - over 3 S" ../" compare 0= IF true EXIT THEN - over 2 S" ~/" compare 0= - IF 1 /string - S" HOME" getenv tuck pathfilenamebuf swap move - 2dup + >r pathfilenamebuf + swap move - pathfilenamebuf r> true - ELSE false - THEN ; - -: 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 "~/"? - check-file-prefix 0= - IF pathdirs 2@ 0 +\ : check-file-prefix ( addr len -- addr' len' flag ) +\ dup 0= IF true EXIT THEN +\ over c@ '/ = IF true EXIT THEN +\ over 2 S" ./" compare 0= IF true EXIT THEN +\ over 3 S" ../" compare 0= IF true EXIT THEN +\ over 2 S" ~/" compare 0= +\ IF 1 /string +\ S" HOME" getenv tuck pathfilenamebuf swap move +\ 2dup + >r pathfilenamebuf + swap move +\ pathfilenamebuf r> true +\ ELSE false +\ THEN ; + +: absolut-path? ( addr u -- flag ) \ gforth + \ a path is absolute, if it starts with a / or a ~ (~ expansion), + \ or if it is in the form ./* or ../*, extended regexp: [/~]|./|../ + \ Pathes simply containing a / are not absolute! + over c@ '/ = >r + over c@ '~ = >r + 2dup 2 min S" ./" compare 0= >r + 3 min S" ../" compare 0= + r> r> r> or or or ; +\ [char] / scan nip 0<> ; + +: open-path-file ( c-addr1 u1 -- file-id c-addr2 u2 ) \ gforth + \ opens a file for reading, searching in the path for it (unless + \ the filename contains a slash); 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 + \ !! use file-status to determine access mode? + 2dup absolut-path? + if \ the filename contains a slash + 2dup r/o open-file throw ( c-addr1 u1 file-id ) + -rot >r pathfilenamebuf r@ cmove ( file-id R: u1 ) + pathfilenamebuf r> EXIT + then + pathdirs 2@ 0 +\ check-file-prefix 0= +\ IF 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 + nip nip r> rdrop 0 LEAVE THEN rdrop drop r> cell+ cell+ LOOP - ELSE 2dup open-file throw -rot THEN +\ ELSE 2dup open-file throw -rot THEN 0<> -&38 and throw ( file-id u2 ) pathfilenamebuf swap ; create included-files 0 , 0 , ( pointer to and count of included files ) +here ," the terminal" dup c@ swap 1 + swap , A, here 2 cells - +create image-included-files 1 , A, ( pointer to and count of included files ) +\ included-files points to ALLOCATEd space, while image-included-files +\ points to ALLOTed objects, so it survives a save-system + +: loadfilename ( -- a-addr ) + \ a-addr 2@ produces the current file name ( c-addr u ) + included-files 2@ drop loadfilename# @ 2* cells + ; + +: sourcefilename ( -- c-addr u ) \ gforth + \ the name of the source file which is currently the input + \ source. The result is valid only while the file is being + \ loaded. If the current input source is no (stream) file, the + \ result is undefined. + loadfilename 2@ ; + +: sourceline# ( -- u ) \ gforth sourceline-number + \ the line number of the line that is currently being interpreted + \ from a (stream) file. The first line has the number 1. If the + \ current input source is no (stream) file, the result is + \ undefined. + loadline @ ; + +: init-included-files ( -- ) + image-included-files 2@ 2* cells save-string drop ( addr ) + image-included-files 2@ nip included-files 2! ; -: included? ( c-addr u -- f ) +: included? ( c-addr u -- f ) \ gforth \ true, iff filename c-addr u is in included-files included-files 2@ 0 ?do ( c-addr u addr ) @@ -1266,28 +1535,31 @@ create included-files 0 , 0 , ( pointer loop 2drop drop false ; -: add-included-file ( c-addr u -- ) +: add-included-file ( c-addr u -- ) \ gforth \ add name c-addr u to included-files included-files 2@ tuck 1+ 2* cells resize throw swap 2dup 1+ included-files 2! 2* cells + 2! ; -: save-string ( addr1 u -- addr2 u ) +: save-string ( addr1 u -- addr2 u ) \ gforth + \ !! not a string, but a memblock word swap >r dup allocate throw swap 2dup r> -rot move ; -: included1 ( i*x file-id c-addr u -- j*x ) +: included1 ( i*x file-id c-addr u -- j*x ) \ gforth \ include the file file-id with the name given by c-addr u - loadfilename 2@ >r >r - save-string 2dup loadfilename 2! add-included-file ( file-id ) + loadfilename# @ >r + save-string add-included-file ( file-id ) + included-files 2@ nip 1- loadfilename# ! ['] include-file catch - r> r> loadfilename 2! throw ; + r> loadfilename# ! + throw ; -: included ( i*x addr u -- j*x ) +: included ( i*x addr u -- j*x ) \ file open-path-file included1 ; -: required ( i*x addr u -- j*x ) +: required ( i*x addr u -- j*x ) \ gforth \ include the file with the name given by addr u, if it is not \ included already. Currently this works by comparing the name of \ the file (with path) against the names of earlier included @@ -1305,48 +1577,52 @@ create included-files 0 , 0 , ( pointer \ HEX DECIMAL 2may93jaw -: decimal a base ! ; -: hex 10 base ! ; +: decimal ( -- ) \ core + a base ! ; +: hex ( -- ) \ core-ext + 10 base ! ; \ DEPTH 9may93jaw -: depth ( -- +n ) sp@ s0 @ swap - cell / ; -: clearstack ( ... -- ) s0 @ sp! ; +: depth ( -- +n ) \ core + sp@ s0 @ swap - cell / ; +: clearstack ( ... -- ) + s0 @ sp! ; \ INCLUDE 9may93jaw -: include ( "file" -- ) +: include ( "file" -- ) \ gforth name included ; -: require ( "file" -- ) +: require ( "file" -- ) \ gforth name required ; \ RECURSE 17may93jaw -: recurse ( -- ) +: recurse ( compilation -- ; run-time ?? -- ?? ) \ core lastxt compile, ; immediate restrict -: recursive ( -- ) - reveal ; immediate +' reveal alias recursive ( -- ) \ gforth + immediate \ */MOD */ 17may93jaw \ !! I think */mod should have the same rounding behaviour as / - anton -: */mod >r m* r> sm/rem ; +: */mod ( n1 n2 n3 -- n4 n5 ) \ core star-slash-mod + >r m* r> sm/rem ; -: */ */mod nip ; +: */ ( n1 n2 n3 -- n4 ) \ core star-slash + */mod nip ; \ EVALUATE 17may93jaw -: evaluate ( c-addr len -- ) - push-file dup #tib ! >tib @ swap move +: evaluate ( c-addr len -- ) \ core,block + push-file #tib ! >tib ! >in off blk off loadfile off -1 loadline ! - -\ BEGIN interpret >in @ #tib @ u>= UNTIL ['] interpret catch pop-file throw ; - -: abort -1 throw ; +: abort ( ?? -- ?? ) \ core,exception-ext + -1 throw ; \+ environment? true ENV" CORE" \ core wordset is now complete! @@ -1370,11 +1646,11 @@ max-errors 6 * cells allot \ line-number \ Loadfilename ( addr u ) -: dec. ( n -- ) +: dec. ( n -- ) \ gforth \ print value in decimal representation base @ decimal swap . base ! ; -: typewhite ( addr u -- ) +: typewhite ( addr u -- ) \ gforth \ like type, but white space is printed instead of the characters bounds ?do i c@ 9 = if \ check for tab @@ -1383,8 +1659,7 @@ max-errors 6 * cells allot bl then emit - loop -; + loop ; DEFER DOERROR @@ -1409,8 +1684,8 @@ DEFER DOERROR ; : (DoError) ( throw-code -- ) - loadline @ IF - source >in @ loadline @ 0 0 .error-frame + sourceline# IF + source >in @ sourceline# 0 0 .error-frame THEN error-stack @ 0 ?DO -1 error-stack +! @@ -1434,23 +1709,26 @@ DEFER DOERROR ' (DoError) IS DoError -: quit r0 @ rp! handler off >tib @ >r - BEGIN - postpone [ - ['] 'quit CATCH dup - WHILE - DoError r@ >tib ! - REPEAT - drop r> >tib ! ; +: quit ( ?? -- ?? ) \ core + r0 @ rp! handler off >tib @ >r + BEGIN + postpone [ + ['] 'quit CATCH dup + WHILE + DoError r@ >tib ! r@ tibstack ! + REPEAT + drop r> >tib ! ; \ Cold 13feb93py -\ : .name ( name -- ) cell+ count $1F and type space ; +\ : .name ( name -- ) name>string type space ; \ : words listwords @ \ BEGIN @ dup WHILE dup .name REPEAT drop ; -: cstring>sstring ( cstring -- addr n ) -1 0 scan 0 swap 1+ /string ; -: arg ( n -- addr count ) cells argv @ + @ cstring>sstring ; +: cstring>sstring ( cstring -- addr n ) \ gforth cstring-to-sstring + -1 0 scan 0 swap 1+ /string ; +: arg ( n -- addr count ) \ gforth + cells argv @ + @ cstring>sstring ; : #! postpone \ ; immediate Create pathstring 2 cells allot \ string @@ -1462,7 +1740,7 @@ Variable argc : process-path ( addr1 u1 -- addr2 u2 ) \ addr1 u1 is a path string, addr2 u2 is an array of dir strings - here >r + align here >r BEGIN over >r [char] : scan over r> tuck - ( rest-str this-str ) @@ -1495,39 +1773,42 @@ Variable argc : process-args ( -- ) >tib @ >r - true to script? argc @ 1 ?DO I arg over c@ [char] - <> IF required 1 ELSE - I 1+ arg do-option + I 1+ argc @ = IF s" " ELSE I 1+ arg THEN + do-option THEN +LOOP - false to script? r> >tib ! ; Defer 'cold ' noop IS 'cold -: cold ( -- ) +: cold ( -- ) \ gforth + stdout TO outfile-id pathstring 2@ process-path pathdirs 2! - 0 0 included-files 2! + init-included-files 'cold argc @ 1 > IF + true to script? ['] process-args catch ?dup IF dup >r DoError cr r> negate (bye) THEN + cr 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 + false to script? + ." GForth " version-string type ." , Copyright (C) 1994-1996 Free Software Foundation, Inc." cr + ." GForth comes with ABSOLUTELY NO WARRANTY; for details type `license'" cr ." Type `bye' to exit" loadline off quit ; -: license ( -- ) cr +: license ( -- ) \ gforth + 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 @@ -1544,13 +1825,16 @@ Defer 'cold ' noop IS 'cold : boot ( path **argv argc -- ) argc ! argv ! cstring>sstring pathstring 2! main-task up! - sp@ dup s0 ! $10 + >tib ! #tib off >in off - rp@ r0 ! fp@ f0 ! cold ; + sp@ dup s0 ! $10 + dup >tib ! tibstack ! #tib off >in off + rp@ r0 ! fp@ f0 ! ['] cold catch DoError bye ; -: bye script? 0= IF cr THEN 0 (bye) ; +: bye ( -- ) \ tools-ext + 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 \ or space and stackspace overrides \ 0 arg contains, however, the name of the program. + +