X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=ast.h;h=0664f2825895256c520f012f2b0d678597c061ab;hb=5e4b8846d1838c6c0244646b2a3f81c94a647b13;hp=4f26742ba50b7d59bbccf51d2b59b43a4c6acfa6;hpb=5b2d99bc99dc093e5cdcd2451eac20596bbedcc0;p=xonotic%2Fgmqcc.git diff --git a/ast.h b/ast.h index 4f26742..0664f28 100644 --- a/ast.h +++ b/ast.h @@ -81,13 +81,8 @@ typedef struct * 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 \ { \ @@ -112,6 +107,7 @@ 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 @@ -150,10 +146,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*); @@ -166,6 +166,9 @@ 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); /* Binary * @@ -423,8 +426,6 @@ 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 * */ @@ -434,6 +435,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*); @@ -441,10 +443,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); - -bool ast_block_add_expr(ast_block*, ast_expression *expr); +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 *