fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 22:49:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Additional void parameter checks

Browse source 
If there is a void parameter it must not have a name, and it must be
the only parameter.
This commit is contained in:
Ian Romanick 2010-04-02 15:30:45 -07:00
parent 45d8a70c12
commit cf37c9e8da
2 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ast.h
View file

@ -440,6 +440,13 @@ public:
private:
/** Is this parameter declaration part of a formal parameter list? */
bool formal_parameter;
/**
* Is this parameter 'void' type?
*
* This field is set by \c ::hir.
*/
bool is_void;
};

23
ast_to_hir.cpp
View file

@ -1625,14 +1625,21 @@ ast_parameter_declarator::hir(exec_list *instructions,
* for a function, which avoids tripping up checks for main taking
* parameters and lookups of an unnamed symbol.
*/
if (type->is_void() && (this->identifier == NULL))
if (type->is_void()) {
if (this->identifier != NULL)
_mesa_glsl_error(& loc, state,
"named parameter cannot have type `void'");
is_void = true;
return NULL;
}
if (formal_parameter && (this->identifier == NULL)) {
_mesa_glsl_error(& loc, state, "formal parameter lacks a name");
return NULL;
}
is_void = false;
ir_variable *var = new ir_variable(type, this->identifier);
/* FINISHME: Handle array declarations. Note that this requires
@ -1661,11 +1668,25 @@ ast_parameter_declarator::parameters_to_hir(struct simple_node *ast_parameters,
_mesa_glsl_parse_state *state)
{
struct simple_node *ptr;
ast_parameter_declarator *void_param = NULL;
unsigned count = 0;
foreach (ptr, ast_parameters) {
ast_parameter_declarator *param = (ast_parameter_declarator *)ptr;
param->formal_parameter = formal;
param->hir(ir_parameters, state);
if (param->is_void)
void_param = param;
count++;
}
if ((void_param != NULL) && (count > 1)) {
YYLTYPE loc = void_param->get_location();
_mesa_glsl_error(& loc, state,
"`void' parameter must be only parameter");
}
}