added a load of stuff, and fixed a git conflict

1 files changed, 19 insertions, 0 deletions

diff --git a/comp/lucas-standen-NEA/code/proto/ast/astg.h b/comp/lucas-standen-NEA/code/proto/ast/astg.h
new file mode 100644
index 0000000..16250b2
--- /dev/null
+++ b/comp/lucas-standen-NEA/code/proto/ast/astg.h
@@ -0,0 +1,19 @@
+typedef struct ast_node ast_node;
+
+typedef enum op {
+	ADD = 0,
+	SUB = 1,
+	MUL = 2,
+	DIV = 3,
+} op;
+
+typedef struct ast_node {
+	op operation;
+	int realLeft;
+	int realRight;
+	ast_node *right;
+	ast_node *left;
+} ast_node;
+
+int exec(ast_node *exp);
+void freeAst(ast_node *head);