changed name of the class that converts VHDL -> XML

[blast.git] / FunctionalBlock.cpp

diff --git a/FunctionalBlock.cpp b/FunctionalBlock.cpp
index e7239e09c01e8bf999f1665e96ae78d3488ae476..534625d06bd0d65cab0e7344c0bf6a6fbb6170a5 100644 (file)
--- a/FunctionalBlock.cpp
+++ b/FunctionalBlock.cpp
@@ -127,7 +127,6 @@ void FunctionalBlock::createPatterns() throw(Exception) {
   \r
   cout << "create patterns for block " << qPrintable(name) << endl;\r
   if (evaluator == NULL) evaluator = new ArithmeticEvaluator();\r
   \r
   cout << "create patterns for block " << qPrintable(name) << endl;\r
   if (evaluator == NULL) evaluator = new ArithmeticEvaluator();\r

-  bool ok = true;  \r

   if (! isGeneratorBlock()) {\r
     try {\r
       createDelta();\r
   if (! isGeneratorBlock()) {\r
     try {\r
       createDelta();\r


@@ -159,8 +158,7 @@ void FunctionalBlock::createDelta() throw(Exception) {
     return;\r
   }\r
   \r
     return;\r
   }\r
   \r

-  // look for parameter names\r
-  bool ok = true;\r
+  // look for parameter names  \r

   double result = 0;\r
   try {\r
     result = evaluateExpression(deltaStr);\r
   double result = 0;\r
   try {\r
     result = evaluateExpression(deltaStr);\r


@@ -178,8 +176,7 @@ void FunctionalBlock::createConsumptionPattern()  throw(Exception) {
   cout << "call to " << qPrintable(fctName) << endl;\r
 #endif\r
   \r
   cout << "call to " << qPrintable(fctName) << endl;\r
 #endif\r
   \r

-  lengthCP = -1;\r
-  bool ok = true; \r
+  lengthCP = -1;  \r

   QHash<QString,QString> consPattern = implementation->getConsumptionPattern();  \r
   \r
   foreach(AbstractInterface* iface, getControlInputs()) {       \r
   QHash<QString,QString> consPattern = implementation->getConsumptionPattern();  \r
   \r
   foreach(AbstractInterface* iface, getControlInputs()) {       \r


@@ -476,8 +473,7 @@ void FunctionalBlock::createAdmittance(int nbExec) throw(Exception) {
   static QString fctName = "FunctionalBlock::createAdmittance()";\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r
   static QString fctName = "FunctionalBlock::createAdmittance()";\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r

-#endif\r
-  bool ok = true;\r
+#endif  \r

   // firstly, copy CP in AP\r
   QMapIterator<AbstractInterface*,QList<char>* > iterC(consumptionPattern);\r
   while (iterC.hasNext()) {\r
   // firstly, copy CP in AP\r
   QMapIterator<AbstractInterface*,QList<char>* > iterC(consumptionPattern);\r
   while (iterC.hasNext()) {\r


@@ -553,8 +549,7 @@ void FunctionalBlock::checkInputPatternCompatibility() throw(Exception) {
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r
 #endif\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r
 #endif\r

-  \r
-  bool ok = true;\r
+    \r

   // firstly, create input pattern\r
   try {\r
     createInputPattern();\r
   // firstly, create input pattern\r
   try {\r
     createInputPattern();\r