beremiz: comparison PLCGenerator.py

equal deleted inserted replaced

-:cd639725fba5
+:f034fb2b1aab
 return current_type
 # Return connectors linked by a connection to the given connector
 def GetConnectedConnector(self, connector, body):
 links = connector.getconnections()
-if links and len(links) == 1:
+if links is not None and len(links) == 1:
 return self.GetLinkedConnector(links[0], body)
 return None
 def GetLinkedConnector(self, link, body):
 parameter = link.getformalParameter()
 for connection in self.ExtractRelatedConnections(instance.connectionPointOut):
 self.ConnectionTypes[connection] = var_type
 if isinstance(instance, (OutVariableClass, InOutVariableClass)):
 self.ConnectionTypes[instance.connectionPointIn] = var_type
 connected = self.GetConnectedConnector(instance.connectionPointIn, body)
-if connected and not self.ConnectionTypes.has_key(connected):
+if connected is not None and not self.ConnectionTypes.has_key(connected):
-for connection in self.ExtractRelatedConnections(connected):
+for related in self.ExtractRelatedConnections(connected):
-self.ConnectionTypes[connection] = var_type
+self.ConnectionTypes[related] = var_type
 elif isinstance(instance, (ContactClass, CoilClass)):
 for connection in self.ExtractRelatedConnections(instance.connectionPointOut):
 self.ConnectionTypes[connection] = "BOOL"
 self.ConnectionTypes[instance.connectionPointIn] = "BOOL"
-connected = self.GetConnectedConnector(instance.connectionPointIn, body)
+for link in instance.connectionPointIn.getconnections():
-if connected and not self.ConnectionTypes.has_key(connected):
+connected = self.GetLinkedConnector(link, body)
-for connection in self.ExtractRelatedConnections(connected):
+if connected is not None and not self.ConnectionTypes.has_key(connected):
-self.ConnectionTypes[connection] = "BOOL"
+for related in self.ExtractRelatedConnections(connected):
+self.ConnectionTypes[related] = "BOOL"
 elif isinstance(instance, LeftPowerRailClass):
 for connection in instance.getconnectionPointOut():
 for related in self.ExtractRelatedConnections(connection):
 self.ConnectionTypes[related] = "BOOL"
 elif isinstance(instance, RightPowerRailClass):
 for connection in instance.getconnectionPointIn():
 self.ConnectionTypes[connection] = "BOOL"
-connected = self.GetConnectedConnector(connection, body)
+for link in connection.getconnections():
-if connected and not self.ConnectionTypes.has_key(connected):
+connected = self.GetLinkedConnector(link, body)
-for connection in self.ExtractRelatedConnections(connected):
+if connected is not None and not self.ConnectionTypes.has_key(connected):
-self.ConnectionTypes[connection] = "BOOL"
+for related in self.ExtractRelatedConnections(connected):
+self.ConnectionTypes[related] = "BOOL"
 elif isinstance(instance, TransitionClass):
 content = instance.getconditionContent()
 if content["type"] == "connection":
-connected = self.GetLinkedConnector(content["value"], body)
+self.ConnectionTypes[content["value"]] = "BOOL"
-if connected and not self.ConnectionTypes.has_key(connected):
+for link in content["value"].getconnections():
-for connection in self.ExtractRelatedConnections(connected):
+connected = self.GetLinkedConnector(link, body)
-self.ConnectionTypes[connection] = "BOOL"
+if connected is not None and not self.ConnectionTypes.has_key(connected):
+for related in self.ExtractRelatedConnections(connected):
+self.ConnectionTypes[related] = "BOOL"
 elif isinstance(instance, ContinuationClass):
 name = instance.getname()
 connector = None
 var_type = "ANY"
 for element in body.getcontentInstances():
 raise PLCGenException, _("More than one connector found corresponding to \"%s\" continuation in \"%s\" POU")%(name, self.Name)
 connector = element
 if connector is not None:
 undefined = [instance.connectionPointOut, connector.connectionPointIn]
 connected = self.GetConnectedConnector(connector.connectionPointIn, body)
-if connected:
+if connected is not None:
 undefined.append(connected)
 related = []
 for connection in undefined:
 if self.ConnectionTypes.has_key(connection):
 var_type = self.ConnectionTypes[connection]
 connected = self.GetConnectedConnector(variable.connectionPointIn, body)
 if itype.startswith("ANY"):
 if not undefined.has_key(itype):
 undefined[itype] = []
 undefined[itype].append(variable.connectionPointIn)
-if connected:
+if connected is not None:
 undefined[itype].append(connected)
 else:
 self.ConnectionTypes[variable.connectionPointIn] = itype
-if connected and not self.ConnectionTypes.has_key(connected):
+if connected is not None and not self.ConnectionTypes.has_key(connected):
 for connection in self.ExtractRelatedConnections(connected):
 self.ConnectionTypes[connection] = itype
 for var_type, connections in undefined.items():
 related = []
 for connection in connections:
 self.GenerateSFCStep(instance, pou)
 elif isinstance(instance, ActionBlockClass):
 self.GenerateSFCStepActions(instance, pou)
 elif isinstance(instance, TransitionClass):
 self.GenerateSFCTransition(instance, pou)
-elif isinstance(instance, JumpClass):
+elif isinstance(instance, JumpStepClass):
 self.GenerateSFCJump(instance, pou)
 if len(self.InitialSteps) > 0 and len(self.SFCComputedBlocks) > 0:
 action_name = "COMPUTE_FUNCTION_BLOCKS"
 action_infos = {"qualifier" : "S", "content" : action_name}
 self.SFCNetworks["Steps"][self.InitialSteps[0]]["actions"].append(action_infos)
 self.Program += [(");\n", ())]
 return [("%s.Q"%name, var_info)]
 def ExtractDivergenceInput(self, divergence, pou):
 connectionPointIn = divergence.getconnectionPointIn()
-if connectionPointIn:
+if connectionPointIn is not None:
 connections = connectionPointIn.getconnections()
 if connections is not None and len(connections) == 1:
 instanceLocalId = connections[0].getrefLocalId()
 body = pou.getbody()
 if isinstance(body, ListType):
 step_infos = {"id" : step.getlocalId(),
 "initial" : step.getinitialStep(),
 "transitions" : [],
 "actions" : []}
 self.SFCNetworks["Steps"][step_name] = step_infos
-if step.connectionPointIn:
+if step.connectionPointIn is not None:
 instances = []
 connections = step.connectionPointIn.getconnections()
 if connections is not None and len(connections) == 1:
 instanceLocalId = connections[0].getrefLocalId()
 body = pou.getbody()
 instances.append(instance)
 elif isinstance(instance, SelectionConvergenceClass):
 instances.extend(self.ExtractConvergenceInputs(instance, pou))
 elif isinstance(instance, SimultaneousDivergenceClass):
 transition = self.ExtractDivergenceInput(instance, pou)
-if transition:
+if transition is not None:
 if isinstance(transition, TransitionClass):
 instances.append(transition)
 elif isinstance(transition, SelectionConvergenceClass):
 instances.extend(self.ExtractConvergenceInputs(transition, pou))
 for instance in instances:
 target_info = (self.TagName, "transition", instance.getlocalId(), "to", step_infos["id"])
 self.SFCNetworks["Transitions"][instance]["to"].append([(step_name, target_info)])
 def GenerateSFCJump(self, jump, pou):
 jump_target = jump.gettargetName()
-if jump.connectionPointIn:
+if jump.connectionPointIn is not None:
 instances = []
 connections = jump.connectionPointIn.getconnections()
 if connections is not None and len(connections) == 1:
 instanceLocalId = connections[0].getrefLocalId()
 body = pou.getbody()
 instances.append(instance)
 elif isinstance(instance, SelectionConvergenceClass):
 instances.extend(self.ExtractConvergenceInputs(instance, pou))
 elif isinstance(instance, SimultaneousDivergenceClass):
 transition = self.ExtractDivergenceInput(instance, pou)
-if transition:
+if transition is not None:
 if isinstance(transition, TransitionClass):
 instances.append(transition)
 elif isinstance(transition, SelectionConvergenceClass):
 instances.extend(self.ExtractConvergenceInputs(transition, pou))
 for instance in instances:
 self.SFCNetworks["Steps"][step_name]["actions"].append(action_infos)
 def GenerateSFCAction(self, action_name, pou):
 if action_name not in self.SFCNetworks["Actions"].keys():
 actionContent = pou.getaction(action_name)
-if actionContent:
+if actionContent is not None:
 previous_tagname = self.TagName
 self.TagName = self.ParentGenerator.Controler.ComputePouActionName(self.Name, action_name)
 self.ComputeProgram(actionContent)
 self.SFCNetworks["Actions"][action_name] = (self.Program, (self.TagName, "name"))
 self.Program = []
 instance = body.getcontentInstance(instanceLocalId)
 if isinstance(instance, StepClass):
 steps.append(instance)
 elif isinstance(instance, SelectionDivergenceClass):
 step = self.ExtractDivergenceInput(instance, pou)
-if step:
+if step is not None:
 if isinstance(step, StepClass):
 steps.append(step)
 elif isinstance(step, SimultaneousConvergenceClass):
 steps.extend(self.ExtractConvergenceInputs(step, pou))
 elif isinstance(instance, SimultaneousConvergenceClass):
 steps.extend(self.ExtractConvergenceInputs(instance, pou))
 transition_infos = {"id" : transition.getlocalId(),
 "priority": transition.getpriority(),
 "from": [],
-"to" : []}
+"to" : [],
+"content": []}
 self.SFCNetworks["Transitions"][transition] = transition_infos
 transitionValues = transition.getconditionContent()
 if transitionValues["type"] == "inline":
 transition_infos["content"] = [("\n%s:= "%self.CurrentIndent, ()),
 (transitionValues["value"], (self.TagName, "transition", transition.getlocalId(), "inline")),
 self.TagName = previous_tagname
 elif transitionValues["type"] == "connection":
 body = pou.getbody()
 if isinstance(body, ListType):
 body = body[0]
-connections = transition.getconnections()
+connections = transitionValues["value"].getconnections()
 if connections is not None:
 expression = self.ComputeExpression(body, connections)
 if expression is not None:
 transition_infos["content"] = [("\n%s:= "%self.CurrentIndent, ())] + expression + [(";\n", ())]
 self.SFCComputedBlocks += self.Program
 def ComputeSFCAction(self, action_name):
 if action_name in self.SFCNetworks["Actions"].keys():
 action_content, action_info = self.SFCNetworks["Actions"].pop(action_name)
 self.Program += [("%sACTION "%self.CurrentIndent, ()),
 (action_name, action_info),
-(" :\n", ())]
+(":\n", ())]
 self.Program += action_content
 self.Program += [("%sEND_ACTION\n\n"%self.CurrentIndent, ())]
 def ComputeSFCTransition(self, transition):
 if transition in self.SFCNetworks["Transitions"].keys():

changeset 1298	f034fb2b1aab
parent 1297	cd639725fba5
child 1310	3d7fa2257b24