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

Require that function formal parameters have names

Browse source
This commit is contained in:
Ian Romanick 2010-04-02 15:09:33 -07:00
parent 3f9a73d121
commit 45d8a70c12
2 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ast.h
View file

@ -432,6 +432,14 @@ public:
char *identifier;
int is_array;
ast_expression *array_size;
static void parameters_to_hir(simple_node *ast_parameters,
bool formal, exec_list *ir_parameters,
struct _mesa_glsl_parse_state *state);
private:
/** Is this parameter declaration part of a formal parameter list? */
bool formal_parameter;
};

22
ast_to_hir.cpp
View file

@ -1628,6 +1628,11 @@ ast_parameter_declarator::hir(exec_list *instructions,
if (type->is_void() && (this->identifier == NULL))
return NULL;
if (formal_parameter && (this->identifier == NULL)) {
_mesa_glsl_error(& loc, state, "formal parameter lacks a name");
return NULL;
}
ir_variable *var = new ir_variable(type, this->identifier);
/* FINISHME: Handle array declarations. Note that this requires
@ -1649,17 +1654,18 @@ ast_parameter_declarator::hir(exec_list *instructions,
}
static void
ast_function_parameters_to_hir(struct simple_node *ast_parameters,
exec_list *ir_parameters,
struct _mesa_glsl_parse_state *state)
void
ast_parameter_declarator::parameters_to_hir(struct simple_node *ast_parameters,
bool formal,
exec_list *ir_parameters,
_mesa_glsl_parse_state *state)
{
struct simple_node *ptr;
foreach (ptr, ast_parameters) {
ast_node *param = (ast_node *)ptr;
ast_parameter_declarator *param = (ast_parameter_declarator *)ptr;
param->formal_parameter = formal;
param->hir(ir_parameters, state);
}
}
@ -1713,7 +1719,9 @@ ast_function::hir(exec_list *instructions,
* used below to compare this function's signature with previously seen
* signatures for functions with the same name.
*/
ast_function_parameters_to_hir(& this->parameters, & hir_parameters, state);
ast_parameter_declarator::parameters_to_hir(& this->parameters,
is_definition,
& hir_parameters, state);
const char *return_type_name;
const glsl_type *return_type =