summaryrefslogtreecommitdiffstats
path: root/src/glsl/s_expression.cpp
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2013-11-22 01:25:42 -0800
committerKenneth Graunke <kenneth@whitecape.org>2014-01-13 11:38:19 -0800
commit5f7e778fa1b1e969a1b15e3650dec49b0026ed08 (patch)
tree40bd6e3e5175ccd2ca49a783b7680ee2c947b775 /src/glsl/s_expression.cpp
parentfb6d9798a0c6eefd512f5b0f19eed34af8f4f257 (diff)
downloadexternal_mesa3d-5f7e778fa1b1e969a1b15e3650dec49b0026ed08.zip
external_mesa3d-5f7e778fa1b1e969a1b15e3650dec49b0026ed08.tar.gz
external_mesa3d-5f7e778fa1b1e969a1b15e3650dec49b0026ed08.tar.bz2
glsl: Convert piles of foreach_iter to the newer foreach_list macro.
foreach_iter and exec_list_iterators have been deprecated for some time now; we just hadn't ever bothered to convert code to the newer foreach_list and foreach_list_safe macros. In these cases, we aren't editing the list, so we can use foreach_list rather than foreach_list_safe. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/glsl/s_expression.cpp')
-rw-r--r--src/glsl/s_expression.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/glsl/s_expression.cpp b/src/glsl/s_expression.cpp
index 1bdf6bc..6906ff0 100644
--- a/src/glsl/s_expression.cpp
+++ b/src/glsl/s_expression.cpp
@@ -162,8 +162,8 @@ void s_symbol::print()
void s_list::print()
{
printf("(");
- foreach_iter(exec_list_iterator, it, this->subexpressions) {
- s_expression *expr = (s_expression*) it.get();
+ foreach_list(n, &this->subexpressions) {
+ s_expression *expr = (s_expression *) n;
expr->print();
if (!expr->next->is_tail_sentinel())
printf(" ");
@@ -201,11 +201,11 @@ s_match(s_expression *top, unsigned n, s_pattern *pattern, bool partial)
return false;
unsigned i = 0;
- foreach_iter(exec_list_iterator, it, list->subexpressions) {
+ foreach_list(node, &list->subexpressions) {
if (i >= n)
return partial; /* More actual items than the pattern expected */
- s_expression *expr = (s_expression *) it.get();
+ s_expression *expr = (s_expression *) node;
if (expr == NULL || !pattern[i].match(expr))
return false;