X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=ast.h;h=4f26742ba50b7d59bbccf51d2b59b43a4c6acfa6;hb=5b2d99bc99dc093e5cdcd2451eac20596bbedcc0;hp=fc4fef3553e51dd08a9a8f12bffbdb83a36a0c73;hpb=a7957a9fdc6baf3eaa7f62fc00e1a50a23ffa634;p=xonotic%2Fgmqcc.git

diff --git a/ast.h b/ast.h
index fc4fef3..4f26742 100644
--- a/ast.h
+++ b/ast.h
@@ -36,6 +36,7 @@ typedef struct ast_function_s   ast_function;
 typedef struct ast_block_s      ast_block;
 typedef struct ast_binary_s     ast_binary;
 typedef struct ast_store_s      ast_store;
+typedef struct ast_binstore_s   ast_binstore;
 typedef struct ast_entfield_s   ast_entfield;
 typedef struct ast_ifthen_s     ast_ifthen;
 typedef struct ast_ternary_s    ast_ternary;
@@ -43,6 +44,29 @@ typedef struct ast_loop_s       ast_loop;
 typedef struct ast_call_s       ast_call;
 typedef struct ast_unary_s      ast_unary;
 typedef struct ast_return_s     ast_return;
+typedef struct ast_member_s     ast_member;
+
+enum {
+    TYPE_ast_node,
+    TYPE_ast_expression,
+    TYPE_ast_value,
+    TYPE_ast_function,
+    TYPE_ast_block,
+    TYPE_ast_binary,
+    TYPE_ast_store,
+    TYPE_ast_binstore,
+    TYPE_ast_entfield,
+    TYPE_ast_ifthen,
+    TYPE_ast_ternary,
+    TYPE_ast_loop,
+    TYPE_ast_call,
+    TYPE_ast_unary,
+    TYPE_ast_return,
+    TYPE_ast_member
+};
+
+#define ast_istype(x, t) ( ((ast_node_common*)x)->nodetype == (TYPE_##t) )
+#define ast_ctx(node) (((ast_node_common*)(node))->context)
 
 /* Node interface with common components
  */
@@ -52,12 +76,18 @@ typedef struct
     lex_ctx          context;
     /* I don't feel comfortable using keywords like 'delete' as names... */
     ast_node_delete *destroy;
+    int              nodetype;
     /* keep: if a node contains this node, 'keep'
      * prevents its dtor from destroying this node as well.
      */
     bool             keep;
+    /* usecount - so we can delete unused _x,_y and _z nodes... */
+    size_t           uses;
 } ast_node_common;
 
+#define ast_use(n) ((ast_node*)(n))->node.uses++
+#define ast_unuse(n) ((ast_node*)(n))->node.uses--
+
 #define ast_delete(x) ( ( (ast_node*)(x) ) -> node.destroy )((ast_node*)(x))
 #define ast_unref(x) do                     \
 {                                           \
@@ -82,6 +112,13 @@ typedef struct
     int                     vtype;
     ast_expression         *next;
     MEM_VECTOR_MAKE(ast_value*, params);
+    /* The codegen functions should store their output values
+     * so we can call it multiple times without re-evaluating.
+     * Store lvalue and rvalue seperately though. So that
+     * ast_entfield for example can generate both if required.
+     */
+    ir_value               *outl;
+    ir_value               *outr;
 } ast_expression_common;
 MEM_VECTOR_PROTO(ast_expression_common, ast_value*, params);
 
@@ -128,6 +165,8 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir);
 
 bool GMQCC_WARN ast_value_params_add(ast_value*, ast_value*);
 
+bool ast_compare_type(ast_expression *a, ast_expression *b);
+
 /* Binary
  *
  * A value-returning binary expression.
@@ -148,6 +187,29 @@ void ast_binary_delete(ast_binary*);
 
 bool ast_binary_codegen(ast_binary*, ast_function*, bool lvalue, ir_value**);
 
+/* Binstore
+ *
+ * An assignment including a binary expression with the source as left operand.
+ * Eg. a += b; is a binstore { INSTR_STORE, INSTR_ADD, a, b }
+ */
+struct ast_binstore_s
+{
+    ast_expression_common expression;
+
+    int             opstore;
+    int             opbin;
+    ast_expression *dest;
+    ast_expression *source;
+};
+ast_binstore* ast_binstore_new(lex_ctx    ctx,
+                               int        storeop,
+                               int        op,
+                               ast_expression *left,
+                               ast_expression *right);
+void ast_binstore_delete(ast_binstore*);
+
+bool ast_binstore_codegen(ast_binstore*, ast_function*, bool lvalue, ir_value**);
+
 /* Unary
  *
  * Regular unary expressions: not,neg
@@ -209,6 +271,22 @@ void ast_entfield_delete(ast_entfield*);
 
 bool ast_entfield_codegen(ast_entfield*, ast_function*, bool lvalue, ir_value**);
 
+/* Member access:
+ *
+ * For now used for vectors. If we get structs or unions
+ * we can have them handled here as well.
+ */
+struct ast_member_s
+{
+    ast_expression_common expression;
+    ast_expression *owner;
+    unsigned int    field;
+};
+ast_member* ast_member_new(lex_ctx ctx, ast_expression *owner, unsigned int field);
+void ast_member_delete(ast_member*);
+
+bool ast_member_codegen(ast_member*, ast_function*, bool lvalue, ir_value**);
+
 /* Store
  *
  * Stores left<-right and returns left.
@@ -345,6 +423,8 @@ bool ast_call_codegen(ast_call*, ast_function*, bool lvalue, ir_value**);
 
 MEM_VECTOR_PROTO(ast_call, ast_expression*, params);
 
+bool ast_call_add_param(ast_call*, ast_expression*);
+
 /* Blocks
  *
  */
@@ -362,6 +442,8 @@ bool ast_block_set_type(ast_block*, ast_expression *from);
 MEM_VECTOR_PROTO(ast_block, ast_value*, locals);
 MEM_VECTOR_PROTO(ast_block, ast_expression*, exprs);
 
+bool ast_block_add_expr(ast_block*, ast_expression *expr);
+
 bool ast_block_codegen(ast_block*, ast_function*, bool lvalue, ir_value**);
 
 /* Function