Mercurial Mercurial > matiec / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | zip | gz | help
Merging with Edouard's version
authorMario de Sousa <msousa@fe.up.pt>
Fri, 27 May 2011 18:01:54 +0100
changeset 303 0cdf1410bcd8
parent 302 d120740a6b58 (current diff)
parent 301 15bf9ecb936d (diff)
child 304 1b6d8e3df1b2
Merging with Edouard's version 
--- a/lib/iec_types_all.h	Fri May 27 18:01:01 2011 +0100
+++ b/lib/iec_types_all.h	Fri May 27 18:01:54 2011 +0100
@@ -16,6 +16,7 @@
 #define __IEC_DEBUG_FLAG 0x01
 #define __IEC_FORCE_FLAG 0x02
 #define __IEC_RETAIN_FLAG 0x04
+#define __IEC_OUTPUT_FLAG 0x08
 
 #define __DECLARE_IEC_TYPE(type)\
 typedef IEC_##type type;\
--- a/stage4/generate_c/generate_var_list.cc	Fri May 27 18:01:01 2011 +0100
+++ b/stage4/generate_c/generate_var_list.cc	Fri May 27 18:01:54 2011 +0100
@@ -316,6 +316,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;
 
@@ -341,6 +343,8 @@
         locationtype_t location_type = search_location_type.get_location_type(symbol->incompl_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;
matiec