X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=ast.h;h=354ce05ee48690df0e1ff75e70c2ff84d35ad9cb;hp=29f3061d70d56632cf944ac2a8ed5052dba272ee;hb=90b5a6538a10f60d08ee3059b8f70e4e076dc30d;hpb=7e3edea6211832e76918e385f299b7198d4e209b diff --git a/ast.h b/ast.h index 29f3061..354ce05 100644 --- a/ast.h +++ b/ast.h @@ -1,93 +1,132 @@ -/* - * Copyright (C) 2012 - * Wolfgang Bumiller - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ #ifndef GMQCC_AST_HDR #define GMQCC_AST_HDR +#include #include "ir.h" +typedef uint16_t ast_flag_t; + /* Note: I will not be using a _t suffix for the * "main" ast node types for now. */ -typedef union ast_node_u ast_node; -typedef union ast_expression_u ast_expression; - -typedef struct ast_value_s ast_value; -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_entfield_s ast_entfield; -typedef struct ast_ifthen_s ast_ifthen; -typedef struct ast_ternary_s ast_ternary; -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; +struct ast_node; +struct ast_expression; +struct ast_value; +struct ast_function; +struct ast_block; +struct ast_binary; +struct ast_store; +struct ast_binstore; +struct ast_entfield; +struct ast_ifthen; +struct ast_ternary; +struct ast_loop; +struct ast_call; +struct ast_unary; +struct ast_return; +struct ast_member; +struct ast_array_index; +struct ast_breakcont; +struct ast_switch; +struct ast_label; +struct ast_goto; +struct ast_argpipe; +struct ast_state; enum { - TYPE_ast_node, - TYPE_ast_expression, - TYPE_ast_value, - TYPE_ast_function, - TYPE_ast_block, - TYPE_ast_binary, - TYPE_ast_store, - TYPE_ast_entfield, - TYPE_ast_ifthen, - TYPE_ast_ternary, - TYPE_ast_loop, - TYPE_ast_call, - TYPE_ast_unary, - TYPE_ast_return, - TYPE_ast_member + AST_FLAG_VARIADIC = 1 << 0, + AST_FLAG_NORETURN = 1 << 1, + AST_FLAG_INLINE = 1 << 2, + AST_FLAG_INITIALIZED = 1 << 3, + AST_FLAG_DEPRECATED = 1 << 4, + AST_FLAG_INCLUDE_DEF = 1 << 5, + AST_FLAG_IS_VARARG = 1 << 6, + AST_FLAG_ALIAS = 1 << 7, + AST_FLAG_ERASEABLE = 1 << 8, + AST_FLAG_ACCUMULATE = 1 << 9, + + /* An array declared as [] + * so that the size is taken from the initializer + */ + AST_FLAG_ARRAY_INIT = 1 << 10, + + AST_FLAG_FINAL_DECL = 1 << 11, + + /* Several coverage options + * AST_FLAG_COVERAGE means there was an explicit [[coverage]] attribute, + * which will overwrite the default set via the commandline switches. + * BLOCK_COVERAGE inserts coverage() calls into every basic block. + * In the future there might be more options like tracking variable access + * by creating get/set wrapper functions. + */ + AST_FLAG_COVERAGE = 1 << 12, + AST_FLAG_BLOCK_COVERAGE = 1 << 13, + + AST_FLAG_LAST, + AST_FLAG_TYPE_MASK = (AST_FLAG_VARIADIC | AST_FLAG_NORETURN), + AST_FLAG_COVERAGE_MASK = (AST_FLAG_BLOCK_COVERAGE) }; -#define ast_istype(x, t) ( ((ast_node_common*)x)->nodetype == (TYPE_##t) ) +enum { + TYPE_ast_node, /* 0 */ + TYPE_ast_expression, /* 1 */ + TYPE_ast_value, /* 2 */ + TYPE_ast_function, /* 3 */ + TYPE_ast_block, /* 4 */ + TYPE_ast_binary, /* 5 */ + TYPE_ast_store, /* 6 */ + TYPE_ast_binstore, /* 7 */ + TYPE_ast_entfield, /* 8 */ + TYPE_ast_ifthen, /* 9 */ + TYPE_ast_ternary, /* 10 */ + TYPE_ast_loop, /* 11 */ + TYPE_ast_call, /* 12 */ + TYPE_ast_unary, /* 13 */ + TYPE_ast_return, /* 14 */ + TYPE_ast_member, /* 15 */ + TYPE_ast_array_index, /* 16 */ + TYPE_ast_breakcont, /* 17 */ + TYPE_ast_switch, /* 18 */ + TYPE_ast_label, /* 19 */ + TYPE_ast_goto, /* 20 */ + TYPE_ast_argpipe, /* 21 */ + TYPE_ast_state /* 22 */ +}; + +#define ast_istype(x, t) ( (x)->m_node_type == (TYPE_##t) ) /* Node interface with common components */ typedef void ast_node_delete(ast_node*); -typedef struct + +struct ast_node { - lex_ctx context; + ast_node() = delete; + ast_node(lex_ctx_t, int nodetype); + virtual ~ast_node(); + + lex_ctx_t m_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' + int m_node_type; + /* keep_node: if a node contains this node, 'keep_node' * prevents its dtor from destroying this node as well. */ - bool keep; -} ast_node_common; - -#define ast_delete(x) ( ( (ast_node*)(x) ) -> node.destroy )((ast_node*)(x)) -#define ast_unref(x) do \ -{ \ - if (! (((ast_node*)(x))->node.keep) ) { \ - ast_delete(x); \ - } \ + bool m_keep_node; + bool m_side_effects; + + void propagate_side_effects(ast_node *other) const; +}; + +#define ast_unref(x) do \ +{ \ + if (! (x)->m_keep_node ) { \ + delete (x); \ + } \ } while(0) +enum class ast_copy_type_t { value }; +static const ast_copy_type_t ast_copy_type = ast_copy_type_t::value; + /* Expression interface * * Any expression or block returns an ir_value, and needs @@ -97,15 +136,48 @@ typedef bool ast_expression_codegen(ast_expression*, ast_function*, bool lvalue, ir_value**); -typedef struct -{ - ast_node_common node; - ast_expression_codegen *codegen; - int vtype; - ast_expression *next; - MEM_VECTOR_MAKE(ast_value*, params); -} ast_expression_common; -MEM_VECTOR_PROTO(ast_expression_common, ast_value*, params); +/* 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...). + */ +struct ast_expression : ast_node { + ast_expression() = delete; + ast_expression(lex_ctx_t ctx, int nodetype, qc_type vtype); + ast_expression(lex_ctx_t ctx, int nodetype); + ~ast_expression(); + ast_expression(ast_copy_type_t, int nodetype, const ast_expression&); + ast_expression(ast_copy_type_t, const ast_expression&); + + static ast_expression *shallow_type(lex_ctx_t ctx, qc_type vtype); + + bool compare_type(const ast_expression &other) const; + void adopt_type(const ast_expression &other); + + qc_type m_vtype = TYPE_VOID; + ast_expression *m_next = nullptr; + /* arrays get a member-count */ + size_t m_count = 0; + std::vector> m_type_params; + + ast_flag_t m_flags = 0; + /* void foo(string...) gets varparam set as a restriction + * for variadic parameters + */ + ast_expression *m_varparam = nullptr; + /* 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 *m_outl = nullptr; + ir_value *m_outr = nullptr; +}; /* Value * @@ -114,79 +186,127 @@ MEM_VECTOR_PROTO(ast_expression_common, ast_value*, params); * typedef float foo; * is like creating a 'float foo', foo serving as the type's name. */ -struct ast_value_s +union basic_value_t { + qcfloat_t vfloat; + int vint; + vec3_t vvec; + const char *vstring; + int ventity; + ast_function *vfunc; + ast_value *vfield; +}; + +struct ast_value : ast_expression { - ast_expression_common expression; - - const char *name; - - /* - int vtype; - ast_value *next; - */ - - bool isconst; - union { - double vfloat; - int vint; - vector vvec; - const char *vstring; - int ventity; - ast_function *vfunc; - } constval; - - ir_value *ir_v; + ast_value() = delete; + ast_value(lex_ctx_t ctx, const std::string &name, qc_type qctype); + ~ast_value(); + + ast_value(ast_copy_type_t, const ast_expression&, const std::string&); + ast_value(ast_copy_type_t, const ast_value&); + ast_value(ast_copy_type_t, const ast_value&, const std::string&); + + void add_param(ast_value*); + + std::string m_name; + std::string m_desc; + + const char *m_argcounter = nullptr; + + int m_cvq = CV_NONE; /* const/var qualifier */ + bool m_isfield = false; /* this declares a field */ + bool m_isimm = false; /* an immediate, not just const */ + bool m_hasvalue = false; + bool m_inexact = false; /* inexact coming from folded expression */ + basic_value_t m_constval; + /* for TYPE_ARRAY we have an optional vector + * of constants when an initializer list + * was provided. + */ + std::vector m_initlist; + + /* usecount for the parser */ + size_t m_uses = 0; + + ir_value *m_ir_v = nullptr; + ir_value **m_ir_values = nullptr; + size_t m_ir_value_count = 0; + + /* ONLY for arrays in progs version up to 6 */ + ast_value *m_setter = nullptr; + ast_value *m_getter = nullptr; + + + bool m_intrinsic = false; /* true if associated with intrinsic */ }; -ast_value* ast_value_new(lex_ctx ctx, const char *name, int qctype); -/* This will NOT delete an underlying ast_function */ -void ast_value_delete(ast_value*); +bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield); -bool ast_value_set_name(ast_value*, const char *name); +void ast_type_to_string(const ast_expression *e, char *buf, size_t bufsize); -bool ast_value_codegen(ast_value*, ast_function*, bool lvalue, ir_value**); -bool ast_local_codegen(ast_value *self, ir_function *func, bool isparam); -bool ast_global_codegen(ast_value *self, ir_builder *ir); +enum ast_binary_ref { + AST_REF_NONE = 0, + AST_REF_LEFT = 1 << 1, + AST_REF_RIGHT = 1 << 2, + AST_REF_ALL = (AST_REF_LEFT | AST_REF_RIGHT) +}; -bool GMQCC_WARN ast_value_params_add(ast_value*, ast_value*); /* Binary * * A value-returning binary expression. */ -struct ast_binary_s +struct ast_binary : ast_expression { - ast_expression_common expression; - - int op; - ast_expression *left; - ast_expression *right; + ast_binary() = delete; + ast_binary(lex_ctx_t ctx, int op, ast_expression *l, ast_expression *r); + ~ast_binary(); + + int m_op; + ast_expression *m_left; + ast_expression *m_right; + ast_binary_ref m_refs; + bool m_right_first; }; -ast_binary* ast_binary_new(lex_ctx ctx, - int op, - ast_expression *left, - ast_expression *right); -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 : ast_expression +{ + ast_binstore() = delete; + ast_binstore(lex_ctx_t ctx, int storeop, int mathop, ast_expression *l, ast_expression *r); + ~ast_binstore(); + + int m_opstore; + int m_opbin; + ast_expression *m_dest; + ast_expression *m_source; + /* for &~= which uses the destination in a binary in source we can use this */ + bool m_keep_dest; +}; +ast_binstore* ast_binstore_new(lex_ctx_t ctx, + int storeop, + int op, + ast_expression *left, + ast_expression *right); /* Unary * * Regular unary expressions: not,neg */ -struct ast_unary_s +struct ast_unary : ast_expression { - ast_expression_common expression; - - int op; - ast_expression *operand; + ast_unary() = delete; + ~ast_unary(); + int m_op; + ast_expression *m_operand; + static ast_unary* make(lex_ctx_t ctx, int op, ast_expression *expr); +private: + ast_unary(lex_ctx_t ctx, int op, ast_expression *expr); }; -ast_unary* ast_unary_new(lex_ctx ctx, - int op, - ast_expression *expr); -void ast_unary_delete(ast_unary*); - -bool ast_unary_codegen(ast_unary*, ast_function*, bool lvalue, ir_value**); /* Return * @@ -194,16 +314,13 @@ bool ast_unary_codegen(ast_unary*, ast_function*, bool lvalue, ir_value**); * will refuse to create further instructions. * This should be honored by the parser. */ -struct ast_return_s +struct ast_return : ast_expression { - ast_expression_common expression; - ast_expression *operand; + ast_return() = delete; + ast_return(lex_ctx_t ctx, ast_expression *expr); + ~ast_return(); + ast_expression *m_operand; }; -ast_return* ast_return_new(lex_ctx ctx, - ast_expression *expr); -void ast_return_delete(ast_return*); - -bool ast_return_codegen(ast_return*, ast_function*, bool lvalue, ir_value**); /* Entity-field * @@ -218,76 +335,107 @@ bool ast_return_codegen(ast_return*, ast_function*, bool lvalue, ir_value**); * For this we will have to extend the codegen() functions with * a flag saying whether or not we need an L or an R-value. */ -struct ast_entfield_s +struct ast_entfield : ast_expression { - ast_expression_common expression; - /* The entity can come from an expression of course. */ - ast_expression *entity; - /* As can the field, it just must result in a value of TYPE_FIELD */ - ast_expression *field; + ast_entfield() = delete; + ast_entfield(lex_ctx_t ctx, ast_expression *entity, ast_expression *field); + ast_entfield(lex_ctx_t ctx, ast_expression *entity, ast_expression *field, const ast_expression *outtype); + ~ast_entfield(); + // The entity can come from an expression of course. + ast_expression *m_entity; + // As can the field, it just must result in a value of TYPE_FIELD + ast_expression *m_field; }; -ast_entfield* ast_entfield_new(lex_ctx ctx, ast_expression *entity, ast_expression *field); -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 +struct ast_member : ast_expression +{ + static ast_member *make(lex_ctx_t ctx, ast_expression *owner, unsigned int field, const std::string &name); + ~ast_member(); + + ast_expression *m_owner; + unsigned int m_field; + std::string m_name; + bool m_rvalue; + +private: + ast_member() = delete; + ast_member(lex_ctx_t ctx, ast_expression *owner, unsigned int field, const std::string &name); +}; + +/* Array index access: + * + * QC forces us to take special action on arrays: + * an ast_store on an ast_array_index must not codegen the index, + * but call its setter - unless we have an instruction set which supports + * what we need. + * Any other array index access will be codegened to a call to the getter. + * In any case, accessing an element via a compiletime-constant index will + * result in quick access to that variable. + */ +struct ast_array_index : ast_expression { - ast_expression_common expression; - ast_expression *owner; - unsigned int field; + static ast_array_index* make(lex_ctx_t ctx, ast_expression *array, ast_expression *index); + ~ast_array_index(); + ast_expression *m_array; + ast_expression *m_index; +private: + ast_array_index() = delete; + ast_array_index(lex_ctx_t ctx, ast_expression *array, ast_expression *index); }; -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**); +/* Vararg pipe node: + * + * copy all varargs starting from a specific index + */ +struct ast_argpipe : ast_expression +{ + ast_argpipe() = delete; + ast_argpipe(lex_ctx_t ctx, ast_expression *index); + ~ast_argpipe(); + ast_expression *m_index; +}; /* Store * * Stores left<-right and returns left. * Specialized binary expression node */ -struct ast_store_s +struct ast_store : ast_expression { - ast_expression_common expression; - int op; - ast_expression *dest; - ast_expression *source; + ast_store() = delete; + ast_store(lex_ctx_t ctx, int op, ast_expression *d, ast_expression *s); + ~ast_store(); + int m_op; + ast_expression *m_dest; + ast_expression *m_source; }; -ast_store* ast_store_new(lex_ctx ctx, int op, - ast_expression *d, ast_expression *s); -void ast_store_delete(ast_store*); - -bool ast_store_codegen(ast_store*, ast_function*, bool lvalue, ir_value**); /* If * - * A general 'if then else' statement, either side can be NULL and will - * thus be omitted. It is an error for *both* cases to be NULL at once. + * A general 'if then else' statement, either side can be nullptr and will + * thus be omitted. It is an error for *both* cases to be nullptr at once. * * During its 'codegen' it'll be changing the ast_function's block. * - * An if is also an "expression". Its codegen will put NULL into the + * An if is also an "expression". Its codegen will put nullptr into the * output field though. For ternary expressions an ast_ternary will be * added. */ -struct ast_ifthen_s +struct ast_ifthen : ast_expression { - ast_expression_common expression; - ast_expression *cond; + ast_ifthen() = delete; + ast_ifthen(lex_ctx_t ctx, ast_expression *cond, ast_expression *ontrue, ast_expression *onfalse); + ~ast_ifthen(); + ast_expression *m_cond; /* It's all just 'expressions', since an ast_block is one too. */ - ast_expression *on_true; - ast_expression *on_false; + ast_expression *m_on_true; + ast_expression *m_on_false; }; -ast_ifthen* ast_ifthen_new(lex_ctx ctx, ast_expression *cond, ast_expression *ontrue, ast_expression *onfalse); -void ast_ifthen_delete(ast_ifthen*); - -bool ast_ifthen_codegen(ast_ifthen*, ast_function*, bool lvalue, ir_value**); /* Ternary expressions... * @@ -297,26 +445,21 @@ bool ast_ifthen_codegen(ast_ifthen*, ast_function*, bool lvalue, ir_value**); * a PHI node. * * The other difference is that in an ast_ternary, NEITHER side - * must be NULL, there's ALWAYS an else branch. + * must be nullptr, there's ALWAYS an else branch. * * This is the only ast_node beside ast_value which contains * an ir_value. Theoretically we don't need to remember it though. */ -struct ast_ternary_s +struct ast_ternary : ast_expression { - ast_expression_common expression; - ast_expression *cond; + ast_ternary() = delete; + ast_ternary(lex_ctx_t ctx, ast_expression *cond, ast_expression *ontrue, ast_expression *onfalse); + ~ast_ternary(); + ast_expression *m_cond; /* It's all just 'expressions', since an ast_block is one too. */ - ast_expression *on_true; - ast_expression *on_false; - /* After a ternary expression we find ourselves in a new IR block - * and start with a PHI node */ - ir_value *phi_out; + ast_expression *m_on_true; + ast_expression *m_on_false; }; -ast_ternary* ast_ternary_new(lex_ctx ctx, ast_expression *cond, ast_expression *ontrue, ast_expression *onfalse); -void ast_ternary_delete(ast_ternary*); - -bool ast_ternary_codegen(ast_ternary*, ast_function*, bool lvalue, ir_value**); /* A general loop node * @@ -341,24 +484,104 @@ continue: // a 'continue' will jump here {inc}; } */ -struct ast_loop_s +struct ast_loop : ast_expression +{ + ast_loop() = delete; + ast_loop(lex_ctx_t ctx, + ast_expression *initexpr, + ast_expression *precond, bool pre_not, + ast_expression *postcond, bool post_not, + ast_expression *increment, + ast_expression *body); + ~ast_loop(); + ast_expression *m_initexpr; + ast_expression *m_precond; + ast_expression *m_postcond; + ast_expression *m_increment; + ast_expression *m_body; + /* For now we allow a seperate flag on whether or not the condition + * is supposed to be true or false. + * That way, the parser can generate a 'while not(!x)' for `while(x)` + * if desired, which is useful for the new -f{true,false}-empty-strings + * flag. + */ + bool m_pre_not; + bool m_post_not; +}; + +/* Break/Continue + */ +struct ast_breakcont : ast_expression +{ + bool m_is_continue; + unsigned int m_levels; +}; +ast_breakcont* ast_breakcont_new(lex_ctx_t ctx, bool iscont, unsigned int levels); + +/* Switch Statements + * + * A few notes about this: with the original QCVM, no real optimization + * is possible. The SWITCH instruction set isn't really helping a lot, since + * it only collapes the EQ and IF instructions into one. + * Note: Declaring local variables inside caseblocks is normal. + * Since we don't have to deal with a stack there's no unnatural behaviour to + * be expected from it. + * TODO: Ticket #20 + */ +struct ast_switch_case { + ast_expression *m_value; /* #20 will replace this */ + ast_expression *m_code; +}; + +struct ast_switch : ast_expression +{ + ast_expression *m_operand; + std::vector m_cases; +}; + +ast_switch* ast_switch_new(lex_ctx_t ctx, ast_expression *op); + +/* Label nodes + * + * Introduce a label which can be used together with 'goto' + */ +struct ast_label : ast_expression { - ast_expression_common expression; - ast_expression *initexpr; - ast_expression *precond; - ast_expression *postcond; - ast_expression *increment; - ast_expression *body; + const char *m_name; + ir_block *m_irblock; + std::vector m_gotos; + + /* means it has not yet been defined */ + bool m_undefined; +}; + +ast_label* ast_label_new(lex_ctx_t ctx, const char *name, bool undefined); + +/* GOTO nodes + * + * Go to a label, the label node is filled in at a later point! + */ +struct ast_goto : ast_expression +{ + const char *m_name; + ast_label *m_target; + ir_block *m_irblock_from; }; -ast_loop* ast_loop_new(lex_ctx ctx, - ast_expression *initexpr, - ast_expression *precond, - ast_expression *postcond, - ast_expression *increment, - ast_expression *body); -void ast_loop_delete(ast_loop*); -bool ast_loop_codegen(ast_loop*, ast_function*, bool lvalue, ir_value**); +ast_goto* ast_goto_new(lex_ctx_t ctx, const char *name); +void ast_goto_set_label(ast_goto*, ast_label*); + +/* STATE node + * + * For frame/think state updates: void foo() [framenum, nextthink] {} + */ +struct ast_state : ast_expression +{ + ast_expression *m_framenum; + ast_expression *m_nextthink; +}; +ast_state* ast_state_new(lex_ctx_t ctx, ast_expression *frame, ast_expression *think); +void ast_state_delete(ast_state*); /* CALL node * @@ -370,37 +593,31 @@ bool ast_loop_codegen(ast_loop*, ast_function*, bool lvalue, ir_value**); * Additionally it contains a list of ast_expressions as parameters. * Since calls can return values, an ast_call is also an ast_expression. */ -struct ast_call_s +struct ast_call : ast_expression { - ast_expression_common expression; - ast_expression *func; - MEM_VECTOR_MAKE(ast_expression*, params); + ast_expression *m_func; + std::vector m_params; + ast_expression *m_va_count; }; -ast_call* ast_call_new(lex_ctx ctx, +ast_call* ast_call_new(lex_ctx_t ctx, ast_expression *funcexpr); -void ast_call_delete(ast_call*); -bool ast_call_codegen(ast_call*, ast_function*, bool lvalue, ir_value**); - -MEM_VECTOR_PROTO(ast_call, ast_expression*, params); +bool ast_call_check_types(ast_call*, ast_expression *this_func_va_type); /* Blocks * */ -struct ast_block_s +struct ast_block : ast_expression { - ast_expression_common expression; - - MEM_VECTOR_MAKE(ast_value*, locals); - MEM_VECTOR_MAKE(ast_expression*, exprs); + std::vector m_locals; + std::vector m_exprs; + std::vector m_collect; }; -ast_block* ast_block_new(lex_ctx ctx); +ast_block* ast_block_new(lex_ctx_t ctx); void ast_block_delete(ast_block*); -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); +void ast_block_set_type(ast_block*, ast_expression *from); +void ast_block_collect(ast_block*, ast_expression*); -bool ast_block_codegen(ast_block*, ast_function*, bool lvalue, ir_value**); +bool GMQCC_WARN ast_block_add_expr(ast_block*, ast_expression*); /* Function * @@ -412,30 +629,39 @@ bool ast_block_codegen(ast_block*, ast_function*, bool lvalue, ir_value**); * pointers could just work with a name. However, this way could be * more flexible, and adds no real complexity. */ -struct ast_function_s +struct ast_function : ast_node { - ast_node_common node; + ast_value *m_function_type; + const char *m_name; - ast_value *vtype; - const char *name; + int m_builtin; - int builtin; + /* list of used-up names for statics without the count suffix */ + std::vector m_static_names; + /* number of static variables, by convention this includes the + * ones without the count-suffix - remember this when dealing + * with savegames. uint instead of size_t as %zu in printf is + * C99, so no windows support. */ + unsigned int m_static_count; - ir_function *ir_func; - ir_block *curblock; - ir_block *breakblock; - ir_block *continueblock; + ir_function *m_ir_func; + ir_block *m_curblock; + std::vector m_breakblocks; + std::vector m_continueblocks; - size_t labelcount; + size_t m_labelcount; /* in order for thread safety - for the optional * channel abesed multithreading... keeping a buffer * here to use in ast_function_label. */ - char labelbuf[64]; - - MEM_VECTOR_MAKE(ast_block*, blocks); + char m_labelbuf[64]; + std::vector> m_blocks; + ast_value *m_varargs; + ast_value *m_argc; + ast_value *m_fixedparams; + ast_value *m_return_value; }; -ast_function* ast_function_new(lex_ctx ctx, const char *name, ast_value *vtype); +ast_function* ast_function_new(lex_ctx_t ctx, const char *name, ast_value *vtype); /* This will NOT delete the underlying ast_value */ void ast_function_delete(ast_function*); /* For "optimized" builds this can just keep returning "foo"... @@ -443,31 +669,14 @@ void ast_function_delete(ast_function*); */ const char* ast_function_label(ast_function*, const char *prefix); -MEM_VECTOR_PROTO(ast_function, ast_block*, blocks); - bool ast_function_codegen(ast_function *self, ir_builder *builder); +bool ast_generate_accessors(ast_value *asvalue, ir_builder *ir); -/* Expression union - */ -union ast_expression_u -{ - ast_expression_common expression; - - ast_value value; - ast_binary binary; - ast_block block; - ast_ternary ternary; - ast_ifthen ifthen; - ast_store store; - ast_entfield entfield; -}; - -/* Node union +/* + * If the condition creates a situation where this becomes -1 size it means there are + * more AST_FLAGs than the type ast_flag_t is capable of holding. So either eliminate + * the AST flag count or change the ast_flag_t typedef to a type large enough to accomodate + * all the flags. */ -union ast_node_u -{ - ast_node_common node; - ast_expression expression; -}; - +typedef int static_assert_is_ast_flag_safe [((AST_FLAG_LAST) <= (ast_flag_t)(-1)) ? 1 : -1]; #endif