roodletoof/cig
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wreck everyting

Browse Source
This commit is contained in:
Ivar Fatland
2026-03-25 22:11:16 +01:00
parent de5a5cd9c2
commit 0d5a2b8115
3 changed files with 79 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cig.h
+34 -37
View File
@@ -321,12 +321,7 @@ int cli_req_int_func(args_t args, const char *flag_name, const char *file, int l
) \ ) \
if (CLI_UNIQUE1) if (CLI_UNIQUE1)
// scanner ///////////////////////////////////////////////////////////////////// // scan /////////////////////////////////////////////////////////////////////
typedef struct error_node {
char *msg;
struct error_node *next;
} error_node_t;
typedef union scan_value { typedef union scan_value {
int digit; int digit;
@@ -344,48 +339,50 @@ typedef union scan_value {
char *string_literal; char *string_literal;
} scan_value_t; } scan_value_t;
typedef struct scanner { typedef struct scan {
const char *name; // name of the buffer const char *name; // name of the buffer
const char *start; // pointer to the full buffer const char *start; // pointer to the full buffer
const char *cur; // current pointer const char *cur; // current pointer
scan_value_t value;
error_node_t *errors; // singly linked list of error strings
allocator_t allocator; allocator_t allocator;
} scanner_t; } scan_t;
// TODO: replace implementations to use this. also put the value here. make separate error message type and make union with the value. typedef struct scan_error {
typedef struct scanner_result {
bool ok;
const char *filename; const char *filename;
int line; int line;
int column; int column;
const char *not_ok_message; const char *error_message;
} scanner_result_t; } scan_error_t;
scanner_t make_scanner(const char *name, const char *buffer, allocator_t allocator); typedef struct scan_result {
void scanner_recover(scanner_t *s); bool ok;
void scanner_error(scanner_t *s, const char *message); union {
void scanner_error_and_recover(scanner_t *s, const char *message); scan_error_t error;
scanner_result_t scan_eof(scanner_t *s); scan_value_t value;
scanner_result_t scan_literal(scanner_t *s, const char *lit); };
int scan_repeat_literal(scanner_t *s, const char *lit); } scan_result_t;
scanner_result_t scan_whitespace(scanner_t *s);
scanner_result_t scan_digit(scanner_t *s); scan_t make_scan(const char *name, const char *buffer, allocator_t allocator);
scanner_result_t scan_i64(scanner_t *s); void scan_next_line(scan_t *s);
scanner_result_t scan_i32(scanner_t *s); scan_result_t scan_eof(scan_t *s);
scanner_result_t scan_i16(scanner_t *s); scan_result_t scan_literal(scan_t *s, const char *lit);
scanner_result_t scan_i8(scanner_t *s); int scan_repeat_literal(scan_t *s, const char *lit);
scanner_result_t scan_u64(scanner_t *s); scan_result_t scan_whitespace(scan_t *s);
scanner_result_t scan_u32(scanner_t *s); scan_result_t scan_digit(scan_t *s);
scanner_result_t scan_u16(scanner_t *s); scan_result_t scan_i64(scan_t *s);
scanner_result_t scan_u8(scanner_t *s); scan_result_t scan_i32(scan_t *s);
scanner_result_t scan_f64(scanner_t *s); scan_result_t scan_i16(scan_t *s);
scanner_result_t scan_f32(scanner_t *s); scan_result_t scan_i8(scan_t *s);
scan_result_t scan_u64(scan_t *s);
scan_result_t scan_u32(scan_t *s);
scan_result_t scan_u16(scan_t *s);
scan_result_t scan_u8(scan_t *s);
scan_result_t scan_f64(scan_t *s);
scan_result_t scan_f32(scan_t *s);
// Scan as much of an identifier as possible, you are responsible to scan for // Scan as much of an identifier as possible, you are responsible to scan for
// valid characters after the identifier is scanned. // valid characters after the identifier is scanned.
scanner_result_t scan_identifier(scanner_t *s); scan_result_t scan_identifier(scan_t *s);
scanner_result_t scan_string_literal(scanner_t *s); scan_result_t scan_string_literal(scan_t *s);
bool scanner_print_errors(scanner_t *s, FILE *fp); scan_value_t required(scan_result_t res);
// string builder ////////////////////////////////////////////////////////////// // string builder //////////////////////////////////////////////////////////////
typedef struct string_builder_node { typedef struct string_builder_node {
scanner.c
+45 -105
View File
@@ -4,19 +4,17 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
scanner_t make_scanner(const char *name, const char *buffer, allocator_t allocator) { scan_t make_scan(const char *name, const char *buffer, allocator_t allocator) {
scanner_t s = { scan_t s = {
.name = name, .name = name,
.start = buffer, .start = buffer,
.cur = buffer, .cur = buffer,
.value = {0},
.errors = NULL,
.allocator = allocator .allocator = allocator
}; };
return s; return s;
} }
void scanner_recover(scanner_t *s) { void scan_next_line(scan_t *s) {
while (*s->cur && *s->cur != '\n') { while (*s->cur && *s->cur != '\n') {
s->cur++; s->cur++;
} }
@@ -24,46 +22,11 @@ void scanner_recover(scanner_t *s) {
s->cur++; // move *past* the newline s->cur++; // move *past* the newline
} }
void scanner_error(scanner_t *s, const char *message) { scan_result_t scan_eof(scan_t *s) {
const char *error_pos = s->cur; // use current scanner position
// Compute line + column (1-based)
int line = 1, col = 1;
for (const char *p = s->start; p < error_pos; p++) {
if (*p == '\n') { line++; col = 1; }
else col++;
}
// need 40 bytes for pair of largest possible 64 bit values, then some for
// ':' and ' ' characters. Just rounded up to 64 because reasons.
size_t length = strlen(s->name) + 1 + strlen(message) + 1 + 64;
char *buf = allocator_alloc(s->allocator, length);
snprintf(
buf,
length,
"%s:%d:%d: %s",
s->name, line, col, message
);
error_node_t *node = allocator_alloc(s->allocator, sizeof(error_node_t));
node->msg = buf;
node->next = NULL;
if (!s->errors) {
s->errors = node;
} else {
error_node_t *p = s->errors;
while (p->next) p = p->next;
p->next = node;
}
}
void scanner_error_and_recover(scanner_t *s, const char *message) {
scanner_error(s, message);
scanner_recover(s);
}
bool scan_eof(scanner_t *s) {
return *s->cur == '\0'; return *s->cur == '\0';
} }
bool scan_literal(scanner_t *s, const char *lit) { bool scan_literal(scan_t *s, const char *lit) {
const char *save = s->cur; const char *save = s->cur;
while (*lit && *lit == *s->cur) { while (*lit && *lit == *s->cur) {
lit++; lit++;
@@ -76,7 +39,7 @@ bool scan_literal(scanner_t *s, const char *lit) {
return false; return false;
} }
int scan_repeat_literal(scanner_t *s, const char *lit) { int scan_repeat_literal(scan_t *s, const char *lit) {
int n_repeats = 0; int n_repeats = 0;
while (scan_literal(s, lit)) { while (scan_literal(s, lit)) {
n_repeats++; n_repeats++;
@@ -84,13 +47,13 @@ int scan_repeat_literal(scanner_t *s, const char *lit) {
return n_repeats; return n_repeats;
} }
bool scan_whitespace(scanner_t *s) { bool scan_whitespace(scan_t *s) {
const char *save = s->cur; const char *save = s->cur;
while (isspace((unsigned char)*s->cur)) s->cur++; while (isspace((unsigned char)*s->cur)) s->cur++;
return save != s->cur; return save != s->cur;
} }
bool scan_digit(scanner_t *s) { bool scan_digit(scan_t *s) {
if (!isdigit((unsigned char)*s->cur)) { if (!isdigit((unsigned char)*s->cur)) {
return false; return false;
} }
@@ -99,7 +62,7 @@ bool scan_digit(scanner_t *s) {
return true; return true;
} }
bool scan_i64(scanner_t *s) { bool scan_i64(scan_t *s) {
const char *save = s->cur; const char *save = s->cur;
if (*s->cur == '-' || *s->cur == '+') s->cur++; if (*s->cur == '-' || *s->cur == '+') s->cur++;
if (!isdigit((unsigned char)*s->cur)) { if (!isdigit((unsigned char)*s->cur)) {
@@ -115,7 +78,7 @@ bool scan_i64(scanner_t *s) {
return false; return false;
} }
if (errno == ERANGE) { if (errno == ERANGE) {
scanner_error(s, "integer does not fit in i64 value"); scan_error(s, "integer does not fit in i64 value");
return false; return false;
} }
s->cur = end; s->cur = end;
@@ -123,52 +86,52 @@ bool scan_i64(scanner_t *s) {
return true; return true;
} }
bool scan_i32(scanner_t *s) { bool scan_i32(scan_t *s) {
if (!scan_i64(s)) { if (!scan_i64(s)) {
return false; return false;
} }
int32_t val = (int32_t)s->value.i64; int32_t val = (int32_t)s->value.i64;
int64_t back = (int64_t)val; int64_t back = (int64_t)val;
if (back != s->value.i64) { if (back != s->value.i64) {
scanner_error(s, "int does not fit in i32 value"); scan_error(s, "int does not fit in i32 value");
return false; return false;
} }
s->value.i32 = val; s->value.i32 = val;
return true; return true;
} }
bool scan_i16(scanner_t *s) { bool scan_i16(scan_t *s) {
if (!scan_i64(s)) { if (!scan_i64(s)) {
return false; return false;
} }
int16_t val = (int16_t)s->value.i64; int16_t val = (int16_t)s->value.i64;
int64_t back = (int64_t)val; int64_t back = (int64_t)val;
if (back != s->value.i64) { if (back != s->value.i64) {
scanner_error(s, "int does not fit in i16 value"); scan_error(s, "int does not fit in i16 value");
return false; return false;
} }
s->value.i16 = val; s->value.i16 = val;
return true; return true;
} }
bool scan_i8(scanner_t *s) { bool scan_i8(scan_t *s) {
if (!scan_i64(s)) { if (!scan_i64(s)) {
return false; return false;
} }
int8_t val = (int8_t)s->value.i64; int8_t val = (int8_t)s->value.i64;
int64_t back = (int64_t)val; int64_t back = (int64_t)val;
if (back != s->value.i64) { if (back != s->value.i64) {
scanner_error(s, "int does not fit in i8 value"); scan_error(s, "int does not fit in i8 value");
return false; return false;
} }
s->value.i8 = val; s->value.i8 = val;
return true; return true;
} }
bool scan_u64(scanner_t *s) { bool scan_u64(scan_t *s) {
const char *save = s->cur; const char *save = s->cur;
if (*s->cur == '-') { if (*s->cur == '-') {
scanner_error(s, "- is not allowed for unsigned integers"); scan_error(s, "- is not allowed for unsigned integers");
return false; return false;
} }
if (*s->cur == '+') s->cur++; if (*s->cur == '+') s->cur++;
@@ -185,7 +148,7 @@ bool scan_u64(scanner_t *s) {
return false; return false;
} }
if (errno == ERANGE) { if (errno == ERANGE) {
scanner_error(s, "integer does not fit in u64 value"); scan_error(s, "integer does not fit in u64 value");
return false; return false;
} }
s->cur = end; s->cur = end;
@@ -193,49 +156,49 @@ bool scan_u64(scanner_t *s) {
return true; return true;
} }
bool scan_u32(scanner_t *s) { bool scan_u32(scan_t *s) {
if (!scan_u64(s)) { if (!scan_u64(s)) {
return false; return false;
} }
uint32_t val = (uint32_t)s->value.u64; uint32_t val = (uint32_t)s->value.u64;
uint64_t back = (uint64_t)val; uint64_t back = (uint64_t)val;
if (back != s->value.u64) { if (back != s->value.u64) {
scanner_error(s, "int does not fit in u32 value"); scan_error(s, "int does not fit in u32 value");
return false; return false;
} }
s->value.u32 = val; s->value.u32 = val;
return true; return true;
} }
bool scan_u16(scanner_t *s) { bool scan_u16(scan_t *s) {
if (!scan_u64(s)) { if (!scan_u64(s)) {
return false; return false;
} }
uint16_t val = (uint16_t)s->value.u64; uint16_t val = (uint16_t)s->value.u64;
uint64_t back = (uint64_t)val; uint64_t back = (uint64_t)val;
if (back != s->value.u64) { if (back != s->value.u64) {
scanner_error(s, "int does not fit in u16 value"); scan_error(s, "int does not fit in u16 value");
return false; return false;
} }
s->value.u16 = val; s->value.u16 = val;
return true; return true;
} }
bool scan_u8(scanner_t *s) { bool scan_u8(scan_t *s) {
if (!scan_u64(s)) { if (!scan_u64(s)) {
return false; return false;
} }
uint8_t val = (uint8_t)s->value.u64; uint8_t val = (uint8_t)s->value.u64;
uint64_t back = (uint64_t)val; uint64_t back = (uint64_t)val;
if (back != s->value.u64) { if (back != s->value.u64) {
scanner_error(s, "int does not fit in u8 value"); scan_error(s, "int does not fit in u8 value");
return false; return false;
} }
s->value.u8 = val; s->value.u8 = val;
return true; return true;
} }
bool scan_f64(scanner_t *s) { bool scan_f64(scan_t *s) {
const char *save = s->cur; const char *save = s->cur;
char *end; char *end;
errno = 0; errno = 0;
@@ -245,7 +208,7 @@ bool scan_f64(scanner_t *s) {
return false; return false;
} }
if (errno == ERANGE) { if (errno == ERANGE) {
scanner_error(s, "float does not fit in f64 value"); scan_error(s, "float does not fit in f64 value");
return false; return false;
} }
s->cur = end; s->cur = end;
@@ -253,21 +216,21 @@ bool scan_f64(scanner_t *s) {
return true; return true;
} }
bool scan_f32(scanner_t *s) { bool scan_f32(scan_t *s) {
if (!scan_f64(s)) { if (!scan_f64(s)) {
return false; return false;
} }
float val = (float)s->value.f64; float val = (float)s->value.f64;
double back = (double)val; double back = (double)val;
if (back != s->value.f64) { if (back != s->value.f64) {
scanner_error(s, "float does not fit in f32 value"); scan_error(s, "float does not fit in f32 value");
return false; return false;
} }
s->value.f32 = val; s->value.f32 = val;
return true; return true;
} }
bool scan_identifier(scanner_t *s) { bool scan_identifier(scan_t *s) {
if (!isalpha((unsigned char)*s->cur) && *s->cur != '_') { if (!isalpha((unsigned char)*s->cur) && *s->cur != '_') {
return false; return false;
} }
@@ -284,7 +247,7 @@ bool scan_identifier(scanner_t *s) {
} }
bool scan_string_literal(scanner_t *s) { bool scan_string_literal(scan_t *s) {
const char *save = s->cur; const char *save = s->cur;
if (*s->cur != '"') if (*s->cur != '"')
return false; return false;
@@ -304,7 +267,7 @@ bool scan_string_literal(scanner_t *s) {
case '"': c = '"'; break; case '"': c = '"'; break;
case '0': c = '\0'; break; case '0': c = '\0'; break;
default: default:
scanner_error(s, "invalid escape sequence"); scan_error(s, "invalid escape sequence");
s->cur = save; s->cur = save;
return false; return false;
} }
@@ -316,7 +279,7 @@ bool scan_string_literal(scanner_t *s) {
buf[len++] = c; buf[len++] = c;
} }
if (*s->cur != '"') { if (*s->cur != '"') {
scanner_error(s, "unterminated string literal"); scan_error(s, "unterminated string literal");
s->cur = save; s->cur = save;
return false; return false;
} }
@@ -326,41 +289,18 @@ bool scan_string_literal(scanner_t *s) {
return true; return true;
} }
bool scanner_print_errors(scanner_t *s, FILE *fp) { scan_value_t required(scan_result_t res) {
for (error_node_t *node = s->errors; node != NULL; node = node->next) { if (!res.ok) {
fprintf(fp, "%s\n", node->msg); fprintf(stderr, "%s:%d:%d: %s", res.filename, res.line, res.column, res.error_message);
exit(1);
} }
return s->errors != NULL; return res.value;
// TODO
} }
bool looks_like_float(scanner_t *s) { typedef struct scan_error {
const char *cur = s->cur; const char *filename;
if ( int line;
((*cur) == '+') || int column;
((*cur) == '-') const char *error_message;
) { } scan_error_t;
cur++;
}
if (!isdigit(((unsigned char)*cur))) {
return false;
} else {
cur++;
}
while (isdigit(((unsigned char)*cur))) {
cur++;
}
if ((*cur) != '.') {
return false;
} else {
cur++;
}
return isdigit(((unsigned char)*cur));
}
bool looks_like_int(scanner_t *s) {
const char *cur = s->cur;
if (*cur == '+' || *cur == '-') {
cur++;
}
return isdigit(*cur);
}
test_scanner.c
-43
View File
@@ -1,43 +0,0 @@
#include <assert.h>
#include <criterion/criterion.h>
#include "cig.h"
Test(scanner, looks_like_float) {
const char *buffer =
"1.0 true\n"
"12.34 true\n"
"0.5 true\n"
"9.99 true\n"
"+1.2 true\n"
"-3.14 true\n"
"1 false\n"
"42 false\n"
"+7 false\n"
"1. false\n"
".5 false\n"
"+. false\n"
"abc false\n"
"+x false\n";
with_borrow(allocator) {
scanner_t scanner = make_scanner("test", buffer, allocator);
while (!scan_eof(&scanner)) {
bool does_look_like_float = looks_like_float(&scanner);
bool does_look_like_int = looks_like_float(&scanner);
while (*scanner.cur++ != ' ');
bool expect;
if (scan_literal(&scanner, "true")) {
expect = true;
} else if (scan_literal(&scanner, "false")) {
expect = false;
} else {
assert(false && "invalid expectation");
}
scan_whitespace(&scanner);
cr_assert_eq(does_look_like_float, expect);
if (does_look_like_float) {
cr_assert(does_look_like_int);
}
}
}
}