changed ref/impls xsd and xml

[blast.git] / FunctionalInterface.cpp

diff --git a/FunctionalInterface.cpp b/FunctionalInterface.cpp
index 2fc093e324dc1ecff92335bc973250f6a1a58fe5..eec7ea8e1249746285f271cb355063022eb0fa01 100644 (file)
--- a/FunctionalInterface.cpp
+++ b/FunctionalInterface.cpp
@@ -17,8 +17,9 @@ FunctionalInterface::FunctionalInterface(AbstractBlock* _owner, ReferenceInterfa
   reference = _reference;\r
 \r
   name = reference->getName();\r
   reference = _reference;\r
 \r
   name = reference->getName();\r

+  type = reference->getType();\r

   endianess = reference->getEndianess();\r
   endianess = reference->getEndianess();\r

-  width = reference->getWidth();\r
+  width = reference->getWidthString();\r

   direction = reference->getDirection();\r
   purpose = reference->getPurpose();  \r
   connectedFrom = NULL;  \r
   direction = reference->getDirection();\r
   purpose = reference->getPurpose();  \r
   connectedFrom = NULL;  \r


@@ -107,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


@@ -145,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