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

diff --git a/forth.forth b/forth.forth
index 8f609d7..2f9ff87 100644
--- a/forth.forth
+++ b/forth.forth
@@ -57,7 +57,7 @@ word WS? 17 define
 word . 9 define
 word .S 38 define
 word @ 10 define
-word @8_u 53 define
+word @8u 53 define
 word @+ 42 define
 word ! 11 define
 word !+ 43 define
@@ -68,6 +68,7 @@ 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
@@ -93,18 +94,18 @@ word ::> here define
 ' drop , ' lit , ' lit , ' , , ' execute-num , ' , , ' ; , 
 
 \ change interpreter semantics to "memorize-word"
-::> MEMORIZING ' lit , ' mode , ' lit , ' memorize-word , ' ! , ' ; ,
+::> MEMORIZING ' lit , ' memorize-word , ' lit , ' mode , ' ! , ' ; ,
 
 \ memorize the compiler
 \memorizing
-\: executing lit mode lit execute-word ! ;
+\: 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 , swap here ! ;
-\: DOTHEN \:> THEN here ! ;
+\: DOELSE \:> ELSE lit JMP: , here dup , here -rot ! ;
+\: DOTHEN \:> THEN here swap ! ;
 \: COMPILE-WORD dup
 \doif 2dup find-does dup
   \doif rot 2drop execute ;
@@ -112,7 +113,7 @@ word ::> here define
   \doif , 2drop ;
   \dothen drop lit lit , execute-num , ;
 \dothen 2drop \do" Compilation Error: null word" .s bye
-\: compiling lit mode lit compile-word ! ;
+\: compiling lit compile-word lit mode ! ;
 
 \ compile the rest of the compiler
 \compiling
@@ -146,7 +147,7 @@ here define-does then compiling ;
 )
 
 \ Set the number conversion base
-: BASE 14348 swap ! ;
+: BASE 14348 ! ;
 : BASE10 10 base ;
 
 \ TICK compilation semantics
@@ -155,24 +156,6 @@ here define-does then compiling ;
 : '> word find-does ;
 :> '> word find-does , ;
 
-\ CHAR 
-: CHAR: word drop @8_u ;
-:> CHAR: lit lit , ' char: execute , ;
-
-\ JSON Compiler
-: JSON-CTRL-CHAR? char: { =? if 1 ;; then
-                  char: } =? if 1 ;; then
-                  char: [ =? if 1 ;; then
-                  char: ] =? if 1 ;; then
-                  0 ;
-: JSON-PARSE-V ;
-: JSON-PARSE-" ;
-: JSON-PARSE-[ ;
-: JSON-PARSE-{ ;
-: JSON-WORD word-start key JSON-CTRL-CHAR? if word-end ;; then ws?   ;
-
-: JSON{ key ; 
-
 \ Include a remote file
 : REQUIRE" ' quit channel-open dup \' " \, fetch channel-await ;