added context to dispatcher op.

[blast.git] / FunctionalInterface.cpp

diff --git a/FunctionalInterface.cpp b/FunctionalInterface.cpp
index 1237e744a9416423d2972d5823a7991672052c17..eec7ea8e1249746285f271cb355063022eb0fa01 100644 (file)
--- a/FunctionalInterface.cpp
+++ b/FunctionalInterface.cpp
@@ -108,16 +108,16 @@ bool FunctionalInterface::canConnectTo(AbstractInterface *iface) {
   // first case: interface of blocks within the same group\r
   if (getOwner()->getParent() == iface->getOwner()->getParent()) {\r
 \r
   // first case: interface of blocks within the same group\r
   if (getOwner()->getParent() == iface->getOwner()->getParent()) {\r
 \r

-    if ((direction == Output) && (iface->getDirection() == Input)) return true;\r
-    if ((direction == InOut) && (iface->getDirection() == InOut)) return true;\r
+    if ((direction == Output) && (iface->getDirection() == Input) && (purpose == iface->getPurpose())) return true;\r
+    if ((direction == InOut) && (iface->getDirection() == InOut) && (purpose == iface->getPurpose())) return true;\r

   }\r
   // second case: iface = interface of the group that contains owner of this\r
   else if (getOwner()->getParent() == iface->getOwner()) {\r
   }\r
   // second case: iface = interface of the group that contains owner of this\r
   else if (getOwner()->getParent() == iface->getOwner()) {\r

-    if ((direction == Output) && (iface->getDirection() == Output)) return true;\r
-    if ((direction == InOut) && (iface->getDirection() == InOut)) return true;\r
+    if ((direction == Output) && (iface->getDirection() == Output) && (purpose == iface->getPurpose())) return true;\r
+    if ((direction == InOut) && (iface->getDirection() == InOut) && (purpose == iface->getPurpose())) return true;\r

   }\r
   else if ((getOwner()->isSourceBlock()) && (iface->getOwner()->isTopGroupBlock())) {\r
   }\r
   else if ((getOwner()->isSourceBlock()) && (iface->getOwner()->isTopGroupBlock())) {\r

-    if ((direction == Output) && (iface->getDirection() == Input)) return true;\r
+    if ((direction == Output) && (iface->getDirection() == Input) && (purpose == iface->getPurpose())) return true;\r

   }\r
 \r
   return false;\r
   }\r
 \r
   return false;\r


@@ -146,12 +146,12 @@ bool FunctionalInterface::canConnectFrom(AbstractInterface *iface) {
 \r
   if (getOwner()->getParent() == iface->getOwner()->getParent()) {\r
 \r
 \r
   if (getOwner()->getParent() == iface->getOwner()->getParent()) {\r
 \r

-    if ((direction == Input) && (iface->getDirection() == Output)) return true;\r
-    if ((direction == InOut) && (iface->getDirection() == InOut)) return true;\r
+    if ((direction == Input) && (iface->getDirection() == Output) && (purpose == iface->getPurpose())) return true;\r
+    if ((direction == InOut) && (iface->getDirection() == InOut) && (purpose == iface->getPurpose())) return true;\r

   }\r
   else if (getOwner()->getParent() == iface->getOwner()) {\r
   }\r
   else if (getOwner()->getParent() == iface->getOwner()) {\r

-    if ((direction == Input) && (iface->getDirection() == Input)) return true;\r
-    if ((direction == InOut) && (iface->getDirection() == InOut)) return true;\r
+    if ((direction == Input) && (iface->getDirection() == Input) && (purpose == iface->getPurpose())) return true;\r
+    if ((direction == InOut) && (iface->getDirection() == InOut) && (purpose == iface->getPurpose())) return true;\r

   }\r
 \r
   return false;\r
   }\r
 \r
   return false;\r