diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2014-12-21 15:28:42 +0100 |
|---|---|---|
| committer | Andreas Stöckel <andreas@somweyr.de> | 2014-12-21 15:28:42 +0100 |
| commit | 93c7856c3bfff94eed82c2fae9ab32917ccaad92 (patch) | |
| tree | 0b3ad6da92c97e6a5b47289ec2b0ad0cdb4dd9e7 /test/core/model | |
| parent | da3b35e77c1e22b46264df4c1b2a48f867d1e15e (diff) | |
| parent | f1bb76dedf2d6b480b566540e811a7e0d3af9886 (diff) | |
Merge branch 'master' of somweyr.de:ousia
Diffstat (limited to 'test/core/model')
| -rw-r--r-- | test/core/model/TestDomain.hpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/test/core/model/TestDomain.hpp b/test/core/model/TestDomain.hpp index 41fcdef..dd58524 100644 --- a/test/core/model/TestDomain.hpp +++ b/test/core/model/TestDomain.hpp @@ -59,9 +59,9 @@ static Rooted<Domain> constructBookDomain(Manager &mgr) any.merge(Range<size_t>::typeRangeFrom(0)); // Set up the "book" node. - Rooted<StructuredClass> book{ - new StructuredClass(mgr, "book", domain, single)}; - domain->getRootStructures().push_back(book); + Rooted<StructuredClass> book{new StructuredClass( + mgr, "book", domain, single, {nullptr}, {nullptr}, false, true)}; + domain->getStructureClasses().push_back(book); // The structure field of it. Rooted<FieldDescriptor> book_field{new FieldDescriptor(mgr, book)}; book->getFieldDescriptors().push_back(book_field); @@ -70,6 +70,7 @@ static Rooted<Domain> constructBookDomain(Manager &mgr) Rooted<StructuredClass> section{ new StructuredClass(mgr, "section", domain, any)}; book_field->getChildren().push_back(section); + domain->getStructureClasses().push_back(section); // And the field of it. Rooted<FieldDescriptor> section_field{new FieldDescriptor(mgr, section)}; section->getFieldDescriptors().push_back(section_field); @@ -79,6 +80,7 @@ static Rooted<Domain> constructBookDomain(Manager &mgr) mgr, "paragraph", domain, any, {nullptr}, {nullptr}, true)}; section_field->getChildren().push_back(paragraph); book_field->getChildren().push_back(paragraph); + domain->getStructureClasses().push_back(paragraph); // ... and has a primitive field. Rooted<FieldDescriptor> paragraph_field{new FieldDescriptor( mgr, paragraph, domain->getTypesystems()[0]->getTypes()[1], "text", |