encore un lot de bogues... corrigées

diff --git a/MSP430-FORTH/CORETEST.4TH b/MSP430-FORTH/CORETEST.4TH
index 979110a..164f151 100644 (file)
--- a/MSP430-FORTH/CORETEST.4TH
+++ b/MSP430-FORTH/CORETEST.4TH
@@ -1071,27 +1071,20 @@ TESTING INPUT: ACCEPT
 
 CREATE ABUF 80 CHARS ALLOT
 
-[DEFINED] LOAD" [IF]
-: (ACCEPT)
-    ['] ACCEPT >BODY EXECUTE
-;
 : ACCEPT-TEST
-    CR ." PLEASE TYPE UP TO 80 CHARACTERS:" CR
-    ABUF 80 (ACCEPT)                \ JMT: because ACCEPT is deferred
-    CR ." RECEIVED: " [CHAR] " EMIT
-    ABUF SWAP TYPE [CHAR] " EMIT CR
-;
+    CR ." PLEASE TYPE UP TO 80 CHARACTERS: "
+[DEFINED] LOAD" [IF] \ " \ JMT: because ACCEPT is deferred
+    ABUF 80 ['] ACCEPT >BODY EXECUTE \ JMT: execute default part of ACCEPT
 [ELSE]
-: ACCEPT-TEST
-    CR ." PLEASE TYPE UP TO 80 CHARACTERS:" CR
     ABUF 80 ACCEPT
+[THEN]
     CR ." RECEIVED: " [CHAR] " EMIT
     ABUF SWAP TYPE [CHAR] " EMIT CR
 ;
-[THEN]      \ LOAD"
-
 
 T{ ACCEPT-TEST -> }T
+ZYXWVUTSRQPONMLKJIHGFEDCBAzyxwvutsrqponmlkjihgfedcba
+
 \ ------------------------------------------------------------------------
 TESTING DICTIONARY SEARCH RULES
 

diff --git a/MSP430-FORTH/RTC.f b/MSP430-FORTH/RTC.f
index 107ad25..e4fa445 100644 (file)
--- a/MSP430-FORTH/RTC.f
+++ b/MSP430-FORTH/RTC.f
@@ -141,10 +141,12 @@ CREATE ABUF 20 ALLOT
 : GET_TIME
     ECHO
     CR CR ."    DATE (DMY): "
-[DEFINED] LOAD" [IF]    \ ACCEPT is a dEFERed word and redirected to SD_ACCEPT!
-    ABUF ABUF 20 (ACCEPT) EVALUATE CR 3 SPACES DATE!
+[DEFINED] LOAD" [IF]    \ " \ ACCEPT is a dEFERed word and redirected to SD_ACCEPT!
+    ABUF ABUF 20 ['] ACCEPT >BODY EXECUTE \ execute default value of ACCEPT
+    EVALUATE CR 3 SPACES DATE!
     CR CR ."    TIME (HMS): "
-    ABUF ABUF 20 (ACCEPT) EVALUATE CR 3 SPACES TIME!
+    ABUF ABUF 20 ['] ACCEPT >BODY EXECUTE \ execute default value of ACCEPT
+    EVALUATE CR 3 SPACES TIME!
 [ELSE]                  \ ACCEPT is not a DEFERed word
     ABUF ABUF 20 ACCEPT EVALUATE CR 3 SPACES DATE!
     CR CR ."    TIME (HMS): "

diff --git a/MSP430-FORTH/SD_TEST.f b/MSP430-FORTH/SD_TEST.f
index 81fa0d0..1c622c1 100644 (file)
--- a/MSP430-FORTH/SD_TEST.f
+++ b/MSP430-FORTH/SD_TEST.f
@@ -171,7 +171,7 @@ LO2HI
                                     WRITE" YOURFILE.TXT"
                                     ['] SD_EMIT IS EMIT
                                     PROGRAMSTART HERE OVER - DUMP
-                                    ['] (EMIT) IS EMIT
+                                    ['] EMIT >BODY IS EMIT
                                     CLOSE
                                 ELSE 1 - ?DUP
                                     0= IF
@@ -179,7 +179,7 @@ LO2HI
                                         ['] SD_EMIT IS EMIT
                                         CR
                                         PROGRAMSTART HERE OVER - DUMP
-                                        ['] (EMIT) IS EMIT
+                                        ['] EMIT >BODY IS EMIT
                                         CLOSE
                                     ELSE 1 - ?DUP
                                         0= IF

diff --git a/config/scite/AS_MSP430/forth.properties b/config/scite/AS_MSP430/forth.properties
index 45a2cc4..0a8958a 100644 (file)
--- a/config/scite/AS_MSP430/forth.properties
+++ b/config/scite/AS_MSP430/forth.properties
@@ -42,17 +42,17 @@ dup ?dup drop rot swap over @ ! 2@ 2! 2dup 2drop 2swap 2over nip r@ >r r> 2r@ 2>
     (cr) (EMIT) (accept) (warm) is lit warm depth /mod mod \
     space spaces bl word char fill key? key  abort */ 2* 2/ /mod cell+ cells char+ \
     chars move abs hex decimal hold <# # #s #> sign or \
-    count type . u. dump (.") >number ' immediate exit recurse here allot , \
+    count type . u. dump (.") >number ' exit recurse here allot , \
     c, branch 0branch  ?branch align aligned create does> \
     variable constant defer definitions forth forget only also previous literal \
     source evaluate word interpret quit >body execute find state base \
-    immediate words  accept emit cr type echo noecho min max true false \
+    words  accept emit cr type echo noecho min max true false \
     char [char] postpone ['] rst_here rst_state wipe pwr_here  pwr_state \
-    assembler close
+    assembler close pad caps_on caps_off
 
 # defwords
 keywords3.$(file.patterns.forth)=\
-code endcode  :  ;  \
+code endcode  :  ;  immediate ;noname codennm \
 lo2hi hi2lo colon asm endasm \
 [if] [else] [then] [undefined] [defined]
 
@@ -98,7 +98,7 @@ style.forth.3=fore:#FFFFFF
 style.forth.4=fore:#0000FF
 
 # Keywords (keyword2_SCE_FORTH_KEYWORD)
-style.forth.5=fore:#FF0FF,$(font.base)
+style.forth.5=fore:#FF00FF,$(font.base)
 
 # defwords (keyword3_SCE_FORTH_DEFWORD)
 style.forth.6=fore:#FFFF00,$(font.base)