# HG changeset patch
# User lbessard
# Date 1222331387 -7200
# Node ID 2ad2760840388d230b9801476e24b97f49b58f5f
# Parent  e3ed4747086fe4b9a4ead30012dacabc3245821b
Bug involving possible name conflict between return value and ouputs fixed

diff -r e3ed4747086f -r 2ad276084038 Viewer.py
--- a/Viewer.py	Thu Sep 25 10:28:24 2008 +0200
+++ b/Viewer.py	Thu Sep 25 10:29:47 2008 +0200
@@ -580,8 +580,9 @@
                         iec_path = "%s.%s.%s"%(self.InstancePath, block.GetName(), connectorname)
                     else:
                         if connectorname == "":
-                            connectorname = "OUT"
-                        iec_path = "%s.%s%d_%s"%(self.InstancePath, block.GetType(), block.GetId(), connectorname)
+                            iec_path = "%s.%s%d"%(self.InstancePath, block.GetType(), block.GetId())
+                        else:
+                            iec_path = "%s.%s%d_%s"%(self.InstancePath, block.GetType(), block.GetId(), connectorname)
                     if self.Controler.SubscribeDebugIECVariable(iec_path.upper(), wire) is not None:
                         self.Subscribed[wire] = iec_path.upper()
                     else:
diff -r e3ed4747086f -r 2ad276084038 plcopen/structures.py
--- a/plcopen/structures.py	Thu Sep 25 10:28:24 2008 +0200
+++ b/plcopen/structures.py	Thu Sep 25 10:29:47 2008 +0200
@@ -62,7 +62,7 @@
             for i, variable in enumerate(output_variables):
                 parameter = variable.getformalParameter()
                 if variable.getformalParameter() == "":
-                    variable_name = "%s%d_OUT"%(type, block.getlocalId())
+                    variable_name = "%s%d"%(type, block.getlocalId())
                 else:
                     variable_name = "%s%d_%s"%(type, block.getlocalId(), parameter)
                 if generator.Interface[-1][0] != "VAR" or generator.Interface[-1][1] or generator.Interface[-1][2] or generator.Interface[-1][3]:
@@ -94,7 +94,7 @@
                 output_info = (generator.TagName, "block", block.getlocalId(), "output", i)
                 output_name = variable.getformalParameter()
                 if variable.getformalParameter() == "":
-                    output_name = "%s%d_OUT"%(type, block.getlocalId())
+                    output_name = "%s%d"%(type, block.getlocalId())
                 else:
                     output_name = "%s%d_%s"%(type, block.getlocalId(), variable.getformalParameter())
                 return generator.ExtractModifier(variable, [(output_name, output_info)], output_info)