corrected some warnings

[blast.git] / AbstractInterface.h

diff --git a/AbstractInterface.h b/AbstractInterface.h
index e26f5c5975ae424c761ba29824dee3ce01f1bcc4..2c914d482883a4e0b3fa450ce3677f73ad56c3ff 100644 (file)
--- a/AbstractInterface.h
+++ b/AbstractInterface.h
@@ -14,6 +14,7 @@ class Exception;
 #define AI_TO_REF(ptr) ((ReferenceInterface*)ptr)
 #define AI_TO_FUN(ptr) ((FunctionalInterface*)ptr)
 #define AI_TO_GRP(ptr) ((GroupInterface*)ptr)
 #define AI_TO_REF(ptr) ((ReferenceInterface*)ptr)
 #define AI_TO_FUN(ptr) ((FunctionalInterface*)ptr)
 #define AI_TO_GRP(ptr) ((GroupInterface*)ptr)

+#define AI_TO_CON(ptr) ((ConnectedInterface*)ptr)

 
 using namespace std;
 using namespace Qt;
 
 using namespace std;
 using namespace Qt;


@@ -24,12 +25,13 @@ class AbstractInterface {
 public :
 
   enum IfaceWidthType { Expression = 1, Boolean, Natural, Inherited}; //! Inherited is only for Group interface 
 public :
 
   enum IfaceWidthType { Expression = 1, Boolean, Natural, Inherited}; //! Inherited is only for Group interface 

-  enum IfacePurpose { Data = 1, Control, Clock, Reset, Wishbone };
-  enum IfaceDirection { Input = 1, Output = 2, InOut = 3 };  
-  enum IfaceVHDLContext { Entity = 1, Component = 2, Architecture = 3 }; // NB : 3 is when creating an instance of the block that owns this iface
+  enum IfacePurpose { AnyPurpose = 0, Data = 1, Control, Clock, Reset, Wishbone };
+  enum IfaceDirection { AnyDirection = 0, Input = 1, Output = 2, InOut = 3 };  
+  enum IfaceVHDLContext {AnyContext = 0, Entity = 1, Component = 2, Architecture = 3 }; // NB : 3 is when creating an instance of the block that owns this iface

   enum IfaceVHDLFlags { NoComma = 1 };
 
   enum IfaceVHDLFlags { NoComma = 1 };
 

-  static int getIntDirection(QString str);  
+  static int getIntDirection(QString str);
+  static int getIntPurpose(QString str);

 
   AbstractInterface(AbstractBlock* _owner);
   AbstractInterface(AbstractBlock* _owner, const QString& _name, const QString& _type, const QString& _width, int _direction, int _purpose);
 
   AbstractInterface(AbstractBlock* _owner);
   AbstractInterface(AbstractBlock* _owner, const QString& _name, const QString& _type, const QString& _width, int _direction, int _purpose);


@@ -50,16 +52,6 @@ public :
 
   double getDoubleWidth() throw(QException);
   
 
   double getDoubleWidth() throw(QException);
   

-  inline QList<char> getConsumptionPattern() { return consumptionPattern; }
-  inline QList<char> getProductionPattern() { return productionPattern; }  
-  inline QList<char> getOutputPattern() { return outputPattern; }
-
-  //virtual QList<AbstractInterface*> getConnectedTo() = 0;
-
-  /* NB: only GroupInterface and FunctionalInterface have a connectedFrom, so
-     defining getConnectedFrom as pure virtual is normal, usefull even though it is ugly :-)
-   */
-  virtual AbstractInterface* getConnectedFrom() = 0;

 
   // setters
   inline void setOwner(AbstractBlock* _owner) { owner = _owner; }
 
   // setters
   inline void setOwner(AbstractBlock* _owner) { owner = _owner; }


@@ -71,28 +63,14 @@ public :
   void setDirection(int _direction);
   bool setAssociatedIface(AbstractInterface* iface);
   
   void setDirection(int _direction);
   bool setAssociatedIface(AbstractInterface* iface);
   

-  inline void setConsumptionPattern(QList<char> pattern) { consumptionPattern = pattern; }
-  inline void setProductionPattern(QList<char> pattern) { productionPattern = pattern; }  
-  inline void setOutputPattern(QList<char> pattern) { outputPattern = pattern; }
-

   // testers
   virtual bool isReferenceInterface();
   virtual bool isFunctionalInterface();
   virtual bool isGroupInterface();
   // testers
   virtual bool isReferenceInterface();
   virtual bool isFunctionalInterface();
   virtual bool isGroupInterface();

-  //virtual bool isConnectedTo() = 0;
-  //virtual bool isConnectedFrom() = 0;
-  //virtual bool canConnectTo(AbstractInterface* iface) = 0; // returns yes if this can be connected to iface, no if not
-  //virtual bool canConnectFrom(AbstractInterface* iface) = 0; // returns yes if this can be connected from iface, no if not

 
   // others
   virtual AbstractInterface *clone() = 0;
 
   // others
   virtual AbstractInterface *clone() = 0;

-
-  //virtual bool addConnectedTo(AbstractInterface *inter) = 0;
-  //virtual void removeConnectedTo(AbstractInterface *inter) = 0;
-  //virtual bool setConnectedFrom(AbstractInterface* inter) = 0;
-  //virtual void clearConnectedTo() = 0;
-  //virtual void clearConnections() = 0;
-  //virtual void connectionsValidation(QStack<AbstractInterface*> *interfacetoValidate, QList<AbstractInterface*> *validatedInterfaces) throw(Exception) = 0;
+  

   int typeFromString(const QString &_type);
 
   QString toVHDL(int context, int flags) throw(Exception);
   int typeFromString(const QString &_type);
 
   QString toVHDL(int context, int flags) throw(Exception);


@@ -115,11 +93,7 @@ protected:
    */
   AbstractInterface* associatedIface;
   
    */
   AbstractInterface* associatedIface;
   

-  // patterns
-  QList<char> consumptionPattern; //! only usefull for input interfaces
-  QList<char> productionPattern; //! only usefull for output interfaces

   
   

-  QList<char> outputPattern; //! only usefull for output interfaces

 };
 
 
 };