1 files changed, 18 insertions, 71 deletions

diff --git a/include/lyn/ast.h b/include/lyn/ast.h
index fd3b98b..ba9a0d5 100644
--- a/include/lyn/ast.h
+++ b/include/lyn/ast.h
@@ -3,102 +3,49 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <lyn/vec.h>
 
-enum kind {
-	LYN_ID, LYN_STR, LYN_INT, LYN_FLOAT, LYN_CMD, LYN_LIST, LYN_APPLY
+enum lyn_kind {
+	LYN_ID, LYN_STR, LYN_INT, LYN_FLOAT, LYN_CMD, LYN_GROUP, LYN_APPLY
 };
 
-struct ast {
-	enum kind kind;
+struct lyn_value {
+	enum lyn_kind kind;
 	union {
 		long long i;
 		double d;
 		const char *s;
-		struct ast *args;
+		struct vec args;
 	};
-	struct ast *next;
 };
 
-static inline struct ast *gen_id(const char *s)
+static inline struct lyn_value gen_id(const char *s)
 {
-	struct ast *id = calloc(1, sizeof(struct ast));
-	if (!id)
-		return NULL;
-
-	id->kind = LYN_ID;
-	id->s = strdup(s);
-	return id;
+	return (struct lyn_value){.kind = LYN_ID, .s = strdup(s)};
 }
 
-static inline struct ast *gen_str(const char *s)
+static inline struct lyn_value gen_str(const char *s)
 {
-	struct ast *str = calloc(1, sizeof(struct ast));
-	if (!str)
-		return NULL;
-
-	str->kind = LYN_STR;
-	str->s = strdup(s);
-	return str;
+	return (struct lyn_value){.kind = LYN_STR, .s = strdup(s)};
 }
 
-static inline struct ast *gen_int(long long i)
+static inline struct lyn_value gen_int(long long i)
 {
-	struct ast *integer = calloc(1, sizeof(struct ast));
-	if (!integer)
-		return NULL;
-
-	integer->kind = LYN_INT;
-	integer->i = i;
-	return integer;
-}
-
-static inline struct ast *gen_float(double d)
-{
-	struct ast *floating = calloc(1, sizeof(struct ast));
-	if (!floating)
-		return NULL;
-
-	floating->kind = LYN_FLOAT;
-	floating->d = d;
-	return floating;
+	return (struct lyn_value){.kind = LYN_INT, .i = i};
 }
 
-static inline struct ast *gen_apply(struct ast *cmds)
+static inline struct lyn_value gen_float(double d)
 {
-	struct ast *apply = calloc(1, sizeof(struct ast));
-	if (!apply)
-		return NULL;
-
-	apply->kind = LYN_APPLY;
-	apply->args = cmds;
-	return apply;
+	return (struct lyn_value){.kind = LYN_FLOAT, .d = d};
 }
 
-static inline struct ast *gen_list(struct ast *cmds)
+static inline struct lyn_value gen_list()
 {
-	struct ast *list = calloc(1, sizeof(struct ast));
-	if (!list)
-		return NULL;
-
-	list->kind = LYN_LIST;
-	list->args = cmds;
+	struct lyn_value list;
+	list.args = vec_create(sizeof(struct lyn_value));
 	return list;
 }
 
-static inline struct ast *gen_cmd(struct ast *args)
-{
-	struct ast *cmd = calloc(1, sizeof(struct ast));
-	if (!cmd)
-		return NULL;
-
-	cmd->kind = LYN_CMD;
-	cmd->args = args;
-	return cmd;
-}
-
-void ast_dump(int depth, struct ast *ast);
-void ast_dump_list(int depth, struct ast *ast);
-
-struct ast *reverse_ast_list(struct ast *ast);
+void ast_dump(int depth, struct lyn_value val);
 
 #endif /* LYN_AST_H */