--- a/absyntax_utils/search_base_type.cc Tue Jul 31 12:39:04 2012 +0100
+++ b/absyntax_utils/search_base_type.cc Wed Aug 01 08:33:58 2012 +0100
@@ -131,41 +131,41 @@
* with all inputs of the same data type.
* If 'x' were a SINT, then the '30' would have to be a SINT too!
*/
-void *search_base_type_c::visit(real_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(neg_real_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(integer_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(neg_integer_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(binary_integer_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(octal_integer_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(hex_integer_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(boolean_true_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(boolean_false_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(real_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(neg_real_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(integer_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(neg_integer_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(binary_integer_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(octal_integer_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(hex_integer_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(boolean_true_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(boolean_false_c *symbol) {return (void *)symbol;}
/***********************************/
/* B 1.3.1 - Elementary Data Types */
/***********************************/
-void *search_base_type_c::visit(time_type_name_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(bool_type_name_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(sint_type_name_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(int_type_name_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(dint_type_name_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(lint_type_name_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(usint_type_name_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(uint_type_name_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(udint_type_name_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(ulint_type_name_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(real_type_name_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(lreal_type_name_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(date_type_name_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(tod_type_name_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(dt_type_name_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(byte_type_name_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(word_type_name_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(dword_type_name_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(lword_type_name_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(string_type_name_c *symbol) {return (void *)symbol;}
-void *search_base_type_c::visit(wstring_type_name_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(time_type_name_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(bool_type_name_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(sint_type_name_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(int_type_name_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(dint_type_name_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(lint_type_name_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(usint_type_name_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(uint_type_name_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(udint_type_name_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(ulint_type_name_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(real_type_name_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(lreal_type_name_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(date_type_name_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(tod_type_name_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(dt_type_name_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(byte_type_name_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(word_type_name_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(dword_type_name_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(lword_type_name_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(string_type_name_c *symbol) {return (void *)symbol;}
+void *search_base_type_c::visit(wstring_type_name_c *symbol) {return (void *)symbol;}
/******************************************************/
@@ -227,7 +227,7 @@
}
/* signed_integer DOTDOT signed_integer */
-void *search_base_type_c::visit(subrange_c *symbol) {ERROR; return NULL;} /* should never get called... */
+void *search_base_type_c::visit(subrange_c *symbol) {ERROR; return NULL;} /* should never get called... */
/* enumerated_type_name ':' enumerated_spec_init */
void *search_base_type_c::visit(enumerated_type_declaration_c *symbol) {
@@ -243,13 +243,11 @@
/* helper symbol for enumerated_specification->enumerated_spec_init */
/* enumerated_value_list ',' enumerated_value */
-void *search_base_type_c::visit(enumerated_value_list_c *symbol) {
- return (void *)symbol;
-}
+void *search_base_type_c::visit(enumerated_value_list_c *symbol) {return (void *)symbol;}
/* enumerated_type_name '#' identifier */
// SYM_REF2(enumerated_value_c, type, value)
-void *search_base_type_c::visit(enumerated_value_c *symbol) {ERROR; return NULL;} /* should never get called... */
+void *search_base_type_c::visit(enumerated_value_c *symbol) {ERROR; return NULL;} /* should never get called... */
/* identifier ':' array_spec_init */
void *search_base_type_c::visit(array_type_declaration_c *symbol) {
@@ -268,22 +266,20 @@
}
/* ARRAY '[' array_subrange_list ']' OF non_generic_type_name */
-void *search_base_type_c::visit(array_specification_c *symbol) {
- return symbol;
-}
+void *search_base_type_c::visit(array_specification_c *symbol) {return (void *)symbol;}
/* helper symbol for array_specification */
/* array_subrange_list ',' subrange */
-void *search_base_type_c::visit(array_subrange_list_c *symbol) {ERROR; return NULL;} /* should never get called... */
+void *search_base_type_c::visit(array_subrange_list_c *symbol) {ERROR; return NULL;} /* should never get called... */
/* array_initialization: '[' array_initial_elements_list ']' */
/* helper symbol for array_initialization */
/* array_initial_elements_list ',' array_initial_elements */
-void *search_base_type_c::visit(array_initial_elements_list_c *symbol) {ERROR; return NULL;} /* should never get called... */
+void *search_base_type_c::visit(array_initial_elements_list_c *symbol) {ERROR; return NULL;} /* should never get called... */
/* integer '(' [array_initial_element] ')' */
/* array_initial_element may be NULL ! */
-void *search_base_type_c::visit(array_initial_elements_c *symbol) {ERROR; return NULL;} /* should never get called... */
+void *search_base_type_c::visit(array_initial_elements_c *symbol) {ERROR; return NULL;} /* should never get called... */
/* structure_type_name ':' structure_specification */
/* NOTE: structure_specification will point to either a
@@ -305,20 +301,18 @@
/* helper symbol for structure_declaration */
/* structure_declaration: STRUCT structure_element_declaration_list END_STRUCT */
/* structure_element_declaration_list structure_element_declaration ';' */
-void *search_base_type_c::visit(structure_element_declaration_list_c *symbol) {
- return (void *)symbol;
-}
+void *search_base_type_c::visit(structure_element_declaration_list_c *symbol) {return (void *)symbol;}
/* structure_element_name ':' *_spec_init */
-void *search_base_type_c::visit(structure_element_declaration_c *symbol) {ERROR; return NULL;} /* should never get called... */
+void *search_base_type_c::visit(structure_element_declaration_c *symbol) {ERROR; return NULL;} /* should never get called... */
/* helper symbol for structure_initialization */
/* structure_initialization: '(' structure_element_initialization_list ')' */
/* structure_element_initialization_list ',' structure_element_initialization */
-void *search_base_type_c::visit(structure_element_initialization_list_c *symbol) {ERROR; return NULL;} /* should never get called... */
+void *search_base_type_c::visit(structure_element_initialization_list_c *symbol) {ERROR; return NULL;} /* should never get called... */
/* structure_element_name ASSIGN value */
-void *search_base_type_c::visit(structure_element_initialization_c *symbol) {ERROR; return NULL;} /* should never get called... */
+void *search_base_type_c::visit(structure_element_initialization_c *symbol) {ERROR; return NULL;} /* should never get called... */
/* string_type_name ':' elementary_string_type_name string_type_declaration_size string_type_declaration_init */
/*
@@ -327,7 +321,7 @@
string_type_declaration_size,
string_type_declaration_init) // may be == NULL!
*/
-void *search_base_type_c::visit(string_type_declaration_c *symbol) {return symbol;}
+void *search_base_type_c::visit(string_type_declaration_c *symbol) {return (void *)symbol;}
@@ -336,7 +330,8 @@
/*****************************/
/* FUNCTION_BLOCK derived_function_block_name io_OR_other_var_declarations function_block_body END_FUNCTION_BLOCK */
// SYM_REF3(function_block_declaration_c, fblock_name, var_declarations, fblock_body)
-void *search_base_type_c::visit(function_block_declaration_c *symbol) {
- return symbol;
-}
-
+void *search_base_type_c::visit(function_block_declaration_c *symbol) {return (void *)symbol;}
+
+
+
+