From 89cb9ef00ed67b0705a532d052e79d4ad0efa7b7 Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 11 Sep 2026 19:46:19 +0000 Subject: Tests to get coverage of module.c FossilOrigin-Name: a711bc8cdf63cce84b3322b4396c277ec72697696555d1dac3d22aa54f4794c6 --- src/lib/aplwc_internal.h | 6 +++--- src/lib/module.c | 7 ++----- src/lib/syntax.c | 1 - 3 files changed, 5 insertions(+), 9 deletions(-) (limited to 'src/lib') diff --git a/src/lib/aplwc_internal.h b/src/lib/aplwc_internal.h index 0bdd5b5..328b5de 100644 --- a/src/lib/aplwc_internal.h +++ b/src/lib/aplwc_internal.h @@ -32,11 +32,11 @@ typedef int symbol_t; enum keyword { KW_MODULE, KW_SYMBOL, - KW_EXPORT, - - N_KWDS + KW_EXPORT }; +#define N_KWDS KW_EXPORT+1 + struct aplwc { struct aplwc_fns fns; enum aplwc_rc last_error; diff --git a/src/lib/module.c b/src/lib/module.c index c7e552f..2ef5ba3 100644 --- a/src/lib/module.c +++ b/src/lib/module.c @@ -65,7 +65,7 @@ read_keyword_decl(struct aplwc *aplwc, struct aplwc_module *module, size_t offse #define t(n) module->tokens->tokens[offset+(n)] - max = module->tokens->length - offset; + max = module->tokens->length - offset - 1; assert(t(0).tag == TOKEN_TAG_KEYWORD); switch(t(0).data.keyword){ @@ -103,12 +103,9 @@ fail: } } break; - default: - assert(0); - return -1; } - if((len >= 0) && (max > (size_t)len)) + if(ALWAYS(len >= 0) && (max > (size_t)len)) if(t(len+1).tag != TOKEN_TAG_NEWLINE) goto fail; len++; /* For the keyword itself */ diff --git a/src/lib/syntax.c b/src/lib/syntax.c index 5c340bc..4850b1a 100644 --- a/src/lib/syntax.c +++ b/src/lib/syntax.c @@ -520,7 +520,6 @@ keyword_init(struct aplwc *aplwc) case KW_MODULE: cstr = "module"; break; case KW_SYMBOL: cstr = "symbol"; break; case KW_EXPORT: cstr = "export"; break; - case N_KWDS: assert(0); break; } if((str = chars_to_string(aplwc, cstr, -1)) == NULL) -- cgit v1.2.3