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

Reject conflicting struct declarations, generate struct constructor

Browse source
This commit is contained in:
Ian Romanick 2010-04-23 13:24:08 -07:00
parent 82baaf4283
commit ab89927a91
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ast_to_hir.cpp
View file

@ -2346,7 +2346,20 @@ ast_struct_specifier::hir(exec_list *instructions,
glsl_type *t = new glsl_type(fields, decl_count, name);
state->symbols->add_type(name, t);
YYLTYPE loc = this->get_location();
if (!state->symbols->add_type(name, t)) {
_mesa_glsl_error(& loc, state, "struct `%s' previously defined", name);
} else {
/* This logic is a bit tricky. It is an error to declare a structure at
* global scope if there is also a function with the same name.
*/
if ((state->current_function == NULL)
&& (state->symbols->get_function(name) != NULL)) {
_mesa_glsl_error(& loc, state, "name `%s' previously defined", name);
} else {
t->generate_constructor(state->symbols);
}
}
/* Structure type definitions do not have r-values.
*/