ast: Updated AST_NUM_OPERATORS for coherence with ast_operators

AST_NUM_OPERATORS stores the dimension of the ast_operators
enumeration but was not updated after its last modification.

This doesn't add any real modification for any code paths but it makes
sense for coherence.

v2 (Eric Engestrom): Just place the define at the end of the
                     enumeration, not below.

Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
This commit is contained in:
Andres Gomez
2016-07-31 19:07:34 +03:00
parent c3211ae093
commit 3356ac208b
2 changed files with 10 additions and 9 deletions

View File

@@ -198,6 +198,15 @@ enum ast_operators {
ast_sequence,
ast_aggregate
/**
* Number of possible operators for an ast_expression
*
* This is done as a define instead of as an additional value in the enum so
* that the compiler won't generate spurious messages like "warning:
* enumeration value ast_num_operators not handled in switch"
*/
#define AST_NUM_OPERATORS (ast_aggregate + 1)
};
/**
@@ -416,15 +425,6 @@ public:
struct _mesa_glsl_parse_state *state);
};
/**
* Number of possible operators for an ast_expression
*
* This is done as a define instead of as an additional value in the enum so
* that the compiler won't generate spurious messages like "warning:
* enumeration value ast_num_operators not handled in switch"
*/
#define AST_NUM_OPERATORS (ast_sequence + 1)
class ast_compound_statement : public ast_node {
public:

View File

@@ -1351,6 +1351,7 @@ ast_expression::do_hir(exec_list *instructions,
-1, /* ast_float_constant doesn't conv to ir_expression. */
-1, /* ast_bool_constant doesn't conv to ir_expression. */
-1, /* ast_sequence doesn't convert to ir_expression. */
-1, /* ast_aggregate shouldn't ever even get here. */
};
ir_rvalue *result = NULL;
ir_rvalue *op[3];