X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=ast.h;h=98ad79228fee073da2a66cf4dbc581f4f4728b53;hb=8c8ae71d653e3111fc9857ad3381489b82b18a4b;hp=14d38d886458efb76207fe878b2a2d46aacee1f0;hpb=160e7cf7eebd7fa173fb739aca00143097a3518b;p=xonotic%2Fgmqcc.git diff --git a/ast.h b/ast.h index 14d38d8..98ad792 100644 --- a/ast.h +++ b/ast.h @@ -161,6 +161,15 @@ 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; @@ -177,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;