X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=ast.h;h=725f123cec9f45156cf5d29e229ee1ae93c13899;hb=ab86b0470c229e85ec45126ee716c0699c2a3725;hp=29f3061d70d56632cf944ac2a8ed5052dba272ee;hpb=5240aa8379f435dfd6c4d1f373327461f27dadd0;p=xonotic%2Fgmqcc.git

diff --git a/ast.h b/ast.h
index 29f3061..725f123 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;
@@ -53,6 +54,7 @@ enum {
     TYPE_ast_block,
     TYPE_ast_binary,
     TYPE_ast_store,
+    TYPE_ast_binstore,
     TYPE_ast_entfield,
     TYPE_ast_ifthen,
     TYPE_ast_ternary,
@@ -64,6 +66,7 @@ enum {
 };
 
 #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
  */
@@ -97,6 +100,16 @@ typedef bool ast_expression_codegen(ast_expression*,
                                     ast_function*,
                                     bool lvalue,
                                     ir_value**);
+/* TODO: the codegen function should take an output-type parameter
+ * indicating whether a variable, type, label etc. is expected, and
+ * an environment!
+ * Then later an ast_ident could have a codegen using this to figure
+ * out what to look for.
+ * eg. in code which uses a not-yet defined variable, the expression
+ * would take an ast_ident, and the codegen would be called with
+ * type `expression`, so the ast_ident's codegen would search for
+ * variables through the environment (or functions, constants...).
+ */
 typedef struct
 {
     ast_node_common         node;
@@ -104,6 +117,14 @@ typedef struct
     int                     vtype;
     ast_expression         *next;
     MEM_VECTOR_MAKE(ast_value*, params);
+    bool                    variadic;
+    /* 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);
 
@@ -135,10 +156,14 @@ struct ast_value_s
         ast_function *vfunc;
     } constval;
 
+    /* usecount for the parser */
+    size_t uses;
+
     ir_value *ir_v;
 };
 
 ast_value* ast_value_new(lex_ctx ctx, const char *name, int qctype);
+ast_value* ast_value_copy(const ast_value *self);
 /* This will NOT delete an underlying ast_function */
 void ast_value_delete(ast_value*);
 
@@ -150,6 +175,12 @@ 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);
+ast_expression* ast_type_copy(lex_ctx ctx, const ast_expression *ex);
+#define ast_type_adopt(a, b) ast_type_adopt_impl((ast_expression*)(a), (ast_expression*)(b))
+bool ast_type_adopt_impl(ast_expression *self, const ast_expression *other);
+void ast_type_to_string(ast_expression *e, char *buf, size_t bufsize);
+
 /* Binary
  *
  * A value-returning binary expression.
@@ -170,6 +201,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
@@ -380,6 +434,7 @@ ast_call* ast_call_new(lex_ctx ctx,
                        ast_expression *funcexpr);
 void ast_call_delete(ast_call*);
 bool ast_call_codegen(ast_call*, ast_function*, bool lvalue, ir_value**);
+bool ast_call_check_types(ast_call*);
 
 MEM_VECTOR_PROTO(ast_call, ast_expression*, params);
 
@@ -392,6 +447,7 @@ struct ast_block_s
 
     MEM_VECTOR_MAKE(ast_value*,      locals);
     MEM_VECTOR_MAKE(ast_expression*, exprs);
+    MEM_VECTOR_MAKE(ast_expression*, collect);
 };
 ast_block* ast_block_new(lex_ctx ctx);
 void ast_block_delete(ast_block*);
@@ -399,8 +455,10 @@ 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);
+MEM_VECTOR_PROTO(ast_block, ast_expression*, collect);
 
 bool ast_block_codegen(ast_block*, ast_function*, bool lvalue, ir_value**);
+bool ast_block_collect(ast_block*, ast_expression*);
 
 /* Function
  *