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

Provide implementation for macro arguments containing parentheses.

Browse source 
We were correctly parsing this already, but simply not returning any
value (for no good reason). Fortunately the fix is quite simple.

This makes the test added in the previous commit now pass.
This commit is contained in:
Carl Worth 2010-05-14 16:53:52 -07:00
parent f6ae186cfd
commit 3596bb149e
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -21,5 +21,5 @@ test: glcpp
@(cd tests; ./glcpp-test)
clean:
rm -f glcpp-lex.c glcpp-parse.c *.o *~
rm -f glcpp glcpp-lex.c glcpp-parse.c *.o *~
rm -f tests/*.out tests/*.gcc tests/*.expected tests/*~

9
glcpp-parse.y
View file

@ -177,13 +177,20 @@ argument:
| argument word {
_string_list_append_item ($1, $2);
talloc_free ($2);
$$ = $1;
}
| argument SPACE word {
_string_list_append_item ($1, " ");
_string_list_append_item ($1, $3);
talloc_free ($3);
$$ = $1;
}
| argument '(' argument ')' {
_string_list_append_item ($1, "(");
_string_list_append_list ($1, $3);
_string_list_append_item ($1, ")");
$$ = $1;
}
| argument '(' argument ')'
;
directive_with_newline: