summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2017-07-19 14:10:14 +0200
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2017-07-19 14:10:14 +0200
commit56c16f1120ce4f60218a074922939baedf69d254 (patch)
tree639184ec06cdbc84060487e5c24733ef7d81717d /instr-scripts
parentf14256ddd4129eb0e4ed331f2fa3d84b3618f0a6 (diff)
Signals being used instead of wfm + rec targets
Those Python scripts may have to be cleaned up at some point...
Diffstat (limited to 'instr-scripts')
-rw-r--r--instr-scripts/process_internals.py36
1 files changed, 27 insertions, 9 deletions
diff --git a/instr-scripts/process_internals.py b/instr-scripts/process_internals.py
index e0034bf..d3c9ff5 100644
--- a/instr-scripts/process_internals.py
+++ b/instr-scripts/process_internals.py
@@ -158,7 +158,9 @@ class Process_Internals:
"(expr_reads "
+ cond_node_id
+ " "
- + self.id_manager.get_id_from_xml(src_xml.attrib.get("ref"))
+ + self.wfm_manager.get_waveform_from_source(
+ self.id_manager.get_id_from_xml(src_xml.attrib.get("ref"))
+ )
+ ")\n"
)
@@ -327,16 +329,26 @@ class Process_Internals:
"./target"
)
- if (target_xml.attrib.get("kind") == "indexed_name"):
- target_xml = target_xml.find("./prefix/named_entity")
- else:
- target_xml = target_xml.find("./named_entity")
+ # Oddly enough, we can get a target as a ref...
+ # The (hacky) solution? Find the real source.
+ while (target_xml.tag == "target"):
+
+ if (target_xml.attrib.get("kind") == "indexed_name"):
+ target_xml = target_xml.find("./prefix/named_entity")
+ else:
+ target_xml = target_xml.find("./named_entity")
+
+ target_xml = self.xml_root.find(
+ ".//*[@id=\"" + target_xml.attrib.get("ref") + "\"]"
+ )
self.output.write(
"(expr_writes "
+ node_id
+ " "
- + self.id_manager.get_id_from_xml(target_xml.attrib.get("ref"))
+ + self.wfm_manager.get_waveform_from_source(
+ self.id_manager.get_id_from_xml(target_xml.attrib.get("id"))
+ )
+ ")\n"
)
@@ -362,7 +374,9 @@ class Process_Internals:
"(expr_reads "
+ node_id
+ " "
- + self.id_manager.get_id_from_xml(src_xml.attrib.get("ref"))
+ + self.wfm_manager.get_waveform_from_source(
+ self.id_manager.get_id_from_xml(src_xml.attrib.get("ref"))
+ )
+ ")\n"
)
@@ -417,7 +431,9 @@ class Process_Internals:
"(expr_reads "
+ cond_node_id
+ " "
- + self.id_manager.get_id_from_xml(src_xml.attrib.get("ref"))
+ + self.wfm_manager.get_waveform_from_source(
+ self.id_manager.get_id_from_xml(src_xml.attrib.get("ref"))
+ )
+ ")\n"
)
@@ -540,7 +556,9 @@ class Process_Internals:
"(expr_reads "
+ node_id
+ " "
- + self.id_manager.get_id_from_xml(src_xml.attrib.get("ref"))
+ + self.wfm_manager.get_waveform_from_source(
+ self.id_manager.get_id_from_xml(src_xml.attrib.get("ref"))
+ )
+ ")\n"
)