Skip to content

fix issue where signal instances were being related to the wrong port #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 2, 2019
Merged

fix issue where signal instances were being related to the wrong port #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions bridgepoint/prebuild.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1363,10 +1363,13 @@ def accept_PortInvocationNode(self, node, act_smt=None):
c_po = one(self.c_c).C_PO[4010](port_filt)
c_ir = one(c_po).C_IR[4016]()
c_ep = one(c_ir).C_I[4012].C_EP[4003](where(Name=node.action_name))
spr_ro = one(c_ep).SPR_REP[4500].SPR_RO[4502]()
spr_rs = one(c_ep).SPR_REP[4500].SPR_RS[4502]()
spr_po = one(c_ep).SPR_PEP[4501].SPR_PO[4503]()
spr_ps = one(c_ep).SPR_PEP[4501].SPR_PS[4503]()
spr_rep = one(c_ir).C_R[4009].SPR_REP[4500](where(ExecutableProperty_Id=c_ep.Id))
spr_ro = one(spr_rep).SPR_RO[4502]()
spr_rs = one(spr_rep).SPR_RS[4502]()
spr_pep = one(c_ir).C_P[4009].SPR_PEP[4501](where(ExecutableProperty_Id=c_ep.Id))
spr_po = one(spr_pep).SPR_PO[4503]()
spr_ps = one(spr_pep).SPR_PS[4503]()


if act_smt:
if spr_ro:
Expand All @@ -1389,19 +1392,17 @@ def accept_PortInvocationNode(self, node, act_smt=None):
Statement_ID=act_smt.Statement_ID,
ProvidedSig_Id=spr_ps.Id)

spr_rep = one(spr_ro).SPR_REP[4502]()
spr_pep = one(spr_po).SPR_PEP[4503]()
c_io = one(c_ep).C_IO[4004]()
v_val = None

if spr_rep:
if spr_ro:
v_val = self.v_val(node, DT_ID=c_io.DT_ID)
self.new('V_MSV',
Value_ID=v_val.Value_ID,
REP_Id=spr_rep.Id,
ParmListOK=True)

if spr_pep:
if spr_po:
v_val = self.v_val(node, DT_ID=c_io.DT_ID)
self.new('V_MSV',
Value_ID=v_val.Value_ID,
Expand Down Expand Up @@ -1445,9 +1446,11 @@ def accept_GeneratePortEventNode(self, node):

c_ir = one(c_po).C_IR[4016]()
c_ep = one(c_ir).C_I[4012].C_EP[4003](where(Name=node.action_name))
spr_rs = one(c_ep).SPR_REP[4500].SPR_RS[4502]()
spr_ps = one(c_ep).SPR_PEP[4501].SPR_PS[4503]()

spr_rep = one(c_ir).C_R[4009].SPR_REP[4500](where(ExecutableProperty_Id=c_ep.Id))
spr_rs = one(spr_rep).SPR_RS[4502]()
spr_pep = one(c_ir).C_P[4009].SPR_PEP[4501](where(ExecutableProperty_Id=c_ep.Id))
spr_ps = one(spr_pep).SPR_PS[4503]()


act_smt = self.act_smt(node)
v_val = self.accept(node.expression)
Expand Down