diff -r 9c1bca18d3fa -r 73e14a2ce5d1 stage3/constant_folding.hh
--- a/stage3/constant_folding.hh	Thu Jan 03 18:27:06 2013 +0000
+++ b/stage3/constant_folding.hh	Thu Jan 10 10:49:50 2013 +0000
@@ -43,6 +43,14 @@
 #include "../absyntax_utils/absyntax_utils.hh"
 
 
+
+/* For the moment we disable constant propagation algorithm as it is not yet complete, 
+ * and due to this is currently brocken and producing incorrect results!
+ */
+#define DO_CONSTANT_PROPAGATION__ 0
+
+
+
 class constant_folding_c : public iterator_visitor_c {
     search_varfb_instance_type_c *search_varfb_instance_type;
     int error_count;
@@ -87,12 +95,16 @@
     /*********************/
     /* B 1.4 - Variables */
     /*********************/
+    #if DO_CONSTANT_PROPAGATION__
     void *visit(symbolic_variable_c *symbol);
+    #endif
 
     /**********************/
     /* B 1.5.3 - Programs */
     /**********************/
+    #if DO_CONSTANT_PROPAGATION__
     void *visit(program_declaration_c *symbol);
+    #endif
 
     /****************************************/
     /* B.2 - Language IL (Instruction List) */
@@ -188,6 +200,7 @@
     //void *visit(function_invocation_c *symbol); /* TODO */
 
     
+    #if DO_CONSTANT_PROPAGATION__
     /*********************************/
     /* B 3.2.1 Assignment Statements */
     /*********************************/
@@ -204,5 +217,6 @@
     void *visit(for_statement_c *symbol);
     void *visit(while_statement_c *symbol);
     void *visit(repeat_statement_c *symbol);
+    #endif // DO_CONSTANT_PROPAGATION__
 };