From e8e4e35c08cb34f50c27107b65ef92771e84f8fb Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 27 Dec 2018 10:42:39 +0100 Subject: [PATCH] #130 clean up alias for some words, remove BL, add WIPE --- inc/defconf.inc | 20 ++++++++++---------- lib/CURRENT | 1 + lib/VOC | 1 + test/board.fs | 4 ++-- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/inc/defconf.inc b/inc/defconf.inc index a62bdfb..227bd96 100644 --- a/inc/defconf.inc +++ b/inc/defconf.inc @@ -81,12 +81,12 @@ UNLINK_TXSTOR = 0 ; "TX!" UNLINK_QKEY = 0 ; "?KEY" UNLINK_EMIT = 0 ; "EMIT" - UNLINK_DOLIT = 0 ; "doLit" + UNLINK_DOLIT = 1 ; "doLit" UNLINK_DOPLOOP = 1 ; "(+loop)" UNLINK_LEAVE = 0 ; "LEAVE" - UNLINK_DONXT = 0 ; "donxt" - UNLINK_QBRAN = 0 ; "?branch" - UNLINK_BRAN = 0 ; "branch" + UNLINK_DONXT = 1 ; "donxt" + UNLINK_QBRAN = 1 ; "?branch" + UNLINK_BRAN = 1 ; "branch" UNLINK_EXECU = 0 ; "EXECUTE" UNLINK_EXIT = 0 ; "EXIT" REMOVE_EXIT = 0 ; remove "EXIT" @@ -101,7 +101,7 @@ UNLINK_CSTOR = 0 ; "C!" UNLINK_IGET = 0 ; "I" UNLINK_RFROM = 0 ; "R>" - UNLINK_DOVAR = 0 ; "doVar" + UNLINK_DOVAR = 1 ; "doVar" UNLINK_RAT = 0 ; "R@" UNLINK_TOR = 0 ; ">R" UNLINK_NIP = 0 ; "NIP" @@ -129,7 +129,7 @@ UNLINK_LAST = 0 ; "last" UNLINK_TIB = 1 ; "TIB" UNLINK_OUTA = 0 ; "OUT" - UNLINK_BLANK = 0 ; "BL" + UNLINK_BLANK = 1 ; "BL" UNLINK_ZERO = 0 ; "0" UNLINK_ONE = 0 ; "1" UNLINK_MONE = 0 ; "-1" @@ -209,7 +209,7 @@ UNLINK_UDOT = 0 ; "U." UNLINK_DOT = 0 ; "." UNLINK_QUEST = 0 ; "?" - UNLINK_PARS = 1 ; "pars" + UNLINK_PARS = 1 ; "SPARSE" UNLINK_PARSE = 1 ; "PARSE" UNLINK_DOTPR = 0 ; ".(" UNLINK_PAREN = 0 ; "(" @@ -252,7 +252,7 @@ UNLINK_IFF = 0 ; "IF" UNLINK_THENN = 0 ; "THEN" UNLINK_ELSE = 0 ; "ELSE" - UNLINK_AHEAD = 0 ; "AHEAD" + UNLINK_AHEAD = 1 ; "AHEAD" UNLINK_WHILE = 0 ; "WHILE" UNLINK_REPEA = 0 ; "REPEAT" UNLINK_AFT = 0 ; "AFT" @@ -266,7 +266,7 @@ UNLINK_COLON = 0 ; ":" UNLINK_RBRAC = 0 ; "]" UNLINK_DOESS = 0 ; "DOES>" - UNLINK_DODOES = 0 ; "dodoes" + UNLINK_DODOES = 1 ; "dodoes" UNLINK_CREAT = 0 ; "CREATE" UNLINK_CONST = 0 ; "CONSTANT" UNLINK_DOCON = 1 ; "docon" @@ -301,4 +301,4 @@ UNLINK_RESETT = 0 ; "RESET" UNLINK_SAVEC = 0 ; "SAVEC" UNLINK_RESTC = 0 ; "IRET" - UNLINK_WIPE = 1 ; "WIPE" + UNLINK_WIPE = 0 ; "WIPE" diff --git a/lib/CURRENT b/lib/CURRENT index c807f02..b971ffb 100644 --- a/lib/CURRENT +++ b/lib/CURRENT @@ -41,6 +41,7 @@ WIPE #require MARKER #require ALIAS #require :NVM +#require BL #require ULOCKF #require LOCKF diff --git a/lib/VOC b/lib/VOC index 65151cd..1c5ccdb 100644 --- a/lib/VOC +++ b/lib/VOC @@ -56,6 +56,7 @@ RAM #require ABORT" #require LAST #require COMPILE +#require BL NVM diff --git a/test/board.fs b/test/board.fs index c83d3a8..3b3a15c 100644 --- a/test/board.fs +++ b/test/board.fs @@ -1,7 +1,7 @@ #include utils/tester.fs \ expected vocabulary (including tester.fs) -T{e WORDS e-> 954 -2373 }T +T{e WORDS e-> 918 -5723 }T \ core: string with capured EMIT : test-."" ." abc123" ; @@ -177,7 +177,7 @@ RAM T{ 400 CD>TEST cdram -> }T T{ cdram -> 800 }T -T{e WORDS e-> 990 728 }T +T{e WORDS e-> 954 -2622 }T \ compile CURRENT and VOC as a test