From 5096dc30222e346de5d78b02214b623db7ca8c52 Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Sat, 3 Jan 2015 16:45:14 +0100
Subject: Added references for aggregatedOf to the typesystem RttiType
 definitions

---
 src/core/model/Typesystem.cpp | 12 ++++++++----
 src/core/model/Typesystem.hpp |  5 +++++
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'src/core/model')

diff --git a/src/core/model/Typesystem.cpp b/src/core/model/Typesystem.cpp
index 9fbecd6..24be67f 100644
--- a/src/core/model/Typesystem.cpp
+++ b/src/core/model/Typesystem.cpp
@@ -444,13 +444,17 @@ const Rtti<model::IntType> IntType{"IntType", {&Type}};
 const Rtti<model::DoubleType> DoubleType{"DoubleType", {&Type}};
 const Rtti<model::BoolType> BoolType{"BoolType", {&Type}};
 const Rtti<model::EnumType> EnumType{"EnumType", {&Type}};
-const Rtti<model::StructType> StructType{"StructType", {&Type}};
+const Rtti<model::StructType> StructType{"StructType", {&Type}, {&Attribute}};
 const Rtti<model::ArrayType> ArrayType{"ArrayType", {&Type}};
 const Rtti<model::UnknownType> UnknownType{"UnknownType", {&Type}};
 const Rtti<model::Constant> Constant{"Constant", {&Node}};
-const Rtti<model::Typesystem> Typesystem{"Typesystem", {&Node}};
-const Rtti<model::SystemTypesystem> SystemTypesystem{"SystemTypesystem",
-                                                     {&Typesystem}};
+const Rtti<model::Attribute> Attribute{"Attribute", {&Node}};
+const Rtti<model::Typesystem> Typesystem{
+    "Typesystem", {&Node}, {&StructType, &EnumType, &Constant}};
+const Rtti<model::SystemTypesystem> SystemTypesystem{
+    "SystemTypesystem",
+    {&Typesystem},
+    {&StringType, &IntType, &DoubleType, &BoolType, &EnumType}};
 }
 }
 
diff --git a/src/core/model/Typesystem.hpp b/src/core/model/Typesystem.hpp
index a4322c4..b492b25 100644
--- a/src/core/model/Typesystem.hpp
+++ b/src/core/model/Typesystem.hpp
@@ -959,6 +959,11 @@ extern const Rtti<model::UnknownType> UnknownType;
  */
 extern const Rtti<model::Constant> Constant;
 
+/**
+ * Type information for the Constant class.
+ */
+extern const Rtti<model::Attribute> Attribute;
+
 /**
  * Type information for the Typesystem class.
  */
-- 
cgit v1.2.3