Add a column to VARIABLES.CSV, containing variable (derived) type name, additionally to current last column contyaining base type name
authorEdouard Tisserant
Tue, 09 Jul 2019 08:31:02 +0200
changeset 1088 9cb7c8bf7dbc
parent 1087 d9e47e018320
child 1089 25271e1a3426
Add a column to VARIABLES.CSV, containing variable (derived) type name, additionally to current last column contyaining base type name
stage4/generate_c/generate_var_list.cc
--- a/stage4/generate_c/generate_var_list.cc	Wed Feb 13 14:40:26 2019 +0000
+++ b/stage4/generate_c/generate_var_list.cc	Tue Jul 09 08:31:02 2019 +0200
@@ -345,7 +345,7 @@
         case search_type_symbol_c::structure_vtc:
         case search_type_symbol_c::function_block_vtc:
           this->current_var_type_name->accept(*this);
-          s4o.print(";\n");
+          s4o.print(";;\n");
           if (this->current_var_class_category != external_vcc) {
               SYMBOL *current_name;
               symbol_c *tmp_var_type;
@@ -360,10 +360,14 @@
           break;
         case search_type_symbol_c::array_vtc:
           this->current_var_type_name->accept(*this);
-          s4o.print(";\n");
+          s4o.print(";;\n");
           break;
         default:
+          // base type name
           this->current_var_type_symbol->accept(*this);
+          s4o.print(";");
+          // type name (eventualy derived)
+          this->current_var_type_name->accept(*this);
           s4o.print(";\n");
           break;
       }
@@ -876,7 +880,7 @@
       print_symbol_list();
       s4o.print("__step_list[");
       print_step_number();
-      s4o.print("].X;BOOL;\n");
+      s4o.print("].X;BOOL;BOOL;\n");
       step_number++;
       return NULL;
     }
@@ -892,7 +896,7 @@
       print_symbol_list();
       s4o.print("__step_list[");
       print_step_number();
-      s4o.print("].X;BOOL;\n");
+      s4o.print("].X;BOOL;BOOL;\n");
       step_number++;
       return NULL;
     }
@@ -916,7 +920,7 @@
       print_symbol_list();
       s4o.print("__debug_transition_list[");
       print_transition_number();
-      s4o.print("];BOOL;\n");
+      s4o.print("];BOOL;BOOL;\n");
       transition_number++;
       return NULL;
     }
@@ -955,7 +959,7 @@
       print_symbol_list();
       s4o.print("__action_list[");
       print_action_number();
-      s4o.print("].state;BOOL;\n");
+      s4o.print("].state;BOOL;BOOL;\n");
       action_number++;
       return NULL;
     }