Fixed #782, supplemental

ObjectVision · Oct 2, 2024 · ea9caeb · ea9caeb
1 parent bd04989
commit ea9caeb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/clc/dll/src/Subset.cpp b/clc/dll/src/Subset.cpp
@@ -479,15 +479,17 @@ struct CollectWithAttrOperator : public BinaryOperator
 			{
 				if (m_CollectMode == collect_mode::org_rel)
 					reportF(SeverityTypeID::ST_Warning, "%s: image of org_rel is %s, which is incompatible with the domain of attribute %s, which is %s"
-						, GetGroup()->GetNameStr()
-						, subDataItem->GetFullName().c_str()
-						, subDataItem->GetAbstrDomainUnit()->GetFullName().c_str()
+					,	GetGroup()->GetNameStr()
+					,	sourceDomain->GetFullCfgName().c_str()
+					,	subDataItem->GetFullName().c_str()
+					,	subDataItem->GetAbstrDomainUnit()->GetFullCfgName().c_str()
 					);
 				else
 					reportF(SeverityTypeID::ST_Warning, "%s: domain of condition is %s, which is incompatible with the domain of attribute %s, which is %s"
 					,	GetGroup()->GetNameStr()
+					,	sourceDomain->GetFullCfgName().c_str()
 					,	subDataItem->GetFullName().c_str()
-					,	subDataItem->GetAbstrDomainUnit()->GetFullName().c_str()
+					,	subDataItem->GetAbstrDomainUnit()->GetFullCfgName().c_str()
 					);
 				continue;
 			}

diff --git a/tic/dll/src/TreeItem.h b/tic/dll/src/TreeItem.h
@@ -434,7 +434,18 @@ struct TreeItem : Actor, ItemTree
 
 
 	TIC_CALL const TreeItem* GetBackRef() const;
-
+	SharedStr GetFullCfgName() const
+	{
+		auto cfgItem = this;
+		while (cfgItem->IsCacheRoot())
+		{
+			auto backItem = cfgItem->GetBackRef();
+			if (!backItem)
+				break;
+			cfgItem = backItem;
+		}
+		return cfgItem->GetFullName();
+	}
 //private: // TODO G8: encapsulate
 
 	TokenID                        m_ID;