From 78f24b65e4a84c528338cc52e71efa4aa58e656e Mon Sep 17 00:00:00 2001 From: Andreas Stöckel Date: Tue, 3 Mar 2015 15:17:51 +0100 Subject: Renamed isSubtree to subtree and isRoot to root --- src/core/model/Ontology.cpp | 12 +++++----- src/core/model/Syntax.cpp | 4 ++-- src/core/parser/stack/OntologyHandler.cpp | 38 +++++++++++++++---------------- 3 files changed, 27 insertions(+), 27 deletions(-) (limited to 'src') diff --git a/src/core/model/Ontology.cpp b/src/core/model/Ontology.cpp index 3af727d..f52f8ca 100644 --- a/src/core/model/Ontology.cpp +++ b/src/core/model/Ontology.cpp @@ -232,7 +232,7 @@ static NodeVector collect(const Node *start, F match) } static std::vector collectPermittedTokens( - const Node *start, Handle domain) + const Node *start, Handle ontology) { // gather SyntaxDescriptors for structure children first. std::vector res; @@ -250,7 +250,7 @@ static std::vector collectPermittedTokens( return false; }); // gather SyntaxDescriptors for AnnotationClasses. - for (auto a : domain->getAnnotationClasses()) { + for (auto a : ontology->getAnnotationClasses()) { SyntaxDescriptor stx = a->getSyntaxDescriptor(); if (!stx.isEmpty()) { res.push_back(stx); @@ -462,7 +462,7 @@ std::vector FieldDescriptor::getPermittedTokens() const return std::vector(); } return collectPermittedTokens( - this, getParent().cast()->getParent().cast()); + this, getParent().cast()->getParent().cast()); } /* Class Descriptor */ @@ -762,7 +762,7 @@ std::vector Descriptor::getPermittedTokens() const if (getParent() == nullptr) { return std::vector(); } - return collectPermittedTokens(this, getParent().cast()); + return collectPermittedTokens(this, getParent().cast()); } /* Class StructuredClass */ @@ -1092,7 +1092,7 @@ static void gatherTokenDescriptors( } } -std::vector Domain::getAllTokenDescriptors() const +std::vector Ontology::getAllTokenDescriptors() const { std::vector res; // note all fields that are already visited because FieldReferences might @@ -1129,4 +1129,4 @@ const Rtti Ontology = RttiBuilder("Ontology") .parent(&RootNode) .composedOf({&StructuredClass, &AnnotationClass}); } -} \ No newline at end of file +} diff --git a/src/core/model/Syntax.cpp b/src/core/model/Syntax.cpp index 9dbaccc..bd17bff 100644 --- a/src/core/model/Syntax.cpp +++ b/src/core/model/Syntax.cpp @@ -18,7 +18,7 @@ #include "Syntax.hpp" -#include "Domain.hpp" +#include "Ontology.hpp" namespace ousia { @@ -55,4 +55,4 @@ bool SyntaxDescriptor::isEmpty() const return start == Tokens::Empty && end == Tokens::Empty && shortForm == Tokens::Empty; } -} \ No newline at end of file +} diff --git a/src/core/parser/stack/OntologyHandler.cpp b/src/core/parser/stack/OntologyHandler.cpp index 3b3b386..4474589 100644 --- a/src/core/parser/stack/OntologyHandler.cpp +++ b/src/core/parser/stack/OntologyHandler.cpp @@ -33,7 +33,7 @@ namespace parser_stack { /* OntologyHandler */ -bool DomainHandler::startCommand(Variant::mapType &args) +bool OntologyHandler::startCommand(Variant::mapType &args) { // Create the Ontology node Rooted ontology = @@ -57,7 +57,7 @@ void OntologyHandler::end() { scope().pop(logger()); } /* OntologyStructHandler */ -bool OntologyStructHandler::start(Variant::mapType &args) +bool OntologyStructHandler::startCommand(Variant::mapType &args) { scope().setFlag(ParserFlag::POST_HEAD, true); @@ -65,7 +65,7 @@ bool OntologyStructHandler::start(Variant::mapType &args) Rooted structuredClass = ontology->createStructuredClass( args["name"].asString(), args["cardinality"].asCardinality(), nullptr, - args["transparent"].asBool(), args["isRoot"].asBool()); + args["transparent"].asBool(), args["root"].asBool()); structuredClass->setLocation(location()); const std::string &isa = args["isa"].asString(); @@ -88,7 +88,7 @@ bool OntologyStructHandler::start(Variant::mapType &args) void OntologyStructHandler::end() { scope().pop(logger()); } /* OntologyAnnotationHandler */ -bool OntologyAnnotationHandler::start(Variant::mapType &args) +bool OntologyAnnotationHandler::startCommand(Variant::mapType &args) { scope().setFlag(ParserFlag::POST_HEAD, true); @@ -106,7 +106,7 @@ void OntologyAnnotationHandler::end() { scope().pop(logger()); } /* OntologyAttributesHandler */ -bool OntologyAttributesHandler::start(Variant::mapType &args) +bool OntologyAttributesHandler::startCommand(Variant::mapType &args) { // Fetch the current typesystem and create the struct node Rooted parent = scope().selectOrThrow(); @@ -122,10 +122,10 @@ void OntologyAttributesHandler::end() { scope().pop(logger()); } /* OntologyFieldHandler */ -bool OntologyFieldHandler::start(Variant::mapType &args) +bool OntologyFieldHandler::startCommand(Variant::mapType &args) { FieldDescriptor::FieldType type; - if (args["isSubtree"].asBool()) { + if (args["subtree"].asBool()) { type = FieldDescriptor::FieldType::SUBTREE; } else { type = FieldDescriptor::FieldType::TREE; @@ -152,7 +152,7 @@ void OntologyFieldHandler::end() { scope().pop(logger()); } /* OntologyFieldRefHandler */ -bool OntologyFieldRefHandler::start(Variant::mapType &args) +bool OntologyFieldRefHandler::startCommand(Variant::mapType &args) { Rooted parent = scope().selectOrThrow(); @@ -182,12 +182,12 @@ void OntologyFieldRefHandler::end() {} /* OntologyPrimitiveHandler */ -bool OntologyPrimitiveHandler::start(Variant::mapType &args) +bool OntologyPrimitiveHandler::startCommand(Variant::mapType &args) { Rooted parent = scope().selectOrThrow(); FieldDescriptor::FieldType fieldType; - if (args["isSubtree"].asBool()) { + if (args["subtree"].asBool()) { fieldType = FieldDescriptor::FieldType::SUBTREE; } else { fieldType = FieldDescriptor::FieldType::TREE; @@ -222,7 +222,7 @@ void OntologyPrimitiveHandler::end() { scope().pop(logger()); } /* OntologyChildHandler */ -bool OntologyChildHandler::start(Variant::mapType &args) +bool OntologyChildHandler::startCommand(Variant::mapType &args) { Rooted field = scope().selectOrThrow(); @@ -240,7 +240,7 @@ bool OntologyChildHandler::start(Variant::mapType &args) /* OntologyParentHandler */ -bool OntologyParentHandler::start(Variant::mapType &args) +bool OntologyParentHandler::startCommand(Variant::mapType &args) { Rooted strct = scope().selectOrThrow(); @@ -255,11 +255,11 @@ void OntologyParentHandler::end() { scope().pop(logger()); } /* OntologyParentFieldHandler */ -bool OntologyParentFieldHandler::start(Variant::mapType &args) +bool OntologyParentFieldHandler::startCommand(Variant::mapType &args) { Rooted parentNameNode = scope().selectOrThrow(); FieldDescriptor::FieldType type; - if (args["isSubtree"].asBool()) { + if (args["subtree"].asBool()) { type = FieldDescriptor::FieldType::SUBTREE; } else { type = FieldDescriptor::FieldType::TREE; @@ -288,7 +288,7 @@ bool OntologyParentFieldHandler::start(Variant::mapType &args) /* OntologyParentFieldRefHandler */ -bool OntologyParentFieldRefHandler::start(Variant::mapType &args) +bool OntologyParentFieldRefHandler::startCommand(Variant::mapType &args) { Rooted parentNameNode = scope().selectOrThrow(); @@ -330,7 +330,7 @@ const State OntologyStruct = .elementHandler(OntologyStructHandler::create) .arguments({Argument::String("name"), Argument::Cardinality("cardinality", Cardinality::any()), - Argument::Bool("isRoot", false), + Argument::Bool("root", false), Argument::Bool("transparent", false), Argument::String("isa", "")}); @@ -360,7 +360,7 @@ const State OntologyField = StateBuilder() .createdNodeType(&RttiTypes::FieldDescriptor) .elementHandler(OntologyFieldHandler::create) .arguments({Argument::String("name", ""), - Argument::Bool("isSubtree", false), + Argument::Bool("subtree", false), Argument::Bool("optional", false)}); const State OntologyFieldRef = @@ -376,7 +376,7 @@ const State OntologyStructPrimitive = .createdNodeType(&RttiTypes::FieldDescriptor) .elementHandler(OntologyPrimitiveHandler::create) .arguments( - {Argument::String("name", ""), Argument::Bool("isSubtree", false), + {Argument::String("name", ""), Argument::Bool("subtree", false), Argument::Bool("optional", false), Argument::String("type")}); const State OntologyStructChild = StateBuilder() @@ -397,7 +397,7 @@ const State OntologyStructParentField = .createdNodeType(&RttiTypes::FieldDescriptor) .elementHandler(OntologyParentFieldHandler::create) .arguments({Argument::String("name", ""), - Argument::Bool("isSubtree", false), + Argument::Bool("subtree", false), Argument::Bool("optional", false)}); const State OntologyStructParentFieldRef = -- cgit v1.2.3