From b3988ca71e0ff4222853436d26f6eb625b90f6f1 Mon Sep 17 00:00:00 2001 From: fpjohnston Date: Sat, 3 Jun 2023 22:26:35 -0400 Subject: [PATCH] Updated version number to 200.36.1. Updated lib/show.tec for recent changes to flags. Adjusted comments in a couple of test scripts. Fixed Doxygen warnings. --- etc/pattern/exec.h | 4 ---- include/estack.h | 8 -------- include/exec.h | 4 ---- include/teco.h | 10 ---------- include/version.h | 2 +- lib/show.tec | 17 +++++++++-------- src/cmd_estack.c | 4 ++-- src/cmd_exec.c | 4 ++-- src/display.c | 4 ++-- src/memory.c | 4 ++-- src/qreg.c | 4 ++-- test/scripts/O/O_02a.test | 2 +- test/scripts/O/O_02b.test | 2 +- 13 files changed, 22 insertions(+), 47 deletions(-) diff --git a/etc/pattern/exec.h b/etc/pattern/exec.h index 4527d77d..2ff79d5d 100644 --- a/etc/pattern/exec.h +++ b/etc/pattern/exec.h @@ -109,12 +109,8 @@ extern bool next_yank(void); extern bool read_EI(void); -extern void reset_if(void); - extern void reset_indirect(void); -extern void reset_loop(void); - extern void reset_search(void); extern bool skip_cmd(struct cmd *cmd, const char *skip); diff --git a/include/estack.h b/include/estack.h index 15b4519e..2468ac12 100644 --- a/include/estack.h +++ b/include/estack.h @@ -86,16 +86,8 @@ extern void scan_x(struct cmd *cmd); extern void store_add(void); -extern void store_and(void); - -extern void store_complement(void); - -extern void store_mul(void); - extern void store_oper(enum x_oper type); -extern void store_or(void); - extern void store_sub(void); extern void store_val(int_t value); diff --git a/include/exec.h b/include/exec.h index 3e398c95..d1f5b441 100644 --- a/include/exec.h +++ b/include/exec.h @@ -477,12 +477,8 @@ extern bool next_yank(void); extern bool read_EI(void); -extern void reset_if(void); - extern void reset_indirect(void); -extern void reset_loop(void); - extern void reset_search(void); extern bool skip_cmd(struct cmd *cmd, const char *skip); diff --git a/include/teco.h b/include/teco.h index 01c6342d..01f6ced0 100644 --- a/include/teco.h +++ b/include/teco.h @@ -284,12 +284,6 @@ extern void *expand_mem(void *p1, uint_t size, uint_t delta); extern void free_mem(void *ptr); -extern uint getloop_base(void); - -extern uint getloop_depth(void); - -extern uint_t getloop_start(void); - extern void init_env(void); extern void init_options(int argc, const char * const argv[]); @@ -300,10 +294,6 @@ extern void print_size(uint_t size); extern void reset_map(void); -extern void setloop_depth(uint depth); - -extern void setloop_base(uint base); - extern void *shrink_mem(void *p1, uint_t size, uint_t delta); extern int teco_env(int n, bool colon); diff --git a/include/version.h b/include/version.h index 14f229be..57fc0682 100644 --- a/include/version.h +++ b/include/version.h @@ -34,7 +34,7 @@ enum release_version ///< TECO release version numbers { major_version = 200, minor_version = 36, - patch_version = 0 + patch_version = 1 }; #endif // !defined(_VERSION_H) diff --git a/lib/show.tec b/lib/show.tec index 3b083228..64f2a04c 100644 --- a/lib/show.tec +++ b/lib/show.tec @@ -54,11 +54,11 @@ E1 U1 ! Save extended features flag ! E2:@=/E2 = 0x%x: / E2&1 "N @^A/zero / ' E2&2 "N @^A/oper / ' - E2&4 "N @^A/atsign / ' - E2&8 "N @^A/colon / ' - E2&16 "N @^A/comma / ' - E2&32 "N @^A/m_arg / ' - E2&64 "N @^A/n_arg / ' + E2&4 "N @^A/number / ' + E2&8 "N @^A/m_arg / ' + E2&16 "N @^A/n_arg / ' + E2&32 "N @^A/colon / ' + E2&64 "N @^A/atsign / ' E2&128 "N @^A/loop / ' E2&256 "N @^A/quote / ' E2&512 "N @^A/page / ' @@ -74,6 +74,7 @@ E1 U1 ! Save extended features flag ! E3&8 "N @^A/CR_out / ' E3&16 "N @^A/noin / ' E3&32 "N @^A/noout / ' + E3&64 "N @^A/unicode / ' E3&128 "N @^A/keepnul / ' E3&256 "N @^A/CR_type / ' -1^T @@ -110,9 +111,9 @@ E1 U1 ! Save extended features flag ! @^A/concise/ ' ' - EH&4 "N @^A/what / ' - EH&8 "N @^A/where / ' - EH&16 "N @^A/who / ' + EH&4 "N @^A/ what/ ' + EH&8 "N @^A/ where/ ' + EH&16 "N @^A/ who/ ' -1^T } diff --git a/src/cmd_estack.c b/src/cmd_estack.c index e177d7d7..5dba37ed 100644 --- a/src/cmd_estack.c +++ b/src/cmd_estack.c @@ -40,11 +40,11 @@ #if defined(INLINE) #undef INLINE -#define INLINE inline +#define INLINE inline ///< Enable inline functions #else -#define INLINE +#define INLINE ///< Disable inline functions #endif diff --git a/src/cmd_exec.c b/src/cmd_exec.c index cd0be90b..180ae3fe 100644 --- a/src/cmd_exec.c +++ b/src/cmd_exec.c @@ -45,11 +45,11 @@ #if defined(INLINE) #undef INLINE -#define INLINE inline +#define INLINE inline ///< Enable inline functions #else -#define INLINE +#define INLINE ///< Disable inline functions #endif diff --git a/src/display.c b/src/display.c index 5585cb3c..9a635301 100644 --- a/src/display.c +++ b/src/display.c @@ -44,11 +44,11 @@ #if defined(INLINE) #undef INLINE -#define INLINE inline +#define INLINE inline ///< Enable inline functions #else -#define INLINE +#define INLINE ///< Disable inline functions #endif diff --git a/src/memory.c b/src/memory.c index c28d9c15..3e71239e 100644 --- a/src/memory.c +++ b/src/memory.c @@ -45,13 +45,13 @@ #if DEBUG != 2 && DEBUG != 3 #undef DEBUG - #define DEBUG 1 + #define DEBUG 1 ///< Enable basic debugging features #endif #else - #define DEBUG 0 + #define DEBUG 0 ///< Disable debugging features #endif diff --git a/src/qreg.c b/src/qreg.c index db05ec8f..6896dc22 100644 --- a/src/qreg.c +++ b/src/qreg.c @@ -41,11 +41,11 @@ #if defined(INLINE) #undef INLINE -#define INLINE inline +#define INLINE inline ///< Enable inline functions #else -#define INLINE +#define INLINE ///< Disable inline functions #endif diff --git a/test/scripts/O/O_02a.test b/test/scripts/O/O_02a.test index df94efcc..afd4e210 100644 --- a/test/scripts/O/O_02a.test +++ b/test/scripts/O/O_02a.test @@ -2,7 +2,7 @@ ! Function: Branch to null tag ! ! Command: O ! -! TECO: ?NOT ! +! TECO-64: ?NOT ! [[enter]] diff --git a/test/scripts/O/O_02b.test b/test/scripts/O/O_02b.test index 47769531..870a683d 100644 --- a/test/scripts/O/O_02b.test +++ b/test/scripts/O/O_02b.test @@ -2,7 +2,7 @@ ! Function: Branch to null tag ! ! Command: O ! -! TECO: ?NOT ! +! TECO-64: ?NOT ! [[enter]]