X-Git-Url: https://git.kengrimes.com/?p=watForth.git;a=blobdiff_plain;f=forth.forth;h=2f9ff874b794f7647daf41fcfee36ecde4642a4f;hp=aa90b03d80ffdbad7549ad72d97400d5b136bfa8;hb=b1197f8636a1b46b1eabc565cd41f0a30944cac4;hpb=b9be17929d350bf4ab9c747e29ae6c1203035111

diff --git a/forth.forth b/forth.forth
index aa90b03..2f9ff87 100644
--- a/forth.forth
+++ b/forth.forth
@@ -10,19 +10,158 @@
 \
 \ You should have received a copy of the GNU General Public License
 \ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+\ word EXECUTE 12 define
+16500 execute WORD 16500 29 execute
+word DEFINE 29 29 execute
+word RINIT 3 define
+word NOOP 13 define
+word MODE 14336 define
+word EXECUTE-WORD 16680 define
+word EXECUTE-NUM 16720 define
+word INTERPRET 16400 define
+word KEY 5 define
+word WORD-START 20 define
+word WORD-PUT 19 define
+word WORD-END 23 define
+word STRING-START 39 define
+word STRING-PUT 40 define
+word STRING-END 41 define
+word NUMBER 22 define
+word FIND 21 define
+word FIND-DOES 44 define
+word DEFINE-DOES 45 define
+word QUIT 16384 define
+word BYE 25 define
+word WORDS 27 define
+word CHANNEL-IN 35 define
+word CHANNEL-OUT 48 define
+word CHANNEL-OPEN 51 define
+word CHANNEL-AWAIT 50 define
+word !HERE 36 define
+word HERE 28 define
+
+word STACKTRACE 46 define
+word FETCH 47 define
+
+word ; 1 define
+word JZ: 14 define
+word JNZ: 15 define
+word J-1: 24 define
+word JMP: 18 define
+word , 33 define
+word + 7 define
+word - 34 define
+word =? 37 define
+word WS? 17 define
+word . 9 define
+word .S 38 define
+word @ 10 define
+word @8u 53 define
+word @+ 42 define
+word ! 11 define
+word !+ 43 define
+word LIT 2 define
+word DUP 6 define
+word 2DUP 30 define
+word DROP 16 define
+word 2DROP 32 define
+word SWAP 26 define
+word ROT 31 define
+word -ROT 54 define
+
+\ ' "TICK" returns address of word's execution semantics
 word ' here define
 word word find , word find find , word ; find ,
+
+\ : "COLON" sets execution semantics
 word : here define
+word : here define-does
 ' word , ' here , ' define , ' ; ,
-: IWRITE-MODE ' dup , ' JNZ: , here 12 + , ' 2drop , ' ; ,
+
+\ :> "DOES" sets compilation semantics
+word :> here define-does
+: :> ' word , ' here , ' define-does , ' ; ,
+
+\ ::> "COLON DOES" sets execution and compilation semantics
+word ::> here define-does
+word ::> here define
+' word , ' 2dup , ' here , ' define-does , ' here , ' define , ' ; ,
+
+\ write the execution semantics of a word to memory
+: MEMORIZE-WORD ' dup , ' JNZ: , here 12 + , ' 2drop , ' ; , 
 ' 2dup , ' find , ' dup , ' JZ: , here 16 + , ' , , ' 2drop , ' ; ,
-' drop , ' LIT , ' LIT , ' , , 16720 , ' , , ' ; ,
-: ^i ' LIT , ' MODE , ' LIT , ' IWRITE-MODE , ' ! , ' ; ,
-: ^e ' LIT , ' MODE , ' LIT , ' EXECUTE-MODE , ' ! , ' ; ,
-^i
-\: FINISH-STRING DROP STRING-END ;
-\: " STRING-START
-\: KEYPUMP KEY 34 =? JNZ: FINISH-STRING STRING-PUT JMP: KEYPUMP
-\^e
+' drop , ' lit , ' lit , ' , , ' execute-num , ' , , ' ; , 
+
+\ change interpreter semantics to "memorize-word"
+::> MEMORIZING ' lit , ' memorize-word , ' lit , ' mode , ' ! , ' ; ,
+
+\ memorize the compiler
+\memorizing
+\: executing lit execute-word lit mode ! ;
+\: FINISH-" drop string-end ;
+\: BSLASH-" drop key string-put JMP: \here \8 \+ \,
+\: " string-start \: KLOOP key 92 =? JNZ: bslash-" 34 =? JNZ: finish-" string-put JMP: KLOOP
+\: DO"    \:> " " swap lit lit , , lit lit , , ;
+\: DOIF   \:> IF lit JZ: , here dup , ;
+\: DOELSE \:> ELSE lit JMP: , here dup , here -rot ! ;
+\: DOTHEN \:> THEN here swap ! ;
+\: COMPILE-WORD dup
+\doif 2dup find-does dup
+  \doif rot 2drop execute ;
+  \dothen drop 2dup find dup
+  \doif , 2drop ;
+  \dothen drop lit lit , execute-num , ;
+\dothen 2drop \do" Compilation Error: null word" .s bye
+\: compiling lit compile-word lit mode ! ;
+
+\ compile the rest of the compiler
+\compiling
+
+\ ; "RET" compilation semantics: ends a function and returns to executing mode
+:> ; lit \' ; \, , lit \' ; \, , executing \' ; \,
+
+\ ;; "SEMIRET" compilation semantics: simply writes a return instruction
+:> ;; lit \' ; \, , ;
+
+\ <: "OVERLOAD COLON" extend previous execution semantics of word
+::> <: \compiling word 2dup find dup if here swap , define else drop here define
+then compiling ;
+
+\ <:> "OVERLOAD COLON DOES" extend previous compilation semantics of word
+::> <:> \compiling word 2dup find-does dup if here swap , define-does else drop
+here define-does then compiling ;
+
+\ execution semantics of COLON, DOES, and COLON DOES now extended to
+\ automatically switch to compilation mode
+<: : compiling ;
+<: :> compiling ;
+<: ::> compiling ;
+
+\ Multi-line comments
+::> ( key 41 =? swap -1 =? swap drop + if ;; then JMP: \' ( \, ;
+
+(
+  End of bootstrap process
+  beyond this point, all hope is lost
+)
+
+\ Set the number conversion base
+: BASE 14348 ! ;
+: BASE10 10 base ;
+
+\ TICK compilation semantics
+:> ' lit lit , word find , ;
+\ "TICK DOES" (get compilation semantics execution token)
+: '> word find-does ;
+:> '> word find-does , ;
+
+\ Include a remote file
+: REQUIRE" ' quit channel-open dup \' " \, fetch channel-await ;
+
+\ Let's try it
+REQUIRE" { \"url\": \"forth/test-watfor.forth\" }"
+
+\ Print intro string
 " watForth-32 Interactive CLI:
 " .s