diff -r 0ede7ca157e2 -r 8aee27d46208 absyntax_utils/type_initial_value.cc --- a/absyntax_utils/type_initial_value.cc Fri Dec 26 09:39:18 2014 +0000 +++ b/absyntax_utils/type_initial_value.cc Fri Dec 26 09:57:02 2014 +0000 @@ -117,15 +117,15 @@ void *type_initial_value_c::handle_type_name(symbol_c *type_name) { /* look up the type declaration... */ - symbol_c *type_decl = type_symtable.find_value(type_name); + type_symtable_t::iterator iter = type_symtable.find(type_name); /* Type declaration not found!! */ /* NOTE: Variables declared out of function block 'data types',for eg: VAR timer: TON; END_VAR * do not have a default value, so (TON) will never be found in the type symbol table. This means * we cannot simply consider this an error and abort, but must rather return a NULL. */ - if (type_decl == type_symtable.end_value()) return NULL; - - return type_decl->accept(*this); + if (iter == type_symtable.end()) return NULL; + + return iter->second->accept(*this); // iter->second is the type_decl } /* visitor for identifier_c should no longer be necessary. All references to derived datatypes are now stored in then */