Bruce/tomo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Phase out strchrnul

Browse Source
This commit is contained in:
Bruce Hill 2025-03-27 20:44:23 -04:00
parent 1147241f18
commit 7b55f180e2
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/parse.c
View File

@ -382,6 +382,10 @@ const char *get_id(const char **inout) {
return word; return word;
} }
static const char *eol(const char *str) {
return str + strcspn(str, "\r\n");
}
bool comment(const char **pos) { bool comment(const char **pos) {
if ((*pos)[0] == '#') { if ((*pos)[0] == '#') {
*pos += strcspn(*pos, "\r\n"); *pos += strcspn(*pos, "\r\n");
@ -1402,7 +1406,7 @@ PARSER(parse_text) {
// Multi-line split // Multi-line split
continue; continue;
} else { } else {
parser_err(ctx, pos, strchrnul(pos, '\n'), "This multi-line string should be either indented or have '..' at the front"); parser_err(ctx, pos, eol(pos), "This multi-line string should be either indented or have '..' at the front");
} }
} else { // Plain character } else { // Plain character
chunk = CORD_cat_char(chunk, *pos); chunk = CORD_cat_char(chunk, *pos);
@ -1790,7 +1794,7 @@ static ast_t *parse_infix_expr(parse_ctx_t *ctx, const char *pos, int min_tightn
whitespace(&pos); whitespace(&pos);
if (get_line_number(ctx->file, pos) != starting_line && get_indent(ctx, pos) < starting_indent) if (get_line_number(ctx->file, pos) != starting_line && get_indent(ctx, pos) < starting_indent)
parser_err(ctx, pos, strchrnul(pos, '\n'), "I expected this line to be at least as indented than the line above it"); parser_err(ctx, pos, eol(pos), "I expected this line to be at least as indented than the line above it");
ast_t *rhs = parse_infix_expr(ctx, pos, op_tightness[op] + 1); ast_t *rhs = parse_infix_expr(ctx, pos, op_tightness[op] + 1);
if (!rhs) break; if (!rhs) break;
@ -1824,7 +1828,7 @@ PARSER(parse_declaration) {
if (optional(ctx, &pos, parse_use)) if (optional(ctx, &pos, parse_use))
parser_err(ctx, start, pos, "'use' statements are only allowed at the top level of a file"); parser_err(ctx, start, pos, "'use' statements are only allowed at the top level of a file");
else else
parser_err(ctx, pos, strchrnul(pos, '\n'), "This is not a valid expression"); parser_err(ctx, pos, eol(pos), "This is not a valid expression");
} }
return NewAST(ctx->file, start, pos, Declare, .var=var, .value=val); return NewAST(ctx->file, start, pos, Declare, .var=var, .value=val);
} }
@ -1966,17 +1970,17 @@ PARSER(parse_block) {
if (!stmt) { if (!stmt) {
const char *line_start = pos; const char *line_start = pos;
if (match_word(&pos, "struct")) if (match_word(&pos, "struct"))
parser_err(ctx, line_start, strchrnul(pos, '\n'), "Struct definitions are only allowed at the top level"); parser_err(ctx, line_start, eol(pos), "Struct definitions are only allowed at the top level");
else if (match_word(&pos, "enum")) else if (match_word(&pos, "enum"))
parser_err(ctx, line_start, strchrnul(pos, '\n'), "Enum definitions are only allowed at the top level"); parser_err(ctx, line_start, eol(pos), "Enum definitions are only allowed at the top level");
else if (match_word(&pos, "func")) else if (match_word(&pos, "func"))
parser_err(ctx, line_start, strchrnul(pos, '\n'), "Function definitions are only allowed at the top level"); parser_err(ctx, line_start, eol(pos), "Function definitions are only allowed at the top level");
else if (match_word(&pos, "use")) else if (match_word(&pos, "use"))
parser_err(ctx, line_start, strchrnul(pos, '\n'), "'use' statements are only allowed at the top level"); parser_err(ctx, line_start, eol(pos), "'use' statements are only allowed at the top level");
spaces(&pos); spaces(&pos);
if (*pos && *pos != '\r' && *pos != '\n') if (*pos && *pos != '\r' && *pos != '\n')
parser_err(ctx, pos, strchrnul(pos, '\n'), "I couldn't parse this line"); parser_err(ctx, pos, eol(pos), "I couldn't parse this line");
break; break;
} }
statements = new(ast_list_t, .ast=stmt, .next=statements); statements = new(ast_list_t, .ast=stmt, .next=statements);
@ -1985,7 +1989,7 @@ PARSER(parse_block) {
// Guard against having two valid statements on the same line, separated by spaces (but no newlines): // Guard against having two valid statements on the same line, separated by spaces (but no newlines):
if (!memchr(stmt->end, '\n', (size_t)(pos - stmt->end))) { if (!memchr(stmt->end, '\n', (size_t)(pos - stmt->end))) {
if (*pos) if (*pos)
parser_err(ctx, pos, strchrnul(pos, '\n'), "I don't know how to parse the rest of this line"); parser_err(ctx, pos, eol(pos), "I don't know how to parse the rest of this line");
pos = stmt->end; pos = stmt->end;
break; break;
} }
@ -2028,8 +2032,8 @@ PARSER(parse_namespace) {
// break; // break;
// } // }
} else { } else {
if (get_indent(ctx, next) > indent && next < strchrnul(next, '\n')) if (get_indent(ctx, next) > indent && next < eol(next))
parser_err(ctx, next, strchrnul(next, '\n'), "I couldn't parse this namespace declaration"); parser_err(ctx, next, eol(next), "I couldn't parse this namespace declaration");
break; break;
} }
} }
@ -2065,7 +2069,7 @@ PARSER(parse_file_body) {
} }
whitespace(&pos); whitespace(&pos);
if (pos < ctx->file->text + ctx->file->len && *pos != '\0') { if (pos < ctx->file->text + ctx->file->len && *pos != '\0') {
parser_err(ctx, pos, strchrnul(pos, '\n'), "I expect all top-level statements to be declarations of some kind"); parser_err(ctx, pos, eol(pos), "I expect all top-level statements to be declarations of some kind");
} }
REVERSE_LIST(statements); REVERSE_LIST(statements);
return NewAST(ctx->file, start, pos, Block, .statements=statements); return NewAST(ctx->file, start, pos, Block, .statements=statements);

6
src/stdlib/files.c
View File

@ -70,7 +70,7 @@ public char *file_base_name(const char *path)
const char *slash = strrchr(path, '/'); const char *slash = strrchr(path, '/');
if (slash) path = slash + 1; if (slash) path = slash + 1;
assert(!isdigit(*path)); assert(!isdigit(*path));
const char *end = strchrnul(path, '.'); const char *end = path + strcspn(path, ".");
size_t len = (size_t)(end - path); size_t len = (size_t)(end - path);
char *buf = GC_MALLOC_ATOMIC(len+1); char *buf = GC_MALLOC_ATOMIC(len+1);
strncpy(buf, path, len); strncpy(buf, path, len);
@ -83,7 +83,7 @@ public char *file_base_id(const char *path)
const char *slash = strrchr(path, '/'); const char *slash = strrchr(path, '/');
if (slash) path = slash + 1; if (slash) path = slash + 1;
assert(!isdigit(*path)); assert(!isdigit(*path));
const char *end = strchrnul(path, '.'); const char *end = path + strcspn(path, ".");
size_t len = (size_t)(end - path); size_t len = (size_t)(end - path);
char *buf = GC_MALLOC_ATOMIC(len+1); char *buf = GC_MALLOC_ATOMIC(len+1);
strncpy(buf, path, len); strncpy(buf, path, len);
@ -307,7 +307,7 @@ public int highlight_error(file_t *file, const char *start, const char *end, con
printed += fprintf(stderr, "\n"); printed += fprintf(stderr, "\n");
const char *eol = strchrnul(line, '\n'); const char *eol = line + strcspn(line, "\r\n");
if (print_carets && start >= line && start < eol && line <= start) { if (print_carets && start >= line && start < eol && line <= start) {
for (int num = 0; num < digits; num++) for (int num = 0; num < digits; num++)
printed += fputc(' ', stderr); printed += fputc(' ', stderr);

2
src/stdlib/stdlib.c
View File

@ -479,7 +479,7 @@ public void print_stack_trace(FILE *out, int start, int stop)
char **strings = strings = backtrace_symbols(stack, size); char **strings = strings = backtrace_symbols(stack, size);
for (int64_t i = start; i < size - stop; i++) { for (int64_t i = start; i < size - stop; i++) {
char *filename = strings[i]; char *filename = strings[i];
char *paren = strchrnul(strings[i], '('); char *paren = strings[i] + strcspn(strings[i], "(");
char *addr_end = paren + 1 + strcspn(paren + 1, ")"); char *addr_end = paren + 1 + strcspn(paren + 1, ")");
ptrdiff_t offset = strtol(paren + 1, &addr_end, 16) - 1; ptrdiff_t offset = strtol(paren + 1, &addr_end, 16) - 1;
const char *cmd = heap_strf("addr2line -e %.*s -is +0x%x", strcspn(filename, "("), filename, offset); const char *cmd = heap_strf("addr2line -e %.*s -is +0x%x", strcspn(filename, "("), filename, offset);