# HG changeset patch # User laurent # Date 1251817177 -7200 # Node ID d5a5eaea78443c4a74bf01ea3dbf355f1e30417c # Parent 2160fd6d83ed77abda2569f307b4b79eb65fcaf3 Bug with type conversion EN/ENO not evaluated fixed diff -r 2160fd6d83ed -r d5a5eaea7844 generate_IEC_std.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') ]: diff -r 2160fd6d83ed -r d5a5eaea7844 plcopen/structures.py --- 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