From f09e720c7f63ddc18172781e1582ed83b5704b3e Mon Sep 17 00:00:00 2001 From: Aryadev Chavali Date: Sat, 24 Jan 2026 02:21:12 +0000 Subject: [PATCH] parser/ast: Some renaming and namespacing of enumerations --- src/arl/parser/ast.c | 16 ++++++++-------- src/arl/parser/ast.h | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/arl/parser/ast.c b/src/arl/parser/ast.c index 124bcb8..1adcd12 100644 --- a/src/arl/parser/ast.c +++ b/src/arl/parser/ast.c @@ -11,18 +11,18 @@ obj_t obj_string(u64 byte, sv_t string) { return (obj_t){ - .byte = byte, - .type = TYPE_STRING, - .value = {string}, + .byte_location = byte, + .type = OBJ_TYPE_STRING, + .value = {string}, }; } obj_t obj_symbol(u64 byte, sv_t symbol) { return (obj_t){ - .byte = byte, - .type = TYPE_SYMBOL, - .value = {symbol}, + .byte_location = byte, + .type = OBJ_TYPE_SYMBOL, + .value = {symbol}, }; } @@ -35,10 +35,10 @@ void obj_print(FILE *fp, obj_t *obj) } switch (obj->type) { - case TYPE_SYMBOL: + case OBJ_TYPE_SYMBOL: fprintf(fp, "SYMBOL(" PR_SV ")", SV_FMT(obj->value.as_symbol)); break; - case TYPE_STRING: + case OBJ_TYPE_STRING: fprintf(fp, "STRING(" PR_SV ")", SV_FMT(obj->value.as_string)); break; } diff --git a/src/arl/parser/ast.h b/src/arl/parser/ast.h index 9dbd9a9..89e0534 100644 --- a/src/arl/parser/ast.h +++ b/src/arl/parser/ast.h @@ -15,15 +15,15 @@ /// Types the AST can encode typedef enum { - TYPE_SYMBOL, - TYPE_STRING, -} type_t; + OBJ_TYPE_SYMBOL, + OBJ_TYPE_STRING, +} obj_type_t; /// Node of the AST as a tagged union typedef struct { - u64 byte; - type_t type; + u64 byte_location; + obj_type_t type; union { sv_t as_string;