diff -r c0c6ff7357b7 -r b13feab3b918 stage3/datatype_functions.hh --- a/stage3/datatype_functions.hh Tue Mar 13 12:39:09 2012 +0000 +++ b/stage3/datatype_functions.hh Tue Mar 13 16:38:21 2012 +0000 @@ -67,48 +67,48 @@ /***********************************/ /* B 1.3.1 - Elementary Data Types */ /***********************************/ - void *visit(time_type_name_c *symbol) {return (void *)"TIME"; }; - void *visit(bool_type_name_c *symbol) {return (void *)"BOOL"; }; - void *visit(sint_type_name_c *symbol) {return (void *)"SINT"; }; - void *visit(int_type_name_c *symbol) {return (void *)"INT"; }; - void *visit(dint_type_name_c *symbol) {return (void *)"DINT"; }; - void *visit(lint_type_name_c *symbol) {return (void *)"LINT"; }; - void *visit(usint_type_name_c *symbol) {return (void *)"USINT"; }; - void *visit(uint_type_name_c *symbol) {return (void *)"UINT"; }; - void *visit(udint_type_name_c *symbol) {return (void *)"UDINT"; }; - void *visit(ulint_type_name_c *symbol) {return (void *)"ULINT"; }; - void *visit(real_type_name_c *symbol) {return (void *)"REAL"; }; - void *visit(lreal_type_name_c *symbol) {return (void *)"LREAL"; }; - void *visit(date_type_name_c *symbol) {return (void *)"DATE"; }; - void *visit(tod_type_name_c *symbol) {return (void *)"TOD"; }; - void *visit(dt_type_name_c *symbol) {return (void *)"DT"; }; - void *visit(byte_type_name_c *symbol) {return (void *)"BYTE"; }; - void *visit(word_type_name_c *symbol) {return (void *)"WORD"; }; - void *visit(lword_type_name_c *symbol) {return (void *)"LWORD"; }; - void *visit(dword_type_name_c *symbol) {return (void *)"DWORD"; }; - void *visit(string_type_name_c *symbol) {return (void *)"STRING"; }; - void *visit(wstring_type_name_c *symbol) {return (void *)"WSTRING"; }; - - void *visit(safetime_type_name_c *symbol) {return (void *)"SAFETIME"; }; - void *visit(safebool_type_name_c *symbol) {return (void *)"SAFEBOOL"; }; - void *visit(safesint_type_name_c *symbol) {return (void *)"SAFESINT"; }; - void *visit(safeint_type_name_c *symbol) {return (void *)"SAFEINT"; }; - void *visit(safedint_type_name_c *symbol) {return (void *)"SAFEDINT"; }; - void *visit(safelint_type_name_c *symbol) {return (void *)"SAFELINT"; }; - void *visit(safeusint_type_name_c *symbol) {return (void *)"SAFEUSINT"; }; - void *visit(safeuint_type_name_c *symbol) {return (void *)"SAFEUINT"; }; - void *visit(safeudint_type_name_c *symbol) {return (void *)"SAFEUDINT"; }; - void *visit(safeulint_type_name_c *symbol) {return (void *)"SAFEULINT"; }; - void *visit(safereal_type_name_c *symbol) {return (void *)"SAFEREAL"; }; - void *visit(safelreal_type_name_c *symbol) {return (void *)"SAFELREAL"; }; - void *visit(safedate_type_name_c *symbol) {return (void *)"SAFEDATE"; }; - void *visit(safetod_type_name_c *symbol) {return (void *)"SAFETOD"; }; - void *visit(safedt_type_name_c *symbol) {return (void *)"SAFEDT"; }; - void *visit(safebyte_type_name_c *symbol) {return (void *)"SAFEBYTE"; }; - void *visit(safeword_type_name_c *symbol) {return (void *)"SAFEWORD"; }; - void *visit(safelword_type_name_c *symbol) {return (void *)"SAFELWORD"; }; - void *visit(safedword_type_name_c *symbol) {return (void *)"SAFEDWORD"; }; - void *visit(safestring_type_name_c *symbol) {return (void *)"SAFESTRING"; }; + void *visit(time_type_name_c *symbol) {return (void *)"TIME"; }; + void *visit(bool_type_name_c *symbol) {return (void *)"BOOL"; }; + void *visit(sint_type_name_c *symbol) {return (void *)"SINT"; }; + void *visit(int_type_name_c *symbol) {return (void *)"INT"; }; + void *visit(dint_type_name_c *symbol) {return (void *)"DINT"; }; + void *visit(lint_type_name_c *symbol) {return (void *)"LINT"; }; + void *visit(usint_type_name_c *symbol) {return (void *)"USINT"; }; + void *visit(uint_type_name_c *symbol) {return (void *)"UINT"; }; + void *visit(udint_type_name_c *symbol) {return (void *)"UDINT"; }; + void *visit(ulint_type_name_c *symbol) {return (void *)"ULINT"; }; + void *visit(real_type_name_c *symbol) {return (void *)"REAL"; }; + void *visit(lreal_type_name_c *symbol) {return (void *)"LREAL"; }; + void *visit(date_type_name_c *symbol) {return (void *)"DATE"; }; + void *visit(tod_type_name_c *symbol) {return (void *)"TOD"; }; + void *visit(dt_type_name_c *symbol) {return (void *)"DT"; }; + void *visit(byte_type_name_c *symbol) {return (void *)"BYTE"; }; + void *visit(word_type_name_c *symbol) {return (void *)"WORD"; }; + void *visit(lword_type_name_c *symbol) {return (void *)"LWORD"; }; + void *visit(dword_type_name_c *symbol) {return (void *)"DWORD"; }; + void *visit(string_type_name_c *symbol) {return (void *)"STRING"; }; + void *visit(wstring_type_name_c *symbol) {return (void *)"WSTRING"; }; + + void *visit(safetime_type_name_c *symbol) {return (void *)"SAFETIME"; }; + void *visit(safebool_type_name_c *symbol) {return (void *)"SAFEBOOL"; }; + void *visit(safesint_type_name_c *symbol) {return (void *)"SAFESINT"; }; + void *visit(safeint_type_name_c *symbol) {return (void *)"SAFEINT"; }; + void *visit(safedint_type_name_c *symbol) {return (void *)"SAFEDINT"; }; + void *visit(safelint_type_name_c *symbol) {return (void *)"SAFELINT"; }; + void *visit(safeusint_type_name_c *symbol) {return (void *)"SAFEUSINT"; }; + void *visit(safeuint_type_name_c *symbol) {return (void *)"SAFEUINT"; }; + void *visit(safeudint_type_name_c *symbol) {return (void *)"SAFEUDINT"; }; + void *visit(safeulint_type_name_c *symbol) {return (void *)"SAFEULINT"; }; + void *visit(safereal_type_name_c *symbol) {return (void *)"SAFEREAL"; }; + void *visit(safelreal_type_name_c *symbol) {return (void *)"SAFELREAL"; }; + void *visit(safedate_type_name_c *symbol) {return (void *)"SAFEDATE"; }; + void *visit(safetod_type_name_c *symbol) {return (void *)"SAFETOD"; }; + void *visit(safedt_type_name_c *symbol) {return (void *)"SAFEDT"; }; + void *visit(safebyte_type_name_c *symbol) {return (void *)"SAFEBYTE"; }; + void *visit(safeword_type_name_c *symbol) {return (void *)"SAFEWORD"; }; + void *visit(safelword_type_name_c *symbol) {return (void *)"SAFELWORD"; }; + void *visit(safedword_type_name_c *symbol) {return (void *)"SAFEDWORD"; }; + void *visit(safestring_type_name_c *symbol) {return (void *)"SAFESTRING"; }; void *visit(safewstring_type_name_c *symbol) {return (void *)"SAFEWSTRING"; }; }; @@ -151,53 +151,53 @@ /* A helper function... */ -bool is_ANY_ELEMENTARY_type (symbol_c *type_symbol); -bool is_ANY_SAFEELEMENTARY_type (symbol_c *type_symbol); -bool is_ANY_ELEMENTARY_compatible (symbol_c *type_symbol); - -bool is_ANY_MAGNITUDE_type (symbol_c *type_symbol); -bool is_ANY_SAFEMAGNITUDE_type (symbol_c *type_symbol); -bool is_ANY_MAGNITUDE_compatible (symbol_c *type_symbol); +bool is_ANY_ELEMENTARY_type (symbol_c *type_symbol); +bool is_ANY_SAFEELEMENTARY_type (symbol_c *type_symbol); +bool is_ANY_ELEMENTARY_compatible (symbol_c *type_symbol); + +bool is_ANY_MAGNITUDE_type (symbol_c *type_symbol); +bool is_ANY_SAFEMAGNITUDE_type (symbol_c *type_symbol); +bool is_ANY_MAGNITUDE_compatible (symbol_c *type_symbol); bool is_ANY_signed_MAGNITUDE_type (symbol_c *type_symbol); bool is_ANY_signed_SAFEMAGNITUDE_type (symbol_c *type_symbol); bool is_ANY_signed_MAGNITUDE_compatible (symbol_c *type_symbol); -bool is_ANY_DATE_type (symbol_c *type_symbol); -bool is_ANY_SAFEDATE_type (symbol_c *type_symbol); -bool is_ANY_DATE_compatible (symbol_c *type_symbol); - -bool is_ANY_STRING_type (symbol_c *type_symbol); -bool is_ANY_SAFESTRING_type (symbol_c *type_symbol); -bool is_ANY_STRING_compatible (symbol_c *type_symbol); - -bool is_ANY_INT_type (symbol_c *type_symbol); -bool is_ANY_SAFEINT_type (symbol_c *type_symbol); -bool is_ANY_INT_compatible (symbol_c *type_symbol); +bool is_ANY_DATE_type (symbol_c *type_symbol); +bool is_ANY_SAFEDATE_type (symbol_c *type_symbol); +bool is_ANY_DATE_compatible (symbol_c *type_symbol); + +bool is_ANY_STRING_type (symbol_c *type_symbol); +bool is_ANY_SAFESTRING_type (symbol_c *type_symbol); +bool is_ANY_STRING_compatible (symbol_c *type_symbol); + +bool is_ANY_INT_type (symbol_c *type_symbol); +bool is_ANY_SAFEINT_type (symbol_c *type_symbol); +bool is_ANY_INT_compatible (symbol_c *type_symbol); bool is_ANY_signed_INT_type (symbol_c *type_symbol); bool is_ANY_signed_SAFEINT_type (symbol_c *type_symbol); bool is_ANY_signed_INT_compatible (symbol_c *type_symbol); -bool is_ANY_REAL_type (symbol_c *type_symbol); -bool is_ANY_SAFEREAL_type (symbol_c *type_symbol); -bool is_ANY_REAL_compatible (symbol_c *type_symbol); - -bool is_ANY_NUM_type (symbol_c *type_symbol); -bool is_ANY_SAFENUM_type (symbol_c *type_symbol); -bool is_ANY_NUM_compatible (symbol_c *type_symbol); +bool is_ANY_REAL_type (symbol_c *type_symbol); +bool is_ANY_SAFEREAL_type (symbol_c *type_symbol); +bool is_ANY_REAL_compatible (symbol_c *type_symbol); + +bool is_ANY_NUM_type (symbol_c *type_symbol); +bool is_ANY_SAFENUM_type (symbol_c *type_symbol); +bool is_ANY_NUM_compatible (symbol_c *type_symbol); bool is_ANY_signed_NUM_type (symbol_c *type_symbol); bool is_ANY_signed_SAFENUM_type (symbol_c *type_symbol); bool is_ANY_signed_NUM_compatible (symbol_c *type_symbol); -bool is_ANY_BIT_type (symbol_c *type_symbol); -bool is_ANY_SAFEBIT_type (symbol_c *type_symbol); -bool is_ANY_BIT_compatible (symbol_c *type_symbol); - -bool is_BOOL_type (symbol_c *type_symbol); -bool is_SAFEBOOL_type (symbol_c *type_symbol); -bool is_ANY_BOOL_compatible (symbol_c *type_symbol); +bool is_ANY_BIT_type (symbol_c *type_symbol); +bool is_ANY_SAFEBIT_type (symbol_c *type_symbol); +bool is_ANY_BIT_compatible (symbol_c *type_symbol); + +bool is_BOOL_type (symbol_c *type_symbol); +bool is_SAFEBOOL_type (symbol_c *type_symbol); +bool is_ANY_BOOL_compatible (symbol_c *type_symbol); bool is_type_equal(symbol_c *first_type, symbol_c *second_type);