fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-09 12:40:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glsl: Fix handling of nested parens in macro actual arguments.

Browse source
This commit is contained in:
Michal Krol 2008-12-18 18:45:32 +01:00 • committed by Brian Paul
parent f43019b226
commit d9b92b112f
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/mesa/shader/slang/slang_preprocess.c
View file

@ -641,8 +641,10 @@ expand_symbol (expand_state *e, pp_symbol *symbol)
SKIP_WHITE(e->input);
/* Parse macro actual parameters. This can be anything, separated by a colon.
* TODO: What about nested/grouped parameters by parenthesis? */
*/
for (i = 0; i < symbol->parameters.count; i++) {
GLuint nested_paren_count = 0; /* track number of nested parentheses */
if (*e->input == ')') {
slang_info_log_error (e->state->elog, "preprocess error: unexpected ')'.");
return GL_FALSE;
@ -650,8 +652,19 @@ expand_symbol (expand_state *e, pp_symbol *symbol)
/* Eat all characters up to the comma or closing parentheses. */
pp_symbol_reset (&symbol->parameters.symbols[i]);
while (!IS_NULL(*e->input) && *e->input != ',' && *e->input != ')')
while (!IS_NULL(*e->input)) {
/* Exit loop only when all nested parens have been eaten. */
if (nested_paren_count == 0 && (*e->input == ',' || *e->input == ')'))
break;
/* Actually count nested parens here. */
if (*e->input == '(')
nested_paren_count++;
else if (*e->input == ')')
nested_paren_count--;
slang_string_pushc (&symbol->parameters.symbols[i].replacement, *e->input++);
}
/* If it was not the last paremeter, skip the comma. Otherwise, skip the
* closing parentheses. */