# HG changeset patch
# User Mario de Sousa <msousa@fe.up.pt>
# Date 1305624912 -3600
# Node ID de1be61482fae13f62bc5557d0992535b1c0d495
# Parent  022a874149cefa6fb334010b9d10a5972d1bf036# Parent  aae14da3c296d8f4f7e98a9431028918ce727bcd
Merging with Edouard's changes

diff -r 022a874149ce -r de1be61482fa absyntax_utils/search_il_operand_type.hh
--- a/absyntax_utils/search_il_operand_type.hh	Tue May 17 10:34:00 2011 +0100
+++ b/absyntax_utils/search_il_operand_type.hh	Tue May 17 10:35:12 2011 +0100
@@ -48,7 +48,7 @@
 class search_il_operand_type_c {
 
   private:
-  search_varfb_instance_type_c::search_varfb_instance_type_c search_varfb_instance_type;
+    search_varfb_instance_type_c search_varfb_instance_type;
     search_constant_type_c search_constant_type;
 
   public:
diff -r 022a874149ce -r de1be61482fa stage4/generate_c/generate_var_list.cc
--- a/stage4/generate_c/generate_var_list.cc	Tue May 17 10:34:00 2011 +0100
+++ b/stage4/generate_c/generate_var_list.cc	Tue May 17 10:35:12 2011 +0100
@@ -110,6 +110,7 @@
       variable_vtc,
       external_vtc,
       located_input_vtc,
+      located_memory_vtc,
       located_output_vtc,
       array_vtc,
       structure_vtc,
@@ -216,6 +217,9 @@
         case located_input_vtc:
           s4o.print("IN");
           break;
+        case located_memory_vtc:
+          s4o.print("MEM");
+          break;
         case located_output_vtc:
           s4o.print("OUT");
           break;
@@ -484,6 +488,8 @@
 	  locationtype_t location_type = search_location_type.get_location_type(symbol->location);
 	  if (location_type == input_lt)
         this->current_var_type_category = located_input_vtc;
+      else if (location_type == memory_lt)
+        this->current_var_type_category = located_memory_vtc;
       else if (location_type == output_lt)
         this->current_var_type_category = located_output_vtc;