--- a/stage3/constant_folding.hh	Sun Jan 11 19:44:37 2015 +0000
+++ b/stage3/constant_folding.hh	Sun Jan 11 20:49:55 2015 +0000
@@ -210,9 +210,9 @@
   private:
     symbol_c *current_resource;
     symbol_c *current_configuration;
-    map_values_t values;
+    map_values_t *values;
     map_values_t var_global_values;
-    void *handle_var_list_decl(symbol_c *var_list, symbol_c *type_decl);
+    void *handle_var_list_decl(symbol_c *var_list, symbol_c *type_decl, bool is_global_var = false);
     void *handle_var_decl     (symbol_c *var_list, bool fixed_init_value);
     // Flag to indicate whether the variables in the variable declaration list will always have a fixed value when the POU is executed!
     // VAR CONSTANT ... END_VAR will always be true
@@ -251,6 +251,7 @@
     void *visit(  external_declaration_c     *symbol);
     void *visit(global_var_decl_c            *symbol);
     void *visit( var1_init_decl_c            *symbol);
+    void *visit(   fb_name_decl_c            *symbol);
 
     /**************************************/
     /* B.1.5 - Program organization units */