Convert codebase to C89 compatibility and update test scripts
This commit is contained in:
@@ -21,25 +21,31 @@ void log_error(const char* msg) {
|
||||
}
|
||||
|
||||
void log_on_line(Location* loc, int to_column, const char* msg, ...) {
|
||||
/* Declarations first for C89 */
|
||||
char* line_prefix = NULL;
|
||||
char* formatted_msg = NULL;
|
||||
char* header = NULL;
|
||||
char* buffer = NULL;
|
||||
va_list args;
|
||||
int caret_len;
|
||||
char* p;
|
||||
int i1, i2;
|
||||
size_t i3;
|
||||
size_t total_size;
|
||||
|
||||
line_prefix = format_string("%d| ", loc->line);
|
||||
if (!line_prefix) goto cleanup;
|
||||
|
||||
int caret_len = to_column - loc->column_start + 1;
|
||||
caret_len = to_column - loc->column_start + 1;
|
||||
if (caret_len < 1) caret_len = 1;
|
||||
|
||||
// Format the message
|
||||
va_list args;
|
||||
/* Format the message */
|
||||
va_start(args, msg);
|
||||
formatted_msg = format_string_va(msg, args);
|
||||
va_end(args);
|
||||
if (!formatted_msg) goto cleanup;
|
||||
|
||||
// Header logic
|
||||
/* Header logic */
|
||||
if (loc->filename && loc->filename[0] != '\0') {
|
||||
header = format_string("--- %s ---\n", loc->filename);
|
||||
} else {
|
||||
@@ -47,26 +53,26 @@ void log_on_line(Location* loc, int to_column, const char* msg, ...) {
|
||||
}
|
||||
if (!header) goto cleanup;
|
||||
|
||||
size_t total_size = strlen(header) + 20 +
|
||||
strlen(line_prefix) + loc->line_text.length + 2 + // line| text\n
|
||||
strlen(line_prefix) + loc->column_start - 1 + caret_len + 2 + // indent + ^^\n
|
||||
strlen(line_prefix) + 3 + strlen(formatted_msg) + 2 + // indent + msg\n
|
||||
10;
|
||||
total_size = strlen(header) + 20 +
|
||||
strlen(line_prefix) + loc->line_text.length + 2 + /* line| text\n */
|
||||
strlen(line_prefix) + loc->column_start - 1 + caret_len + 2 + /* indent + ^^\n */
|
||||
strlen(line_prefix) + 3 + strlen(formatted_msg) + 2 + /* indent + msg\n */
|
||||
10;
|
||||
|
||||
buffer = (char*)malloc(total_size);
|
||||
if (!buffer) goto cleanup;
|
||||
|
||||
char* p = buffer;
|
||||
p = buffer;
|
||||
p += sprintf(p, "%s", header);
|
||||
p += sprintf(p, "%s%.*s\n", line_prefix, (int)loc->line_text.length, loc->line_text.data);
|
||||
|
||||
// Caret line
|
||||
for (int i = 0; i < (int)(strlen(line_prefix) + loc->column_start - 1); i++) *p++ = ' ';
|
||||
for (int i = 0; i < caret_len; i++) *p++ = '^';
|
||||
/* Caret line */
|
||||
for (i1 = 0; i1 < (int)(strlen(line_prefix) + loc->column_start - 1); i1++) *p++ = ' ';
|
||||
for (i2 = 0; i2 < caret_len; i2++) *p++ = '^';
|
||||
*p++ = '\n';
|
||||
|
||||
// Message line
|
||||
for (size_t i = 0; i < strlen(line_prefix); i++) *p++ = ' ';
|
||||
/* Message line */
|
||||
for (i3 = 0; i3 < strlen(line_prefix); i3++) *p++ = ' ';
|
||||
p += sprintf(p, "%s\n", formatted_msg);
|
||||
|
||||
*p = '\0';
|
||||
|
||||
Reference in New Issue
Block a user