diff --git a/assembler.c b/assembler.c index 87a672b..10ad451 100644 --- a/assembler.c +++ b/assembler.c @@ -73,7 +73,7 @@ void asm_translate_nodes(vec_t *asm_buffer, struct PResult nodes, // Second pass: Translating to assembly for (size_t i = 0; i < nodes.size; ++i) { - node_t node = nodes.nodes[i]; + ast_node_t node = nodes.nodes[i]; // Something we can compile with only the information at hand if (!(node.type == LIN || node.type == LOUT)) { diff --git a/obi.c b/obi.c index 6f12d9a..bd78852 100644 --- a/obi.c +++ b/obi.c @@ -25,11 +25,11 @@ typedef struct #endif } machine_t; -void interpret(machine_t *cpu, node_t *ast, size_t num) +void interpret(machine_t *cpu, ast_node_t *ast, size_t num) { for (size_t i = 0; i < num; ++i) { - node_t node = ast[i]; + ast_node_t node = ast[i]; switch (node.type) { case NEXT: diff --git a/parser.c b/parser.c index ee9b46b..b8fcd3a 100644 --- a/parser.c +++ b/parser.c @@ -8,7 +8,7 @@ #include "./parser.h" -char *ast_to_str(node_t *ast, size_t size) +char *ast_to_str(ast_node_t *ast, size_t size) { char *out = calloc(size + 1, 1); if (!out) @@ -54,7 +54,7 @@ char *ast_to_str(node_t *ast, size_t size) struct PResult parse_buffer(buffer_t *buffer) { - node_t *nodes = NULL; + ast_node_t *nodes = NULL; size_t usable = 0, loops = 0, loop_ends = 0; // First pass: Compute |nodes| @@ -161,11 +161,11 @@ struct PResult parse_buffer(buffer_t *buffer) size_t stackptr = 0; if (loops) { - node_t *stack[loops]; + ast_node_t *stack[loops]; memset(stack, 0, loops); for (size_t i = 0; i < usable; ++i) { - node_t *node = nodes + i; + ast_node_t *node = nodes + i; if (node->type == LIN) stack[stackptr++] = node; else if (node->type == LOUT) @@ -180,7 +180,7 @@ struct PResult parse_buffer(buffer_t *buffer) if (stackptr > 0) { - node_t *node = nodes + usable - 1; + ast_node_t *node = nodes + usable - 1; print_error(buffer->name, node->row, node->col, "ERROR: Unbalanced square brackets!"); goto error; diff --git a/parser.h b/parser.h index e78f116..a5b56a2 100644 --- a/parser.h +++ b/parser.h @@ -20,16 +20,16 @@ typedef struct size_t col, row; node_type_t type; int loop_ref; -} node_t; +} ast_node_t; struct PResult { - node_t *nodes; + ast_node_t *nodes; size_t size; size_t labels; }; -char *ast_to_str(node_t *ast, size_t size); +char *ast_to_str(ast_node_t *ast, size_t size); struct PResult parse_buffer(buffer_t *buffer); #endif