X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=ast.h;h=f18c73ebe0d5e7ecb94f7012a3dcd15e4a7a9a6c;hb=e02ebfe4866c5dadc1d411b38673e360405de983;hp=39cd950a158ba8a74b5a1a850eaa18dfd2c86383;hpb=ebb7cb2ae39dad8eb59310b16ad4958a69c385c3;p=xonotic%2Fgmqcc.git diff --git a/ast.h b/ast.h index 39cd950..f18c73e 100644 --- a/ast.h +++ b/ast.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 + * Copyright (C) 2012, 2013 * Wolfgang Bumiller * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -95,7 +95,7 @@ typedef struct bool side_effects; } ast_node_common; -#define ast_delete(x) ( ( (ast_node*)(x) ) -> node.destroy )((ast_node*)(x)) +#define ast_delete(x) (*( ((ast_node*)(x))->node.destroy ))((ast_node*)(x)) #define ast_unref(x) do \ { \ if (! (((ast_node*)(x))->node.keep) ) { \ @@ -132,6 +132,10 @@ typedef struct size_t count; ast_value* *params; uint32_t flags; + /* void foo(string...) gets varparam set as a restriction + * for variadic parameters + */ + ast_expression *varparam; /* 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 @@ -142,6 +146,13 @@ typedef struct } ast_expression_common; #define AST_FLAG_VARIADIC (1<<0) #define AST_FLAG_NORETURN (1<<1) +#define AST_FLAG_INLINE (1<<2) +#define AST_FLAG_INITIALIZED (1<<3) +#define AST_FLAG_DEPRECATED (1<<4) +#define AST_FLAG_INCLUDE_DEF (1<<5) +#define AST_FLAG_IS_VARARG (1<<6) +#define AST_FLAG_ALIAS (1<<7) +#define AST_FLAG_TYPE_MASK (AST_FLAG_VARIADIC | AST_FLAG_NORETURN) /* Value * @@ -150,11 +161,23 @@ typedef struct * typedef float foo; * is like creating a 'float foo', foo serving as the type's name. */ +typedef union { + double vfloat; + int vint; + vector vvec; + const char *vstring; + int ventity; + ast_function *vfunc; + ast_value *vfield; +} basic_value_t; struct ast_value_s { ast_expression_common expression; const char *name; + const char *desc; + + const char *argcounter; /* int vtype; @@ -163,16 +186,14 @@ struct ast_value_s int cvq; /* const/var qualifier */ bool isfield; /* this declares a field */ + bool isimm; /* an immediate, not just const */ bool hasvalue; - union { - double vfloat; - int vint; - vector vvec; - const char *vstring; - int ventity; - ast_function *vfunc; - ast_value *vfield; - } constval; + basic_value_t constval; + /* for TYPE_ARRAY we have an optional vector + * of constants when an initializer list + * was provided. + */ + basic_value_t *initlist; /* usecount for the parser */ size_t uses; @@ -202,9 +223,16 @@ 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); #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_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_LEFT = 1 << 1, + AST_REF_RIGHT = 1 << 2, + AST_REF_ALL = (AST_REF_LEFT | AST_REF_RIGHT) +} ast_binary_ref; + + /* Binary * * A value-returning binary expression. @@ -216,6 +244,8 @@ struct ast_binary_s int op; ast_expression *left; ast_expression *right; + ast_binary_ref refs; + }; ast_binary* ast_binary_new(lex_ctx ctx, int op, @@ -323,6 +353,7 @@ struct ast_member_s 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); void ast_member_delete(ast_member*); @@ -519,9 +550,11 @@ struct ast_label_s const char *name; ir_block *irblock; ast_goto **gotos; + /* means it has not yet been defined */ + bool undefined; }; -ast_label* ast_label_new(lex_ctx ctx, const char *name); +ast_label* ast_label_new(lex_ctx ctx, const char *name, bool undefined); void ast_label_delete(ast_label*); void ast_label_register_goto(ast_label*, ast_goto*); @@ -560,6 +593,7 @@ struct ast_call_s ast_expression_common expression; ast_expression *func; ast_expression* *params; + ast_expression *va_count; }; ast_call* ast_call_new(lex_ctx ctx, ast_expression *funcexpr); @@ -580,7 +614,7 @@ struct ast_block_s }; ast_block* ast_block_new(lex_ctx ctx); void ast_block_delete(ast_block*); -bool ast_block_set_type(ast_block*, ast_expression *from); +void ast_block_set_type(ast_block*, ast_expression *from); bool ast_block_codegen(ast_block*, ast_function*, bool lvalue, ir_value**); void ast_block_collect(ast_block*, ast_expression*); @@ -608,8 +642,8 @@ struct ast_function_s ir_function *ir_func; ir_block *curblock; - ir_block *breakblock; - ir_block *continueblock; + ir_block **breakblocks; + ir_block **continueblocks; #if 0 /* In order for early-out logic not to go over @@ -628,6 +662,10 @@ struct ast_function_s char labelbuf[64]; ast_block* *blocks; + + ast_value *varargs; + ast_value *argc; + ast_value *fixedparams; }; ast_function* ast_function_new(lex_ctx ctx, const char *name, ast_value *vtype); /* This will NOT delete the underlying ast_value */ @@ -645,14 +683,6 @@ bool ast_generate_accessors(ast_value *asvalue, ir_builder *ir); 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 @@ -660,7 +690,6 @@ union ast_expression_u union ast_node_u { ast_node_common node; - ast_expression expression; }; #endif