diff options
| author | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-02-10 19:28:45 +0100 |
|---|---|---|
| committer | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-02-10 19:28:45 +0100 |
| commit | 76ab539306d98dfedb759731f6ea3808d3f5f9c0 (patch) | |
| tree | a2672e12f42fbe14bb0551c7a2c6535ad183ac4b /src | |
| parent | c1776468bc3daab431d0e2b51589dd12df595227 (diff) | |
consistent nomenclature for reference concepts.
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/xml/XmlParser.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/xml/XmlParser.cpp b/src/plugins/xml/XmlParser.cpp index c46d9de..e8e97e2 100644 --- a/src/plugins/xml/XmlParser.cpp +++ b/src/plugins/xml/XmlParser.cpp @@ -597,7 +597,7 @@ public: { Rooted<Descriptor> parent = scope().selectOrThrow<Descriptor>(); - const std::string &name = args["name"].asString(); + const std::string &name = args["ref"].asString(); scope().resolve<FieldDescriptor>( name, parent, logger(), [](Handle<Node> field, Handle<Node> parent, Logger &logger) { @@ -700,7 +700,7 @@ public: scope().selectOrThrow<StructuredClass>(); Rooted<DomainParent> parent{new DomainParent( - strct->getManager(), args["name"].asString(), strct)}; + strct->getManager(), args["ref"].asString(), strct)}; parent->setLocation(location()); scope().push(parent); } @@ -765,7 +765,7 @@ public: Rooted<DomainParent> parentNameNode = scope().selectOrThrow<DomainParent>(); - const std::string &name = args["name"].asString(); + const std::string &name = args["ref"].asString(); Rooted<StructuredClass> strct = parentNameNode->getParent().cast<StructuredClass>(); auto loc = location(); @@ -970,7 +970,7 @@ static const ParserState DomainFieldRef = .parents({&DomainStruct, &DomainAnnotation}) .createdNodeType(&RttiTypes::FieldDescriptor) .elementHandler(DomainFieldRefHandler::create) - .arguments({Argument::String("name", DEFAULT_FIELD_NAME)}); + .arguments({Argument::String("ref", DEFAULT_FIELD_NAME)}); static const ParserState DomainStructPrimitive = ParserStateBuilder() @@ -992,7 +992,7 @@ static const ParserState DomainStructParent = .parent(&DomainStruct) .createdNodeType(&RttiTypes::DomainParent) .elementHandler(DomainParentHandler::create) - .arguments({Argument::String("name")}); + .arguments({Argument::String("ref")}); static const ParserState DomainStructParentField = ParserStateBuilder() @@ -1008,7 +1008,7 @@ static const ParserState DomainStructParentFieldRef = .parent(&DomainStructParent) .createdNodeType(&RttiTypes::FieldDescriptor) .elementHandler(DomainParentFieldRefHandler::create) - .arguments({Argument::String("name", DEFAULT_FIELD_NAME)}); + .arguments({Argument::String("ref", DEFAULT_FIELD_NAME)}); /* Typesystem states */ static const ParserState Typesystem = @@ -1079,8 +1079,8 @@ static const std::multimap<std::string, const ParserState *> XmlStates{ {"field", &DomainField}, {"fieldRef", &DomainFieldRef}, {"primitive", &DomainStructPrimitive}, - {"child", &DomainStructChild}, - {"parent", &DomainStructParent}, + {"childRef", &DomainStructChild}, + {"parentRef", &DomainStructParent}, {"field", &DomainStructParentField}, {"fieldRef", &DomainStructParentFieldRef}, {"typesystem", &Typesystem}, |