diff options
| author | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-02-11 17:54:48 +0100 |
|---|---|---|
| committer | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-02-11 17:54:48 +0100 |
| commit | 2f75ac166594b6bc2ea30901669304eca23174ec (patch) | |
| tree | 0995fdfd968a6dfdae2ca93e83b76a2686a02abc /src/plugins | |
| parent | 76df276a0c30013c8d7fa98bedc6b0fbadb56699 (diff) | |
changed semantics of default field, now referring to the only TREE field.
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/html/DemoOutput.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/xml/XmlParser.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/html/DemoOutput.cpp b/src/plugins/html/DemoOutput.cpp index d041c1d..cb34cbe 100644 --- a/src/plugins/html/DemoOutput.cpp +++ b/src/plugins/html/DemoOutput.cpp @@ -324,7 +324,7 @@ Rooted<xml::Element> DemoHTMLTransformer::transformParagraph( if (childDescriptorName == "text") { Handle<DocumentPrimitive> primitive = t->getField()[0].cast<DocumentPrimitive>(); - if (primitive.isNull()) { + if (primitive == nullptr) { throw OusiaException("Text field is not primitive!"); } current->addChild(new xml::Text( diff --git a/src/plugins/xml/XmlParser.cpp b/src/plugins/xml/XmlParser.cpp index 22498f4..d7efa4d 100644 --- a/src/plugins/xml/XmlParser.cpp +++ b/src/plugins/xml/XmlParser.cpp @@ -603,7 +603,7 @@ public: [](Handle<Node> field, Handle<Node> parent, Logger &logger) { if (field != nullptr) { parent.cast<StructuredClass>()->addFieldDescriptor( - field.cast<FieldDescriptor>()); + field.cast<FieldDescriptor>(), logger); } }); } @@ -969,7 +969,7 @@ static const ParserState DomainField = .parents({&DomainStruct, &DomainAnnotation}) .createdNodeType(&RttiTypes::FieldDescriptor) .elementHandler(DomainFieldHandler::create) - .arguments({Argument::String("name", DEFAULT_FIELD_NAME), + .arguments({Argument::String("name", ""), Argument::Bool("isSubtree", false), Argument::Bool("optional", false)}); @@ -985,7 +985,7 @@ static const ParserState DomainStructPrimitive = .parents({&DomainStruct, &DomainAnnotation}) .createdNodeType(&RttiTypes::FieldDescriptor) .elementHandler(DomainPrimitiveHandler::create) - .arguments({Argument::String("name", DEFAULT_FIELD_NAME), + .arguments({Argument::String("name", ""), Argument::Bool("isSubtree", false), Argument::Bool("optional", false), Argument::String("type")}); @@ -1008,7 +1008,7 @@ static const ParserState DomainStructParentField = .parent(&DomainStructParent) .createdNodeType(&RttiTypes::FieldDescriptor) .elementHandler(DomainParentFieldHandler::create) - .arguments({Argument::String("name", DEFAULT_FIELD_NAME), + .arguments({Argument::String("name", ""), Argument::Bool("isSubtree", false), Argument::Bool("optional", false)}); |