Simplify terminate + bye + fix build.

This commit is contained in:
Brad Nelson
2022-12-31 21:02:04 -08:00
parent d60606b4c8
commit 1c500c2233
11 changed files with 14 additions and 27 deletions

View File

@ -86,7 +86,7 @@ static cell_t ResizeFile(cell_t fd, cell_t size);
#define REQUIRED_SYSTEM_SUPPORT \
X("MS-TICKS", MS_TICKS, PUSH millis()) \
XV(internals, "RAW-YIELD", RAW_YIELD, yield()) \
Y(TERMINATE, exit(n0))
XV(internals, "RAW-TERMINATE", RAW_TERMINATE, exit(n0))
#define REQUIRED_SERIAL_SUPPORT \
XV(serial, "Serial.begin", SERIAL_BEGIN, Serial.begin(tos); DROP) \

View File

@ -21,7 +21,6 @@ forth definitions
( Set up Basic I/O )
internals definitions also serial
: esp32-bye 0 terminate ;
: serial-type ( a n -- ) Serial.write drop ;
: serial-key ( -- n )
begin pause Serial.available until 0 >r rp@ 1 Serial.readBytes drop r> ;
@ -33,7 +32,7 @@ also forth definitions
' default-type is type
' default-key is key
' default-key? is key?
' esp32-bye is bye
' raw-terminate is terminate
only forth definitions
also ledc also serial also SPIFFS

View File

@ -97,7 +97,7 @@ static cell_t *simulated(cell_t *sp, const char *op) {
} else if (op == STR_SERIAL_AVAILABLE) {
*++sp = 1;
return sp;
} else if (op == STR_TERMINATE) {
} else if (op == STR_RAW_TERMINATE) {
exit(*sp--);
return sp;
} else if (op == STR_R_O) {