X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=ast.h;h=bb7a3170a7c108a51d6792cb5588fee64e1a9ac0;hp=a0fa14defca70bfadeeee0224bf5936d6f6249b4;hb=a68f0fcb355db42acabe72da5939fbd1b04f6016;hpb=9f2b9e1b46c583d12796df8741bd9b448397b8cb diff --git a/ast.h b/ast.h index a0fa14d..bb7a317 100644 --- a/ast.h +++ b/ast.h @@ -51,6 +51,7 @@ typedef struct ast_breakcont_s ast_breakcont; typedef struct ast_switch_s ast_switch; typedef struct ast_label_s ast_label; typedef struct ast_goto_s ast_goto; +typedef struct ast_argpipe_s ast_argpipe; enum { TYPE_ast_node, /* 0 */ @@ -73,7 +74,8 @@ enum { TYPE_ast_breakcont, /* 17 */ TYPE_ast_switch, /* 18 */ TYPE_ast_label, /* 19 */ - TYPE_ast_goto /* 20 */ + TYPE_ast_goto, /* 20 */ + TYPE_ast_argpipe /* 21 */ }; #define ast_istype(x, t) ( ((ast_node*)x)->nodetype == (TYPE_##t) ) @@ -85,7 +87,7 @@ enum { typedef void ast_node_delete(ast_node*); struct ast_node_common { - lex_ctx context; + lex_ctx_t context; /* I don't feel comfortable using keywords like 'delete' as names... */ ast_node_delete *destroy; int nodetype; @@ -153,6 +155,9 @@ struct ast_expression_common #define AST_FLAG_INCLUDE_DEF (1<<5) #define AST_FLAG_IS_VARARG (1<<6) #define AST_FLAG_ALIAS (1<<7) +/* An array declared as [] + * so that the size is taken from the initializer */ +#define AST_FLAG_ARRAY_INIT (1<<8) #define AST_FLAG_TYPE_MASK (AST_FLAG_VARIADIC | AST_FLAG_NORETURN) /* Value @@ -165,12 +170,13 @@ struct ast_expression_common typedef union { double vfloat; int vint; - vector vvec; + vec3_t vvec; const char *vstring; int ventity; ast_function *vfunc; ast_value *vfield; } basic_value_t; + struct ast_value_s { ast_expression expression; @@ -180,11 +186,6 @@ struct ast_value_s const char *argcounter; - /* - int vtype; - ast_value *next; - */ - int cvq; /* const/var qualifier */ bool isfield; /* this declares a field */ bool isimm; /* an immediate, not just const */ @@ -208,7 +209,7 @@ struct ast_value_s ast_value *getter; }; -ast_value* ast_value_new(lex_ctx ctx, const char *name, int qctype); +ast_value* ast_value_new(lex_ctx_t 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*); @@ -225,12 +226,13 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield); void 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); +ast_expression* ast_type_copy(lex_ctx_t ctx, const ast_expression *ex); #define ast_type_adopt(a, b) ast_type_adopt_impl((ast_expression*)(a), (ast_expression*)(b)) void ast_type_adopt_impl(ast_expression *self, const ast_expression *other); void ast_type_to_string(ast_expression *e, char *buf, size_t bufsize); typedef enum ast_binary_ref_s { + AST_REF_NONE = 0, AST_REF_LEFT = 1 << 1, AST_REF_RIGHT = 1 << 2, AST_REF_ALL = (AST_REF_LEFT | AST_REF_RIGHT) @@ -251,7 +253,7 @@ struct ast_binary_s ast_binary_ref refs; }; -ast_binary* ast_binary_new(lex_ctx ctx, +ast_binary* ast_binary_new(lex_ctx_t ctx, int op, ast_expression *left, ast_expression *right); @@ -272,7 +274,7 @@ struct ast_binstore_s /* for &~= which uses the destination in a binary in source we can use this */ bool keep_dest; }; -ast_binstore* ast_binstore_new(lex_ctx ctx, +ast_binstore* ast_binstore_new(lex_ctx_t ctx, int storeop, int op, ast_expression *left, @@ -289,7 +291,7 @@ struct ast_unary_s int op; ast_expression *operand; }; -ast_unary* ast_unary_new(lex_ctx ctx, +ast_unary* ast_unary_new(lex_ctx_t ctx, int op, ast_expression *expr); @@ -304,7 +306,7 @@ struct ast_return_s ast_expression expression; ast_expression *operand; }; -ast_return* ast_return_new(lex_ctx ctx, +ast_return* ast_return_new(lex_ctx_t ctx, ast_expression *expr); /* Entity-field @@ -328,8 +330,8 @@ struct ast_entfield_s /* As can the field, it just must result in a value of TYPE_FIELD */ ast_expression *field; }; -ast_entfield* ast_entfield_new(lex_ctx ctx, ast_expression *entity, ast_expression *field); -ast_entfield* ast_entfield_new_force(lex_ctx ctx, ast_expression *entity, ast_expression *field, const ast_expression *outtype); +ast_entfield* ast_entfield_new(lex_ctx_t ctx, ast_expression *entity, ast_expression *field); +ast_entfield* ast_entfield_new_force(lex_ctx_t ctx, ast_expression *entity, ast_expression *field, const ast_expression *outtype); /* Member access: * @@ -338,13 +340,13 @@ ast_entfield* ast_entfield_new_force(lex_ctx ctx, ast_expression *entity, ast_ex */ struct ast_member_s { - ast_expression expression; + ast_expression expression; ast_expression *owner; unsigned int field; const char *name; bool rvalue; }; -ast_member* ast_member_new(lex_ctx ctx, ast_expression *owner, unsigned int field, const char *name); +ast_member* ast_member_new(lex_ctx_t ctx, ast_expression *owner, unsigned int field, const char *name); void ast_member_delete(ast_member*); bool ast_member_set_name(ast_member*, const char *name); @@ -361,11 +363,22 @@ bool ast_member_set_name(ast_member*, const char *name); */ struct ast_array_index_s { - ast_expression expression; + ast_expression expression; ast_expression *array; ast_expression *index; }; -ast_array_index* ast_array_index_new(lex_ctx ctx, ast_expression *array, ast_expression *index); +ast_array_index* ast_array_index_new(lex_ctx_t ctx, ast_expression *array, ast_expression *index); + +/* Vararg pipe node: + * + * copy all varargs starting from a specific index + */ +struct ast_argpipe_s +{ + ast_expression expression; + ast_expression *index; +}; +ast_argpipe* ast_argpipe_new(lex_ctx_t ctx, ast_expression *index); /* Store * @@ -374,12 +387,12 @@ ast_array_index* ast_array_index_new(lex_ctx ctx, ast_expression *array, ast_exp */ struct ast_store_s { - ast_expression expression; + ast_expression expression; int op; ast_expression *dest; ast_expression *source; }; -ast_store* ast_store_new(lex_ctx ctx, int op, +ast_store* ast_store_new(lex_ctx_t ctx, int op, ast_expression *d, ast_expression *s); /* If @@ -395,13 +408,13 @@ ast_store* ast_store_new(lex_ctx ctx, int op, */ struct ast_ifthen_s { - ast_expression expression; + ast_expression expression; ast_expression *cond; /* It's all just 'expressions', since an ast_block is one too. */ ast_expression *on_true; ast_expression *on_false; }; -ast_ifthen* ast_ifthen_new(lex_ctx ctx, ast_expression *cond, ast_expression *ontrue, ast_expression *onfalse); +ast_ifthen* ast_ifthen_new(lex_ctx_t ctx, ast_expression *cond, ast_expression *ontrue, ast_expression *onfalse); /* Ternary expressions... * @@ -418,13 +431,13 @@ ast_ifthen* ast_ifthen_new(lex_ctx ctx, ast_expression *cond, ast_expression *on */ struct ast_ternary_s { - ast_expression expression; + ast_expression expression; ast_expression *cond; /* It's all just 'expressions', since an ast_block is one too. */ ast_expression *on_true; ast_expression *on_false; }; -ast_ternary* ast_ternary_new(lex_ctx ctx, ast_expression *cond, ast_expression *ontrue, ast_expression *onfalse); +ast_ternary* ast_ternary_new(lex_ctx_t ctx, ast_expression *cond, ast_expression *ontrue, ast_expression *onfalse); /* A general loop node * @@ -451,7 +464,7 @@ continue: // a 'continue' will jump here */ struct ast_loop_s { - ast_expression expression; + ast_expression expression; ast_expression *initexpr; ast_expression *precond; ast_expression *postcond; @@ -466,7 +479,7 @@ struct ast_loop_s bool pre_not; bool post_not; }; -ast_loop* ast_loop_new(lex_ctx ctx, +ast_loop* ast_loop_new(lex_ctx_t ctx, ast_expression *initexpr, ast_expression *precond, bool pre_not, ast_expression *postcond, bool post_not, @@ -477,11 +490,11 @@ ast_loop* ast_loop_new(lex_ctx ctx, */ struct ast_breakcont_s { - ast_expression expression; - bool is_continue; - unsigned int levels; + ast_expression expression; + bool is_continue; + unsigned int levels; }; -ast_breakcont* ast_breakcont_new(lex_ctx ctx, bool iscont, unsigned int levels); +ast_breakcont* ast_breakcont_new(lex_ctx_t ctx, bool iscont, unsigned int levels); /* Switch Statements * @@ -499,13 +512,13 @@ typedef struct { } ast_switch_case; struct ast_switch_s { - ast_expression expression; + ast_expression expression; ast_expression *operand; ast_switch_case *cases; }; -ast_switch* ast_switch_new(lex_ctx ctx, ast_expression *op); +ast_switch* ast_switch_new(lex_ctx_t ctx, ast_expression *op); /* Label nodes * @@ -513,15 +526,16 @@ ast_switch* ast_switch_new(lex_ctx ctx, ast_expression *op); */ struct ast_label_s { - ast_expression expression; - const char *name; - ir_block *irblock; - ast_goto **gotos; + ast_expression expression; + const char *name; + ir_block *irblock; + ast_goto **gotos; + /* means it has not yet been defined */ - bool undefined; + bool undefined; }; -ast_label* ast_label_new(lex_ctx ctx, const char *name, bool undefined); +ast_label* ast_label_new(lex_ctx_t ctx, const char *name, bool undefined); /* GOTO nodes * @@ -529,13 +543,13 @@ ast_label* ast_label_new(lex_ctx ctx, const char *name, bool undefined); */ struct ast_goto_s { - ast_expression expression; - const char *name; - ast_label *target; - ir_block *irblock_from; + ast_expression expression; + const char *name; + ast_label *target; + ir_block *irblock_from; }; -ast_goto* ast_goto_new(lex_ctx ctx, const char *name); +ast_goto* ast_goto_new(lex_ctx_t ctx, const char *name); void ast_goto_set_label(ast_goto*, ast_label*); /* CALL node @@ -550,27 +564,27 @@ void ast_goto_set_label(ast_goto*, ast_label*); */ struct ast_call_s { - ast_expression expression; + ast_expression expression; ast_expression *func; - ast_expression* *params; + ast_expression **params; ast_expression *va_count; }; -ast_call* ast_call_new(lex_ctx ctx, +ast_call* ast_call_new(lex_ctx_t ctx, ast_expression *funcexpr); -bool ast_call_check_types(ast_call*); +bool ast_call_check_types(ast_call*, ast_expression *this_func_va_type); /* Blocks * */ struct ast_block_s { - ast_expression expression; + ast_expression expression; ast_value* *locals; ast_expression* *exprs; ast_expression* *collect; }; -ast_block* ast_block_new(lex_ctx ctx); +ast_block* ast_block_new(lex_ctx_t ctx); void ast_block_delete(ast_block*); void ast_block_set_type(ast_block*, ast_expression *from); void ast_block_collect(ast_block*, ast_expression*); @@ -589,7 +603,7 @@ bool GMQCC_WARN ast_block_add_expr(ast_block*, ast_expression*); */ struct ast_function_s { - ast_node node; + ast_node node; ast_value *vtype; const char *name; @@ -624,13 +638,13 @@ struct ast_function_s ast_value *fixedparams; ast_value *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"... * or whatever... */ -/*const char* ast_function_label(ast_function*, const char *prefix);*/ +const char* ast_function_label(ast_function*, const char *prefix); bool ast_function_codegen(ast_function *self, ir_builder *builder); bool ast_generate_accessors(ast_value *asvalue, ir_builder *ir);