diff options
author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-03 16:45:14 +0100 |
---|---|---|
committer | Andreas Stöckel <andreas@somweyr.de> | 2015-01-03 16:45:14 +0100 |
commit | 5096dc30222e346de5d78b02214b623db7ca8c52 (patch) | |
tree | 328d1a944724c90fdabe12304997c2a287a8e65e /src | |
parent | 5c8c0cc70b49c5fb2d85778c31c3d3f9a670d315 (diff) |
Added references for aggregatedOf to the typesystem RttiType definitions
Diffstat (limited to 'src')
-rw-r--r-- | src/core/model/Typesystem.cpp | 12 | ||||
-rw-r--r-- | src/core/model/Typesystem.hpp | 5 |
2 files changed, 13 insertions, 4 deletions
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 @@ -960,6 +960,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. */ extern const Rtti<model::Typesystem> Typesystem; |