diff options
author | marha <marha@users.sourceforge.net> | 2014-07-11 18:04:20 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-07-11 18:04:20 +0200 |
commit | 3865d60ef607cbb00c819e905e40d3628b8eca29 (patch) | |
tree | 73d8064951a7abbe4897bcc25959463d08544495 /mesalib/src/glsl/glcpp/glcpp.h | |
parent | 294a395f15dec9e7aa24b83b08f47ba54b9bd232 (diff) | |
parent | e708bebcc029873004ade4241f347ce8c58896af (diff) | |
download | vcxsrv-3865d60ef607cbb00c819e905e40d3628b8eca29.tar.gz vcxsrv-3865d60ef607cbb00c819e905e40d3628b8eca29.tar.bz2 vcxsrv-3865d60ef607cbb00c819e905e40d3628b8eca29.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/glsl/glcpp/glcpp.h')
-rw-r--r-- | mesalib/src/glsl/glcpp/glcpp.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mesalib/src/glsl/glcpp/glcpp.h b/mesalib/src/glsl/glcpp/glcpp.h index 79ccb234f..64b487202 100644 --- a/mesalib/src/glsl/glcpp/glcpp.h +++ b/mesalib/src/glsl/glcpp/glcpp.h @@ -37,6 +37,12 @@ /* Some data types used for parser values. */ +typedef struct expression_value { + intmax_t value; + char *undefined_macro; +} expression_value_t; + + typedef struct string_node { const char *str; struct string_node *next; @@ -53,6 +59,7 @@ typedef struct token_list token_list_t; typedef union YYSTYPE { intmax_t ival; + expression_value_t expression_value; char *str; string_list_t *string_list; token_t *token; @@ -168,7 +175,7 @@ struct glcpp_parser { yyscan_t scanner; struct hash_table *defines; active_list_t *active; - int lexing_if; + int lexing_directive; int space_tokens; int newline_as_space; int in_control_line; |