# HG changeset patch
# User mjsousa
# Date 1426452595 0
# Node ID 694127983aa45a1a5d80d1744bf485807e2869d5
# Parent  c752b113237b20659d6ca62eb998a304359298d8
Initialise arrays to their correct default values - Fix bug introduced in commit 477393b00f95 (2014-11-16)

diff -r c752b113237b -r 694127983aa4 stage4/generate_c/generate_c_vardecl.cc
--- a/stage4/generate_c/generate_c_vardecl.cc	Mon Mar 09 19:22:00 2015 +0000
+++ b/stage4/generate_c/generate_c_vardecl.cc	Sun Mar 15 20:49:55 2015 +0000
@@ -909,10 +909,6 @@
       this->current_var_type_symbol = spec_init_sperator_c::get_spec(symbol);
       this->current_var_init_symbol = spec_init_sperator_c::get_init(symbol);
       if (NULL == this->current_var_type_symbol) ERROR;
-      if (NULL == this->current_var_type_symbol->datatype) {debug_c::print(this->current_var_type_symbol); ERROR;}
-      if (get_datatype_info_c::is_array(this->current_var_type_symbol))
-        this->current_var_type_symbol = this->current_var_type_symbol->datatype; 
-      if (NULL == this->current_var_type_symbol) ERROR;
       if (NULL == this->current_var_init_symbol) {
         /* We try to find the data type's default value... */
         this->current_var_init_symbol = type_initial_value_c::get(this->current_var_type_symbol);
@@ -922,6 +918,15 @@
         ERROR;
       */
       }
+      /* When handling arrays we must make sure that we use the base datatype, since arrays use an aliased name in the C code!
+       *   This is done using a stage4 annotation (on the base datatype class) named "generate_c_annotaton__implicit_type_id"
+       *   Note that we do this only _after_ determining the initial value, since in principle the derived array could have
+       *   a default initial different to the base array datatype!
+       */
+      if (NULL == this->current_var_type_symbol->datatype) {debug_c::print(this->current_var_type_symbol); ERROR;}
+      if (get_datatype_info_c::is_array(this->current_var_type_symbol))
+        this->current_var_type_symbol = this->current_var_type_symbol->datatype; 
+      if (NULL == this->current_var_type_symbol) ERROR;      
     }
 
     void void_type_init(void) {
@@ -1429,8 +1434,7 @@
   /* Start off by setting the current_var_type_symbol and
    * current_var_init_symbol private variables...
    */
-  if (NULL == symbol->array_spec_init->datatype) ERROR;
-  update_type_init(symbol->array_spec_init->datatype); // we want to print the name of the base datatype, and nt the derived datatype, so we use '->datatype'!
+  update_type_init(symbol->array_spec_init);
 
   /* now to produce the c equivalent... */
   if (wanted_varformat == constructorinit_vf) {
@@ -1572,8 +1576,7 @@
   /* Start off by setting the current_var_type_symbol and
    * current_var_init_symbol private variables...
    */
-  if (symbol->array_specification->datatype == NULL) {debug_c::print(symbol->array_specification); ERROR;}
-  update_type_init(symbol->array_specification->datatype); // we want to print the name of the base datatype, and nt the derived datatype, so we use '->datatype'!
+  update_type_init(symbol->array_specification);
 
   /* now to produce the c equivalent... */
   if (wanted_varformat == constructorinit_vf) {