parser/ast: Some renaming and namespacing of enumerations

src/arl/parser/ast.c

@@ -11,8 +11,8 @@
 obj_t obj_string(u64 byte, sv_t string)
 {
   return (obj_t){
-      .byte  = byte,
+      .byte_location = byte,
-      .type  = TYPE_STRING,
+      .type          = OBJ_TYPE_STRING,
       .value         = {string},
   };
 }
@@ -20,8 +20,8 @@ obj_t obj_string(u64 byte, sv_t string)
 obj_t obj_symbol(u64 byte, sv_t symbol)
 {
   return (obj_t){
-      .byte  = byte,
+      .byte_location = byte,
-      .type  = TYPE_SYMBOL,
+      .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;
   }

src/arl/parser/ast.h

@@ -15,15 +15,15 @@
 /// Types the AST can encode
 typedef enum
 {
-  TYPE_SYMBOL,
+  OBJ_TYPE_SYMBOL,
-  TYPE_STRING,
+  OBJ_TYPE_STRING,
-} type_t;
+} obj_type_t;
 
 /// Node of the AST as a tagged union
 typedef struct
 {
-  u64 byte;
+  u64 byte_location;
-  type_t type;
+  obj_type_t type;
   union
   {
     sv_t as_string;