corrected some warnings

[blast.git] / BlockImplementation.h

diff --git a/BlockImplementation.h b/BlockImplementation.h
index 852cc63df288780db229e4d4914d36895cd62313..4866e859559c5c8dabe55e705f2cad47d5ebdc6c 100644 (file)
--- a/BlockImplementation.h
+++ b/BlockImplementation.h
@@ -28,9 +28,16 @@ public:
   BlockImplementation(const QString& _xmlFile);\r
   BlockImplementation(const QString& _xmlFile, const QString& _referenceXml, const QString& _referenceMd5);\r
 \r
   BlockImplementation(const QString& _xmlFile);\r
   BlockImplementation(const QString& _xmlFile, const QString& _referenceXml, const QString& _referenceMd5);\r
 \r

+  // getters  \r

   inline QString getXmlFile() { return xmlFile; }\r
   inline QString getReferenceXml() { return referenceXml; }\r
   inline QString getReferenceMd5() { return referenceMd5; }\r
   inline QString getXmlFile() { return xmlFile; }\r
   inline QString getReferenceXml() { return referenceXml; }\r
   inline QString getReferenceMd5() { return referenceMd5; }\r

+  inline QString getDelta() { return delta; }\r
+  inline QHash<QString,QString> getConsumptionPattern() { return consumptionPattern; }\r
+  inline QHash<QString,QString> getProductionPattern() { return productionPattern; }\r
+  inline QString getProductionCounter() { return productionCounter; }\r
+  // setters\r
+  \r

   QString eval(QString line, QTextStream& out);\r
   QString evalComplex(QString line, int num);\r
   QString evalString(QString s);\r
   QString eval(QString line, QTextStream& out);\r
   QString evalComplex(QString line, int num);\r
   QString evalString(QString s);\r


@@ -40,7 +47,8 @@ public:
 \r
   inline void setReference(ReferenceBlock* _reference) { reference = _reference; }\r
 \r
 \r
   inline void setReference(ReferenceBlock* _reference) { reference = _reference; }\r
 \r

-  void assignPatterns(FunctionalBlock* _block) throw(Exception); // called during output pattern computation\r
+  void loadPatterns(QDomElement &root) throw(Exception);\r
+  bool checkPatterns();\r

   void generateVHDL(FunctionalBlock* _block, const QString& path) throw(Exception); // main entry to generate the VHDL code\r
   \r
 \r
   void generateVHDL(FunctionalBlock* _block, const QString& path) throw(Exception); // main entry to generate the VHDL code\r
   \r
 \r


@@ -53,6 +61,10 @@ private:
   ArithmeticEvaluator* evaluator;\r
   ReferenceBlock* reference;\r
   FunctionalBlock* block; // the current functional block for which this implementation is used.\r
   ArithmeticEvaluator* evaluator;\r
   ReferenceBlock* reference;\r
   FunctionalBlock* block; // the current functional block for which this implementation is used.\r

+  QString delta;\r
+  QHash<QString,QString> consumptionPattern; // key = reference interface name, value = pattern expression\r
+  QHash<QString,QString> productionPattern; // key = reference interface name, value = pattern expression\r
+  QString productionCounter;\r

 \r
   void generateComments(QDomElement &elt,QString coreFile, QTextStream& out) throw(Exception); // generates comments from <comments> element\r
   void generateLibraries(QDomElement &elt, QTextStream& out) throw(Exception); // generates libraries from <libraries> element\r
 \r
   void generateComments(QDomElement &elt,QString coreFile, QTextStream& out) throw(Exception); // generates comments from <comments> element\r
   void generateLibraries(QDomElement &elt, QTextStream& out) throw(Exception); // generates libraries from <libraries> element\r