added context to dispatcher op.

[blast.git] / FunctionalBlock.cpp

diff --git a/FunctionalBlock.cpp b/FunctionalBlock.cpp
index 449e2ecee4df3605beff48c630451fb3c4a31dd1..65c8df81206466a06f0e7cb9eefe7c00f33305ae 100644 (file)
--- a/FunctionalBlock.cpp
+++ b/FunctionalBlock.cpp
@@ -8,7 +8,7 @@
 #include "ArithmeticEvaluator.h"\r
 \r
 \r
-FunctionalBlock::FunctionalBlock(GroupBlock *_parent, ReferenceBlock *_reference) throw(Exception) :  AbstractBlock() {\r
+FunctionalBlock::FunctionalBlock(GroupBlock *_parent, ReferenceBlock *_reference, bool createIfaces) throw(Exception) :  AbstractBlock() {\r
   //if (! _reference->isReferenceBlock()) throw(Exception(BLOCK_INVALID_TYPE));\r
   //if (! _group->isGroupBlock()) throw(Exception(BLOCK_INVALID_TYPE));\r
   reference = _reference;\r
@@ -30,6 +30,10 @@ FunctionalBlock::FunctionalBlock(GroupBlock *_parent, ReferenceBlock *_reference
   delta = -1;\r
   evaluator = NULL;\r
 \r
+  if (createIfaces) {\r
+    populate();\r
+  }\r
+\r
 }\r
 \r
 FunctionalBlock::~FunctionalBlock() {\r
@@ -441,12 +445,17 @@ QList<char> FunctionalBlock::expandPatternRecur(const QString& patternIn, int *o
       catch(Exception e) {\r
         throw(e);\r
       }\r
+      if (repeat == 0) {\r
+        // remove the last\r
+        patternOut.removeLast();\r
+      }\r
+      else {\r
       // repeat just the last value in currentGroup\r
-      char last = patternOut.last();\r
-      //cout << "repeat last char " << repeat << " times : " << (int)last << endl;\r
-      \r
-      for(int i=1;i<(int)repeat;i++) {\r
-        patternOut.append(last);\r
+        char last = patternOut.last();\r
+        //cout << "repeat last char " << repeat << " times : " << (int)last << endl;\r
+        for(int i=1;i<(int)repeat;i++) {\r
+          patternOut.append(last);\r
+        }\r
       }\r
     }    \r
     *offset += 1;\r
@@ -470,15 +479,21 @@ QList<char> FunctionalBlock::expandPatternRecur(const QString& patternIn, int *o
     catch(Exception e) {\r
       throw(e);\r
     }\r
-    /*\r
+    if (repeat == 0) {\r
+      QList<char> voidList;\r
+      return voidList;\r
+    }\r
+    else {\r
+      /*\r
     cout << "repeat last group " << repeat << " times : ";\r
     foreach (char c, currentGroup) cout <<(int)c;\r
-    cout << endl;  \r
+    cout << endl;\r
     */\r
-    QList<char> single = patternOut;\r
-    for(int i=1;i<(int)repeat;i++) {\r
-      patternOut.append(single);\r
-    }    \r
+      QList<char> single = patternOut;\r
+      for(int i=1;i<(int)repeat;i++) {\r
+        patternOut.append(single);\r
+      }\r
+    }\r
   }  \r
   return patternOut;\r
 }\r