From 16f652e297a0d27f45902c45cc00c0a7a2662128 Mon Sep 17 00:00:00 2001 From: David Schmenk Date: Tue, 9 Jan 2018 19:55:52 -0800 Subject: [PATCH] Add CHAR and VAR as aliases for BYTE and WORD --- src/libsrc/memmgr.pla | 4 ++-- src/toolsrc/lex.c | 2 ++ src/toolsrc/plasm.pla | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/libsrc/memmgr.pla b/src/libsrc/memmgr.pla index 3242992..e310b30 100755 --- a/src/libsrc/memmgr.pla +++ b/src/libsrc/memmgr.pla @@ -105,9 +105,9 @@ byte hexchar = '0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F' // // Fill block filename // -def strcharadd(str, char)#0 +def strcharadd(str, chr)#0 ^str = ^str + 1 - str->.[^str] = char + str->.[^str] = chr end def swapfile(filestr, hmem)#0 memcpy(filestr, @swapvol, swapvol + 1) diff --git a/src/toolsrc/lex.c b/src/toolsrc/lex.c index d9cc7d4..ae018dd 100755 --- a/src/toolsrc/lex.c +++ b/src/toolsrc/lex.c @@ -48,7 +48,9 @@ t_token keywords[] = { LOGIC_AND_TOKEN, 'A', 'N', 'D', LOGIC_OR_TOKEN, 'O', 'R', BYTE_TOKEN, 'B', 'Y', 'T', 'E', + BYTE_TOKEN, 'C', 'H', 'A', 'R', WORD_TOKEN, 'W', 'O', 'R', 'D', + WORD_TOKEN, 'V', 'A', 'R', CONST_TOKEN, 'C', 'O', 'N', 'S', 'T', STRUC_TOKEN, 'S', 'T', 'R', 'U', 'C', PREDEF_TOKEN, 'P', 'R', 'E', 'D', 'E', 'F', diff --git a/src/toolsrc/plasm.pla b/src/toolsrc/plasm.pla index 67481b5..e8fbb9e 100644 --- a/src/toolsrc/plasm.pla +++ b/src/toolsrc/plasm.pla @@ -150,8 +150,10 @@ byte = "DEF", DEF_TKN byte = "END", END_TKN byte = "AND", LOGIC_AND_TKN byte = "NOT", LOGIC_NOT_TKN -byte = "BYTE", BYTE_TKN +byte = "VAR", WORD_TKN byte = "WORD", WORD_TKN +byte = "CHAR", BYTE_TKN +byte = "BYTE", BYTE_TKN byte = "ELSE", ELSE_TKN byte = "NEXT", NEXT_TKN byte = "WHEN", CASE_TKN