--- a/PLCGenerator.py Wed Aug 29 23:02:04 2012 +0200
+++ b/PLCGenerator.py Sun Sep 02 01:18:50 2012 +0200
@@ -905,7 +905,7 @@
factorized_paths.sort()
return factorized_paths
- def GeneratePaths(self, connections, body, order = False):
+ def GeneratePaths(self, connections, body, order = False, to_inout = False):
paths = []
for connection in connections:
localId = connection.getrefLocalId()
@@ -922,7 +922,7 @@
block_infos = self.GetBlockType(block_type)
if block_infos is None:
raise PLCGenException, _("Undefined block type \"%s\" in \"%s\" POU")%(block_type, self.Name)
- paths.append(str(block_infos["generate"](self, next, block_infos, body, connection, order)))
+ paths.append(str(block_infos["generate"](self, next, block_infos, body, connection, order, to_inout)))
elif isinstance(next, plcopen.commonObjects_continuation):
name = next.getname()
computed_value = self.ComputedConnectors.get(name, None)
@@ -981,8 +981,8 @@
else:
return eval(paths)
- def ComputeExpression(self, body, connections, order = False):
- paths = self.GeneratePaths(connections, body, order)
+ def ComputeExpression(self, body, connections, order = False, to_inout = False):
+ paths = self.GeneratePaths(connections, body, order, to_inout)
if len(paths) > 1:
factorized_paths = self.FactorizePaths(paths)
if len(factorized_paths) > 1: