3 files changed, 19 insertions, 12 deletions

diff --git a/inc/context.h b/inc/context.h
index 3f7b686..b11e23d 100644
--- a/inc/context.h
+++ b/inc/context.h
@@ -20,7 +20,7 @@ struct ctx {
 	struct token *tokens;
 
 	struct {
-		struct tree *head;
+		struct node *head;
 		struct node *current;
 	} tree;
 };
diff --git a/inc/tokenize.h b/inc/tokenize.h
index 0142bb9..d1a2931 100644
--- a/inc/tokenize.h
+++ b/inc/tokenize.h
@@ -22,6 +22,8 @@ enum token_type {
 	NEWLINE,
 	EOL,
 	END,
+
+	SOMETHING,
 };
 
 struct token {
diff --git a/inc/treeify.h b/inc/treeify.h
index 3af67f8..bc8a64d 100644
--- a/inc/treeify.h
+++ b/inc/treeify.h
@@ -15,13 +15,20 @@ enum node_type {
 // (*f* x y)
 struct node_expression_identifier {
 	ctx_string name; // f
-	ctx_string type; // u32
 };
 
-// (f *x* *y*)
+enum node_expression_parameter_type {
+	PARAM_TYPE_IDENT,
+	PARAM_TYPE_EXPRESSION,
+};
+
+// (f *x* *y* *(expr)*)
 struct node_expression_parameter {
-	ctx_string name; // x or y
-	ctx_string type; // u32
+	enum node_expression_parameter_type type;
+	union {
+		ctx_string name; // x or y
+		struct node_expression *expression; // (expr)
+	} data;
 };
 
 // *(f x y)*
@@ -55,16 +62,14 @@ struct node_declaration {
 
 struct node {
 	enum node_type type;
-	/* struct node *next; */
+	struct node *prev;
+	struct node *next;
 	void *data;
 };
 
-struct tree {
-	struct node *node;
-};
-
-struct tree *tree_create(void);
-void tree_destroy(struct tree *tree);
+struct node *tree_create(void);
+void tree_destroy(struct node *tree);
+void tree_add(struct ctx *ctx, enum node_type type, void *data);
 
 void treeify(struct ctx *ctx);