--- a/absyntax_utils/search_var_instance_decl.cc Tue Dec 01 09:03:33 2009 +0100
+++ b/absyntax_utils/search_var_instance_decl.cc Wed Dec 02 16:11:01 2009 +0100
@@ -58,7 +58,6 @@
search_var_instance_decl_c::search_var_instance_decl_c(symbol_c *search_scope) {
this->current_vartype = none_vt;
- this->current_varqualifier = none_vq;
this->search_scope = search_scope;
this->search_name = NULL;
this->current_type_decl = NULL;
@@ -66,7 +65,6 @@
symbol_c *search_var_instance_decl_c::get_decl(symbol_c *variable_instance_name) {
this->current_vartype = none_vt;
- this->current_varqualifier = none_vq;
this->search_name = variable_instance_name;
return (symbol_c *)search_scope->accept(*this);
}
@@ -75,10 +73,6 @@
return current_vartype;
}
-unsigned int search_var_instance_decl_c::get_varqualifier() {
- return current_varqualifier;
-}
-
/***************************/
/* B 0 - Programming Model */
/***************************/
@@ -95,33 +89,15 @@
/* B 1.4.3 - Declaration & Initialization */
/******************************************/
-void *search_var_instance_decl_c::visit(constant_option_c *symbol) {
- current_varqualifier = constant_vq;
- return NULL;
-}
-
-void *search_var_instance_decl_c::visit(retain_option_c *symbol) {
- current_varqualifier = retain_vq;
- return NULL;
-}
-
-void *search_var_instance_decl_c::visit(non_retain_option_c *symbol) {
- current_varqualifier = non_retain_vq;
- return NULL;
-}
-
/* edge -> The F_EDGE or R_EDGE directive */
// SYM_REF2(edge_declaration_c, edge, var1_list)
// TODO
void *search_var_instance_decl_c::visit(input_declarations_c *symbol) {
current_vartype = input_vt;
- if (symbol->option != NULL)
- symbol->option->accept(*this);
void *res = symbol->input_declaration_list->accept(*this);
if (res == NULL) {
current_vartype = none_vt;
- current_varqualifier = none_vq;
}
return res;
}
@@ -130,12 +106,9 @@
/* option -> may be NULL ! */
void *search_var_instance_decl_c::visit(output_declarations_c *symbol) {
current_vartype = output_vt;
- if (symbol->option != NULL)
- symbol->option->accept(*this);
void *res = symbol->var_init_decl_list->accept(*this);
if (res == NULL) {
current_vartype = none_vt;
- current_varqualifier = none_vq;
}
return res;
}
@@ -163,12 +136,9 @@
/* helper symbol for input_declarations */
void *search_var_instance_decl_c::visit(var_declarations_c *symbol) {
current_vartype = private_vt;
- if (symbol->option != NULL)
- symbol->option->accept(*this);
void *res = symbol->var_init_decl_list->accept(*this);
if (res == NULL) {
current_vartype = none_vt;
- current_varqualifier = none_vq;
}
return res;
}
@@ -176,11 +146,9 @@
/* VAR RETAIN var_init_decl_list END_VAR */
void *search_var_instance_decl_c::visit(retentive_var_declarations_c *symbol) {
current_vartype = private_vt;
- current_varqualifier = retain_vq;
void *res = symbol->var_init_decl_list->accept(*this);
if (res == NULL) {
current_vartype = none_vt;
- current_varqualifier = none_vq;
}
return res;
}
@@ -190,12 +158,9 @@
//SYM_REF2(located_var_declarations_c, option, located_var_decl_list)
void *search_var_instance_decl_c::visit(located_var_declarations_c *symbol) {
current_vartype = located_vt;
- if (symbol->option != NULL)
- symbol->option->accept(*this);
void *res = symbol->located_var_decl_list->accept(*this);
if (res == NULL) {
current_vartype = none_vt;
- current_varqualifier = none_vq;
}
return res;
}
@@ -205,12 +170,9 @@
//SYM_REF2(external_var_declarations_c, option, external_declaration_list)
void *search_var_instance_decl_c::visit(external_var_declarations_c *symbol) {
current_vartype = external_vt;
- if (symbol->option != NULL)
- symbol->option->accept(*this);
void *res = symbol->external_declaration_list->accept(*this);
if (res == NULL) {
current_vartype = none_vt;
- current_varqualifier = none_vq;
}
return res;
}
@@ -220,12 +182,9 @@
//SYM_REF2(global_var_declarations_c, option, global_var_decl_list)
void *search_var_instance_decl_c::visit(global_var_declarations_c *symbol) {
current_vartype = global_vt;
- if (symbol->option != NULL)
- symbol->option->accept(*this);
void *res = symbol->global_var_decl_list->accept(*this);
if (res == NULL) {
current_vartype = none_vt;
- current_varqualifier = none_vq;
}
return res;
}