diff -r 484beb3b1dcb -r 2c59c2b8fca4 absyntax_utils/search_var_instance_decl.cc --- a/absyntax_utils/search_var_instance_decl.cc Sat Sep 07 22:08:09 2013 +0100 +++ b/absyntax_utils/search_var_instance_decl.cc Wed Dec 18 18:41:05 2013 +0000 @@ -136,11 +136,8 @@ bool search_var_instance_decl_c::type_is_complex(symbol_c *symbol) { symbol_c *decl; - decl = this->get_decl(symbol); + decl = symbol->datatype; if (NULL == decl) ERROR; - decl = search_base_type_c::get_basetype_decl(decl); - if (NULL == decl) ERROR; - return ((typeid( *(decl) ) == typeid( array_specification_c )) || // (typeid( *(decl) ) == typeid( array_spec_init_c )) || /* does not seem to be necessary */ (typeid( *(decl) ) == typeid( structure_type_declaration_c )) ||