nearly finished GroupBlock VHDL gen

[blast.git] / BlockParameterGeneric.cpp

diff --git a/BlockParameterGeneric.cpp b/BlockParameterGeneric.cpp
index 5b15eb98d368ff60895a5b4eabf719e3e2bb64e9..d652c3740d90c18632128304320125a7effd1a3e 100644 (file)
--- a/BlockParameterGeneric.cpp
+++ b/BlockParameterGeneric.cpp
@@ -7,6 +7,9 @@ BlockParameterGeneric::BlockParameterGeneric() : BlockParameter() {
 }\r
 \r
 BlockParameterGeneric::BlockParameterGeneric(AbstractBlock* _owner, const QString &_name, const QString &_type, const QString &_value) : BlockParameter(_owner, _name, _type, _value) {\r
+  /* CAUTION: no check done on the type parameter !\r
+   * It must never be "expression" but something that is numeric/boolean\r
+   */\r
   userValue = defaultValue;\r
 }\r
 \r
@@ -57,22 +60,25 @@ QString BlockParameterGeneric::toVHDL(int context, int flags) {
     }\r
 \r
     if (!userValue.isNull()) {\r
-      ret = formatValue.arg(name).arg(type).arg(userValue.toString());\r
+      ret = formatValue.arg(name).arg(getTypeString()).arg(userValue.toString());\r
     }\r
     else if (!defaultValue.isNull()) {\r
-      ret = formatValue.arg(name).arg(type).arg(defaultValue.toString());\r
+      ret = formatValue.arg(name).arg(getTypeString()).arg(defaultValue.toString());\r
     }\r
     else {\r
-      ret = formatNoValue.arg(name).arg(type);\r
+      ret = formatNoValue.arg(name).arg(getTypeString());\r
     }\r
   }\r
-  else if (context == BlockParameter::Architecture) {\r
+  else if (context == BlockParameter::Instance) {\r
     QString format = "%1 => %2";\r
     if ((flags & BlockParameter::NoComma) == 0) {\r
       format.append(";");\r
     }\r
     AbstractBlock* parent = owner->getParent();\r
-    BlockParameter* p = parent->getParameterFromName(name);\r
+    BlockParameter* p = NULL;\r
+    if (parent != NULL) {\r
+      p = parent->getParameterFromName(name);\r
+    }\r
     if (p != NULL) {\r
       /* the parent group has a generic parameter with the same\r
            name\r