Bug with type conversion EN/ENO not evaluated fixed
authorlaurent
Tue, 01 Sep 2009 16:59:37 +0200
changeset 404 d5a5eaea7844
parent 403 2160fd6d83ed
child 405 2c598d24205f
child 414 8d9e7edc0195
Bug with type conversion EN/ENO not evaluated fixed
generate_IEC_std.py
plcopen/structures.py
--- a/generate_IEC_std.py	Tue Sep 01 16:58:03 2009 +0200
+++ b/generate_IEC_std.py	Tue Sep 01 16:59:37 2009 +0200
@@ -500,11 +500,11 @@
 
 # Now, print that out, or write to files from sys.argv
 for path, name, ext in [
-        ('stage4/generate_c','function_type_decl','h'),
-        ('stage4/generate_c','get_function_type_decl','c'),
+        ('absyntax_utils','function_type_decl','h'),
+        ('absyntax_utils','get_function_type_decl','c'),
         ('stage4/generate_c','st_code_gen','c'),
         ('stage4/generate_c','il_code_gen','c'),
-        ('stage4/generate_c','search_type_code','c'),
+        ('absyntax_utils','search_type_code','c'),
         ('stage1_2','standard_function_names','c'),
         ('lib', 'iec_std_lib_generated','h')
         ]:
--- a/plcopen/structures.py	Tue Sep 01 16:58:03 2009 +0200
+++ b/plcopen/structures.py	Tue Sep 01 16:59:37 2009 +0200
@@ -469,6 +469,8 @@
         outs = reduce(lambda a,b: a or b, map(lambda testtype : IsOfType(fdecl["outputs"][0][1],testtype), OutTypes))
         inps = reduce(lambda a,b: a or b, map(lambda testtype : IsOfType(fdecl["inputs"][0][1],testtype), InTypes))
         if inps and outs and fdecl["outputs"][0][1] != fdecl["inputs"][0][1]:
+             if Format[1] is None:
+                 return (Format[0], "__move_", "IN_type")
              return Format
     
     return None