Changeset 751

Timestamp:

10/21/15 13:40:58 (9 years ago)

Author:

rlacroix

Message:

Improve the handling of circular references.

• Make circular references a critical error.
• Detect circular dependency earlier.
• Fix and improve the error message.

File:

• XIOS/trunk/src/declare_ref_func.hpp (modified) (2 diffs)

XIOS/trunk/src/declare_ref_func.hpp

@@ -34 +34 @@
 void C##type::solveRefInheritance(bool apply)                          \
 {                                                                      \
-  std::set<C##type*> sset;                                             \
+  std::set<C##type*> refObjects;                                       \
   C##type* refer_ptr = this;                                           \
                                                                        \
   while (refer_ptr->hasDirect##type##Reference())                      \
   {                                                                    \
+    refObjects.insert(refer_ptr);                                      \
+                                                                       \
     refer_ptr = refer_ptr->getDirect##type##Reference();               \
                                                                        \
-    if (sset.end() != sset.find(refer_ptr))                            \
+    if (refObjects.end() != refObjects.find(refer_ptr))                \
     {                                                                  \
-      DEBUG(<< "Circular dependency stopped for #name object on "      \
-            << "\"" + refer_ptr->getId() + "\" !");                    \
-      break;                                                           \
+      ERROR("void C" #type "::solveRefInheritance(bool apply)",        \
+            << "Circular dependency stopped for " #name " object "     \
+            << "with id = \"" << refer_ptr->getId() << "\".");         \
     }                                                                  \
                                                                        \
     SuperClassAttribute::setAttributes(refer_ptr, apply);              \
-    sset.insert(refer_ptr);                                            \
   }                                                                    \
 }                                                                      \
@@ -61 +62 @@
 void C##type::solveBaseReference(void)                                 \
 {                                                                      \
-  std::set<C##type*> sset;                                             \
+  std::set<C##type*> refObjects;                                       \
   baseRefObject = C##type::get(this);                                  \
                                                                        \
   while (baseRefObject->hasDirect##type##Reference())                  \
   {                                                                    \
+    refObjects.insert(baseRefObject);                                  \
+                                                                       \
     baseRefObject = baseRefObject->getDirect##type##Reference();       \
                                                                        \
-    if (sset.end() != sset.find(baseRefObject))                        \
+    if (refObjects.end() != refObjects.find(baseRefObject))            \
     {                                                                  \
-      DEBUG(<< "Circular dependency stopped for #name object on "      \
-            << "\"" + baseRefObject->getId() + "\" !");                \
-      break;                                                           \
+      ERROR("void C" #type "::solveBaseReference(void)",               \
+            << "Circular dependency stopped for " #name " object "     \
+            << "with id = \"" << baseRefObject->getId() << "\".");     \
     }                                                                  \
-                                                                       \
-    sset.insert(baseRefObject);                                        \
   }                                                                    \
                                                                        \