Skip to content

fix(scanner): address -Wswitch-outside-range warnings when char is unsigned #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jamessan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(scanner): address -Wswitch-outside-range warnings when char is unsigned #42

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/scanner.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,11 @@ typedef enum {

// clang-format on

#define SCN_SUCC 1
#define SCN_STOP 0
#define SCN_FAIL (-1)
typedef enum {
SCN_FAIL = -1,
SCN_STOP,
SCN_SUCC,
} ScanStatus;

#define IND_ROT 'r'
#define IND_MAP 'm'
Expand Down Expand Up @@ -326,7 +328,7 @@ static inline bool is_ns_tag_char(int32_t c) {

static inline bool is_ns_anchor_char(int32_t c) { return is_ns_char(c) && !is_c_flow_indicator(c); }

static char scn_uri_esc(Scanner *scanner, TSLexer *lexer) {
static ScanStatus scn_uri_esc(Scanner *scanner, TSLexer *lexer) {
if (lexer->lookahead != '%') {
return SCN_STOP;
}
Expand All @@ -343,15 +345,15 @@ static char scn_uri_esc(Scanner *scanner, TSLexer *lexer) {
return SCN_SUCC;
}

static char scn_ns_uri_char(Scanner *scanner, TSLexer *lexer) {
static ScanStatus scn_ns_uri_char(Scanner *scanner, TSLexer *lexer) {
if (is_ns_uri_char(lexer->lookahead)) {
adv(scanner, lexer);
return SCN_SUCC;
}
return scn_uri_esc(scanner, lexer);
}

static char scn_ns_tag_char(Scanner *scanner, TSLexer *lexer) {
static ScanStatus scn_ns_tag_char(Scanner *scanner, TSLexer *lexer) {
if (is_ns_tag_char(lexer->lookahead)) {
adv(scanner, lexer);
return SCN_SUCC;
Expand Down Expand Up @@ -778,7 +780,7 @@ static bool scn_blk_str_cnt(Scanner *scanner, TSLexer *lexer, TSSymbol result_sy
RET_SYM(result_symbol);
}

static char scn_pln_cnt(Scanner *scanner, TSLexer *lexer, bool (*is_plain_safe)(int32_t)) {
static ScanStatus scn_pln_cnt(Scanner *scanner, TSLexer *lexer, bool (*is_plain_safe)(int32_t)) {
bool is_cur_wsp = is_wsp(scanner->cur_chr);
bool is_cur_saf = is_plain_safe(scanner->cur_chr);
bool is_lka_wsp = is_wsp(lexer->lookahead);
Expand Down