ir_reader: Add support for reading (return ...)

This commit is contained in:
Kenneth Graunke
2010-04-09 17:56:22 -07:00
committed by Ian Romanick
parent d1d2ada3c6
commit 9d2ff7617a
+23
View File
@@ -33,6 +33,7 @@ static glsl_type *read_type(_mesa_glsl_parse_state *, s_expression *);
static ir_instruction *read_instruction(_mesa_glsl_parse_state *,
s_expression *);
static ir_variable *read_declaration(_mesa_glsl_parse_state *, s_list *);
static ir_return *read_return(_mesa_glsl_parse_state *, s_list *);
static ir_rvalue *read_rvalue(_mesa_glsl_parse_state *, s_expression *);
static ir_assignment *read_assignment(_mesa_glsl_parse_state *, s_list *);
@@ -143,6 +144,8 @@ read_instruction(_mesa_glsl_parse_state *st, s_expression *expr)
ir_instruction *inst = NULL;
if (strcmp(tag->value(), "declare") == 0)
inst = read_declaration(st, list);
else if (strcmp(tag->value(), "return") == 0)
inst = read_return(st, list);
else
ir_read_error(expr, "unrecognized instruction tag: %s", tag->value());
@@ -220,6 +223,26 @@ read_declaration(_mesa_glsl_parse_state *st, s_list *list)
}
static ir_return *
read_return(_mesa_glsl_parse_state *st, s_list *list)
{
if (list->length() != 2) {
ir_read_error(list, "expected (return <rvalue>)");
return NULL;
}
s_expression *expr = (s_expression*) list->subexpressions.head->next;
ir_rvalue *retval = read_rvalue(st, expr);
if (retval == NULL) {
ir_read_error(list, "when reading return value");
return NULL;
}
return new ir_return(retval);
}
static ir_rvalue *
read_rvalue(_mesa_glsl_parse_state *st, s_expression *expr)
{