parser/ast: Added support for node level primitives

These are just an enumeration of primitives we already expect to be
present within a program.  Instead of leaving everything as a symbol,
we can compile certain symbols into the enumeration ahead of time to
make later stages easier.
This commit is contained in:
2026-01-24 02:40:26 +00:00
parent 51d59b6a83
commit 62c91990c4
2 changed files with 56 additions and 11 deletions

View File

@@ -5,15 +5,38 @@
* Commentary: See ast.h. * Commentary: See ast.h.
*/ */
#include <arl/lib/base.h>
#include <arl/lib/vec.h> #include <arl/lib/vec.h>
#include <arl/parser/ast.h> #include <arl/parser/ast.h>
const char *ast_prim_to_cstr(ast_prim_t prim)
{
switch (prim)
{
case AST_PRIM_NIL:
return "nil";
case AST_PRIM_PRINTLN:
return "println";
default:
FAIL("Unexpected AST primitive value: %d\n", prim);
}
}
ast_node_t ast_node_prim(u64 byte, ast_prim_t primitive)
{
return (ast_node_t){
.byte_location = byte,
.type = AST_NODE_TYPE_PRIMITIVE,
.value = {.as_prim = primitive},
};
}
ast_node_t ast_node_string(u64 byte, sv_t string) ast_node_t ast_node_string(u64 byte, sv_t string)
{ {
return (ast_node_t){ return (ast_node_t){
.byte_location = byte, .byte_location = byte,
.type = AST_NODE_TYPE_STRING, .type = AST_NODE_TYPE_STRING,
.value = {string}, .value = {.as_string = string},
}; };
} }
@@ -22,25 +45,31 @@ ast_node_t ast_node_symbol(u64 byte, sv_t symbol)
return (ast_node_t){ return (ast_node_t){
.byte_location = byte, .byte_location = byte,
.type = AST_NODE_TYPE_SYMBOL, .type = AST_NODE_TYPE_SYMBOL,
.value = {symbol}, .value = {.as_symbol = symbol},
}; };
} }
void ast_node_print(FILE *fp, ast_node_t *obj) void ast_node_print(FILE *fp, ast_node_t *node)
{ {
if (!obj) if (!node)
{ {
fprintf(fp, "NIL"); fprintf(fp, "NIL");
return; return;
} }
switch (obj->type) switch (node->type)
{ {
case AST_NODE_TYPE_PRIMITIVE:
fprintf(fp, "PRIMITIVE(%s)", ast_prim_to_cstr(node->value.as_prim));
break;
case AST_NODE_TYPE_SYMBOL: case AST_NODE_TYPE_SYMBOL:
fprintf(fp, "SYMBOL(" PR_SV ")", SV_FMT(obj->value.as_symbol)); fprintf(fp, "SYMBOL(" PR_SV ")", SV_FMT(node->value.as_symbol));
break; break;
case AST_NODE_TYPE_STRING: case AST_NODE_TYPE_STRING:
fprintf(fp, "STRING(" PR_SV ")", SV_FMT(obj->value.as_string)); fprintf(fp, "STRING(" PR_SV ")", SV_FMT(node->value.as_string));
break; break;
case NUM_AST_NODE_TYPES:
default:
FAIL("Unexpected node type: %d\n", node->type);
} }
} }

View File

@@ -15,10 +15,24 @@
/// Types the AST can encode /// Types the AST can encode
typedef enum typedef enum
{ {
AST_NODE_TYPE_SYMBOL = 0, AST_NODE_TYPE_PRIMITIVE = 0,
AST_NODE_TYPE_SYMBOL,
AST_NODE_TYPE_STRING, AST_NODE_TYPE_STRING,
NUM_AST_NODE_TYPES,
} ast_node_type_t; } ast_node_type_t;
/// Primitives (values, callables, etc) as symbols
typedef enum
{
AST_PRIM_NIL = 0,
AST_PRIM_PRINTLN,
NUM_AST_PRIMS,
} ast_prim_t;
const char *ast_prim_to_cstr(ast_prim_t);
/// Node of the AST as a tagged union /// Node of the AST as a tagged union
typedef struct typedef struct
{ {
@@ -26,14 +40,16 @@ typedef struct
ast_node_type_t type; ast_node_type_t type;
union union
{ {
sv_t as_string; ast_prim_t as_prim;
sv_t as_symbol; sv_t as_symbol;
sv_t as_string;
} value; } value;
} ast_node_t; } ast_node_t;
ast_node_t ast_node_string(u64 byte, sv_t string); ast_node_t ast_node_prim(u64 byte, ast_prim_t primitive);
ast_node_t ast_node_symbol(u64 byte, sv_t symbol); ast_node_t ast_node_symbol(u64 byte, sv_t symbol);
void ast_node_print(FILE *fp, ast_node_t *obj); ast_node_t ast_node_string(u64 byte, sv_t string);
void ast_node_print(FILE *fp, ast_node_t *node);
/// The AST as a flat collection of nodes /// The AST as a flat collection of nodes
typedef struct typedef struct