From 8d45caaebaa017e910ae985e005fadc6b626de7d Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Wed, 26 Jun 2013 15:53:12 -0700 Subject: glsl: Add an is_declaration field to ast_struct_specifier. Will be used in a later commit to differentiate between a structure type declaration and a variable declaration of a struct type. I.e., the difference between struct S { float x; }; (is_declaration = true) and S s; (is_declaration = false) Also note that is_declaration = true for struct S { float x; } s; Reviewed-by: Ian Romanick --- src/glsl/ast.h | 4 +++- src/glsl/glsl_parser_extras.cpp | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src/glsl') diff --git a/src/glsl/ast.h b/src/glsl/ast.h index 87f9876..8abea52 100644 --- a/src/glsl/ast.h +++ b/src/glsl/ast.h @@ -460,7 +460,8 @@ public: * be modified. Zeros the inherited ast_node's fields. */ ast_struct_specifier(const ast_struct_specifier& that): - ast_node(), name(that.name), declarations(that.declarations) + ast_node(), name(that.name), declarations(that.declarations), + is_declaration(that.is_declaration) { /* empty */ } @@ -475,6 +476,7 @@ public: const char *name; /* List of ast_declarator_list * */ exec_list declarations; + bool is_declaration; }; diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp index 664f8d1..aa5a435 100644 --- a/src/glsl/glsl_parser_extras.cpp +++ b/src/glsl/glsl_parser_extras.cpp @@ -1236,6 +1236,7 @@ ast_struct_specifier::ast_struct_specifier(const char *identifier, } name = identifier; this->declarations.push_degenerate_list_at_head(&declarator_list->link); + is_declaration = true; } extern "C" { -- cgit v1.1