From c155e6925211747af9a13a5994c2f768c5048971 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 1 Dec 2009 14:06:39 +0200 Subject: Cosmetic changes --- xsd/cxx/parser/attribute-validation-source.cxx | 18 ++-- xsd/cxx/parser/characters-validation-source.cxx | 3 +- xsd/cxx/parser/driver-source.cxx | 8 +- xsd/cxx/parser/element-validation-source.cxx | 19 ++-- xsd/cxx/parser/elements.hxx | 12 +-- xsd/cxx/parser/impl-header.cxx | 13 ++- xsd/cxx/parser/impl-source.cxx | 13 ++- xsd/cxx/parser/name-processor.cxx | 115 ++++++++++++------------ xsd/cxx/parser/parser-forward.cxx | 11 +-- xsd/cxx/parser/parser-header.cxx | 29 +++--- xsd/cxx/parser/parser-inline.cxx | 19 ++-- xsd/cxx/parser/parser-source.cxx | 25 ++---- xsd/cxx/parser/validator.cxx | 25 +++--- 13 files changed, 136 insertions(+), 174 deletions(-) (limited to 'xsd/cxx/parser') diff --git a/xsd/cxx/parser/attribute-validation-source.cxx b/xsd/cxx/parser/attribute-validation-source.cxx index 52c51b1..b8a3fec 100644 --- a/xsd/cxx/parser/attribute-validation-source.cxx +++ b/xsd/cxx/parser/attribute-validation-source.cxx @@ -16,7 +16,7 @@ namespace CXX { struct Test: Traversal::Attribute, Traversal::AnyAttribute, - protected virtual Context + Context { Test (Context& c) : Context (c) @@ -86,8 +86,7 @@ namespace CXX // // - struct PhaseOne : Traversal::Attribute, - protected virtual Context + struct PhaseOne: Traversal::Attribute, Context { PhaseOne (Context& c) : Context (c), test_ (c) @@ -143,8 +142,7 @@ namespace CXX // // - struct PhaseTwo : Traversal::AnyAttribute, - protected virtual Context + struct PhaseTwo: Traversal::AnyAttribute, Context { PhaseTwo (Context& c) : Context (c), test_ (c) @@ -172,8 +170,7 @@ namespace CXX // // - struct AttributeStateInit: Traversal::Attribute, - protected virtual Context + struct AttributeStateInit: Traversal::Attribute, Context { AttributeStateInit (Context& c) : Context (c) @@ -191,8 +188,7 @@ namespace CXX // // - struct AttributeStateCheck: Traversal::Attribute, - protected virtual Context + struct AttributeStateCheck: Traversal::Attribute, Context { AttributeStateCheck (Context& c) : Context (c) @@ -215,8 +211,7 @@ namespace CXX // // - struct Complex : Traversal::Complex, - protected virtual Context + struct Complex: Traversal::Complex, Context { Complex (Context& c) : Context (c), @@ -407,4 +402,3 @@ namespace CXX } } } - diff --git a/xsd/cxx/parser/characters-validation-source.cxx b/xsd/cxx/parser/characters-validation-source.cxx index ec698f8..ee53e25 100644 --- a/xsd/cxx/parser/characters-validation-source.cxx +++ b/xsd/cxx/parser/characters-validation-source.cxx @@ -16,8 +16,7 @@ namespace CXX { // // - struct Complex : Traversal::Complex, - protected virtual Context + struct Complex: Traversal::Complex, Context { Complex (Context& c) : Context (c) diff --git a/xsd/cxx/parser/driver-source.cxx b/xsd/cxx/parser/driver-source.cxx index 91c4cca..af1fe24 100644 --- a/xsd/cxx/parser/driver-source.cxx +++ b/xsd/cxx/parser/driver-source.cxx @@ -504,10 +504,10 @@ namespace CXX Traversal::Belongs belongs_; }; - struct ArgList : Traversal::Complex, - Traversal::List, - Traversal::Member, - Context + struct ArgList: Traversal::Complex, + Traversal::List, + Traversal::Member, + Context { ArgList (Context& c, TypeInstanceMap& map) : Context (c), map_ (map), first_ (true) diff --git a/xsd/cxx/parser/element-validation-source.cxx b/xsd/cxx/parser/element-validation-source.cxx index 949f491..7967c31 100644 --- a/xsd/cxx/parser/element-validation-source.cxx +++ b/xsd/cxx/parser/element-validation-source.cxx @@ -24,7 +24,7 @@ namespace CXX struct ParticleTest: Traversal::Compositor, Traversal::Element, Traversal::Any, - protected virtual Context + Context { ParticleTest (Context& c) : Context (c) @@ -143,7 +143,7 @@ namespace CXX struct ParticleName: Traversal::Compositor, Traversal::Element, Traversal::Any, - protected virtual Context + Context { ParticleName (Context& c) : Context (c) @@ -176,7 +176,7 @@ namespace CXX // Common base for the ParticleIn{All, Choice, Sequence} treversers. // - struct ParticleInCompositor: protected Context + struct ParticleInCompositor: Context { protected: ParticleInCompositor (Context& c, SemanticGraph::Complex& type) @@ -828,7 +828,7 @@ namespace CXX struct ParticleFunction: Traversal::All, Traversal::Choice, Traversal::Sequence, - protected virtual Context + Context { ParticleFunction (Context& c, SemanticGraph::Complex& type) : Context (c), type_ (type) @@ -1012,7 +1012,7 @@ namespace CXX // struct CompositorPre: Traversal::All, Traversal::Compositor, - protected virtual Context + Context { CompositorPre (Context& c, SemanticGraph::Complex& type) : Context (c), type_ (type) @@ -1052,7 +1052,7 @@ namespace CXX // struct CompositorStartElement: Traversal::All, Traversal::Compositor, - protected virtual Context + Context { CompositorStartElement (Context& c, SemanticGraph::Complex& type) : Context (c), type_ (type), @@ -1228,7 +1228,7 @@ namespace CXX // struct CompositorEndElement: Traversal::All, Traversal::Compositor, - protected virtual Context + Context { CompositorEndElement (Context& c, SemanticGraph::Complex& type) : Context (c), type_ (type) @@ -1263,7 +1263,7 @@ namespace CXX // struct CompositorPost: Traversal::All, Traversal::Compositor, - protected virtual Context + Context { CompositorPost (Context& c, SemanticGraph::Complex& type) : Context (c), type_ (type), particle_name_ (c) @@ -1350,8 +1350,7 @@ namespace CXX // // - struct Complex : Traversal::Complex, - protected virtual Context + struct Complex: Traversal::Complex, Context { Complex (Context& c) : Context (c) diff --git a/xsd/cxx/parser/elements.hxx b/xsd/cxx/parser/elements.hxx index cac1786..90ff84e 100644 --- a/xsd/cxx/parser/elements.hxx +++ b/xsd/cxx/parser/elements.hxx @@ -149,10 +149,10 @@ namespace CXX // // - struct ParserParamDecl : Traversal::Complex, - Traversal::List, - Traversal::Member, - protected virtual Context + struct ParserParamDecl: Traversal::Complex, + Traversal::List, + Traversal::Member, + Context { ParserParamDecl (Context& c, Boolean name_arg) : Context (c), first_ (true), name_arg_ (name_arg) @@ -229,8 +229,8 @@ namespace CXX Char const* name_key_; }; - struct Includes : Traversal::Imports, - Traversal::Includes + struct Includes: Traversal::Imports, + Traversal::Includes { enum Type { diff --git a/xsd/cxx/parser/impl-header.cxx b/xsd/cxx/parser/impl-header.cxx index 8a52254..102331e 100644 --- a/xsd/cxx/parser/impl-header.cxx +++ b/xsd/cxx/parser/impl-header.cxx @@ -14,8 +14,7 @@ namespace CXX { namespace { - struct Enumeration: Traversal::Enumeration, - protected virtual Context + struct Enumeration: Traversal::Enumeration, Context { Enumeration (Context& c) : Context (c) @@ -45,7 +44,7 @@ namespace CXX // // - struct List: Traversal::List, protected virtual Context + struct List: Traversal::List, Context { List (Context& c) : Context (c) @@ -92,7 +91,7 @@ namespace CXX } }; - struct Union: Traversal::Union, protected virtual Context + struct Union: Traversal::Union, Context { Union (Context& c) : Context (c) @@ -124,8 +123,7 @@ namespace CXX // // - struct ParserCallback: Traversal::Member, - protected virtual Context + struct ParserCallback: Traversal::Member, Context { ParserCallback (Context& c) : Context (c) @@ -154,8 +152,7 @@ namespace CXX // // - struct Complex : Traversal::Complex, - protected virtual Context + struct Complex: Traversal::Complex, Context { Complex (Context& c) : Context (c), diff --git a/xsd/cxx/parser/impl-source.cxx b/xsd/cxx/parser/impl-source.cxx index 00b9456..6447fa0 100644 --- a/xsd/cxx/parser/impl-source.cxx +++ b/xsd/cxx/parser/impl-source.cxx @@ -15,8 +15,7 @@ namespace CXX { namespace { - struct Enumeration: Traversal::Enumeration, - protected virtual Context + struct Enumeration: Traversal::Enumeration, Context { Enumeration (Context& c) : Context (c) @@ -85,7 +84,7 @@ namespace CXX // // - struct List: Traversal::List, protected virtual Context + struct List: Traversal::List, Context { List (Context& c) : Context (c) @@ -158,7 +157,7 @@ namespace CXX // // - struct Union: Traversal::Union, protected virtual Context + struct Union: Traversal::Union, Context { Union (Context& c) : Context (c) @@ -215,8 +214,7 @@ namespace CXX // // - struct ParserCallback: Traversal::Member, - protected virtual Context + struct ParserCallback: Traversal::Member, Context { ParserCallback (Context& c) : Context (c) @@ -262,8 +260,7 @@ namespace CXX // // - struct Complex : Traversal::Complex, - protected virtual Context + struct Complex: Traversal::Complex, Context { Complex (Context& c) : Context (c), parser_callback_ (c) diff --git a/xsd/cxx/parser/name-processor.cxx b/xsd/cxx/parser/name-processor.cxx index b40522b..e9ba876 100644 --- a/xsd/cxx/parser/name-processor.cxx +++ b/xsd/cxx/parser/name-processor.cxx @@ -574,64 +574,63 @@ namespace CXX }; - struct FundType : Traversal::AnyType, - Traversal::AnySimpleType, - - Traversal::Fundamental::Byte, - Traversal::Fundamental::UnsignedByte, - Traversal::Fundamental::Short, - Traversal::Fundamental::UnsignedShort, - Traversal::Fundamental::Int, - Traversal::Fundamental::UnsignedInt, - Traversal::Fundamental::Long, - Traversal::Fundamental::UnsignedLong, - Traversal::Fundamental::Integer, - Traversal::Fundamental::NonPositiveInteger, - Traversal::Fundamental::NonNegativeInteger, - Traversal::Fundamental::PositiveInteger, - Traversal::Fundamental::NegativeInteger, - - Traversal::Fundamental::Boolean, - - Traversal::Fundamental::Float, - Traversal::Fundamental::Double, - Traversal::Fundamental::Decimal, - - Traversal::Fundamental::String, - Traversal::Fundamental::NormalizedString, - Traversal::Fundamental::Token, - Traversal::Fundamental::Name, - Traversal::Fundamental::NameToken, - Traversal::Fundamental::NameTokens, - Traversal::Fundamental::NCName, - Traversal::Fundamental::Language, - - Traversal::Fundamental::QName, - - Traversal::Fundamental::Id, - Traversal::Fundamental::IdRef, - Traversal::Fundamental::IdRefs, - - Traversal::Fundamental::AnyURI, - - Traversal::Fundamental::Base64Binary, - Traversal::Fundamental::HexBinary, - - Traversal::Fundamental::Date, - Traversal::Fundamental::DateTime, - Traversal::Fundamental::Duration, - Traversal::Fundamental::Day, - Traversal::Fundamental::Month, - Traversal::Fundamental::MonthDay, - Traversal::Fundamental::Year, - Traversal::Fundamental::YearMonth, - Traversal::Fundamental::Time, - - Traversal::Fundamental::Entity, - Traversal::Fundamental::Entities, - - Context - + struct FundType: Traversal::AnyType, + Traversal::AnySimpleType, + + Traversal::Fundamental::Byte, + Traversal::Fundamental::UnsignedByte, + Traversal::Fundamental::Short, + Traversal::Fundamental::UnsignedShort, + Traversal::Fundamental::Int, + Traversal::Fundamental::UnsignedInt, + Traversal::Fundamental::Long, + Traversal::Fundamental::UnsignedLong, + Traversal::Fundamental::Integer, + Traversal::Fundamental::NonPositiveInteger, + Traversal::Fundamental::NonNegativeInteger, + Traversal::Fundamental::PositiveInteger, + Traversal::Fundamental::NegativeInteger, + + Traversal::Fundamental::Boolean, + + Traversal::Fundamental::Float, + Traversal::Fundamental::Double, + Traversal::Fundamental::Decimal, + + Traversal::Fundamental::String, + Traversal::Fundamental::NormalizedString, + Traversal::Fundamental::Token, + Traversal::Fundamental::Name, + Traversal::Fundamental::NameToken, + Traversal::Fundamental::NameTokens, + Traversal::Fundamental::NCName, + Traversal::Fundamental::Language, + + Traversal::Fundamental::QName, + + Traversal::Fundamental::Id, + Traversal::Fundamental::IdRef, + Traversal::Fundamental::IdRefs, + + Traversal::Fundamental::AnyURI, + + Traversal::Fundamental::Base64Binary, + Traversal::Fundamental::HexBinary, + + Traversal::Fundamental::Date, + Traversal::Fundamental::DateTime, + Traversal::Fundamental::Duration, + Traversal::Fundamental::Day, + Traversal::Fundamental::Month, + Traversal::Fundamental::MonthDay, + Traversal::Fundamental::Year, + Traversal::Fundamental::YearMonth, + Traversal::Fundamental::Time, + + Traversal::Fundamental::Entity, + Traversal::Fundamental::Entities, + + Context { FundType (Context& c) : Context (c) diff --git a/xsd/cxx/parser/parser-forward.cxx b/xsd/cxx/parser/parser-forward.cxx index 4d97e23..7152d41 100644 --- a/xsd/cxx/parser/parser-forward.cxx +++ b/xsd/cxx/parser/parser-forward.cxx @@ -14,8 +14,7 @@ namespace CXX { namespace { - struct Enumeration: Traversal::Enumeration, - protected virtual Context + struct Enumeration: Traversal::Enumeration, Context { Enumeration (Context& c) : Context (c) @@ -31,7 +30,7 @@ namespace CXX // // - struct List: Traversal::List, protected virtual Context + struct List: Traversal::List, Context { List (Context& c) : Context (c) @@ -47,7 +46,7 @@ namespace CXX // // - struct Union: Traversal::Union, protected virtual Context + struct Union: Traversal::Union, Context { Union (Context& c) : Context (c) @@ -63,8 +62,7 @@ namespace CXX // // - struct Complex : Traversal::Complex, - protected virtual Context + struct Complex: Traversal::Complex, Context { Complex (Context& c) : Context (c) @@ -112,4 +110,3 @@ namespace CXX } } } - diff --git a/xsd/cxx/parser/parser-header.cxx b/xsd/cxx/parser/parser-header.cxx index f8ca090..878a891 100644 --- a/xsd/cxx/parser/parser-header.cxx +++ b/xsd/cxx/parser/parser-header.cxx @@ -14,8 +14,7 @@ namespace CXX { namespace { - struct Enumeration: Traversal::Enumeration, - protected virtual Context + struct Enumeration: Traversal::Enumeration, Context { Enumeration (Context& c) : Context (c) @@ -65,7 +64,7 @@ namespace CXX // // - struct List: Traversal::List, protected virtual Context + struct List: Traversal::List, Context { List (Context& c) : Context (c) @@ -167,7 +166,7 @@ namespace CXX } }; - struct Union: Traversal::Union, protected virtual Context + struct Union: Traversal::Union, Context { Union (Context& c) : Context (c) @@ -216,8 +215,7 @@ namespace CXX // // - struct ParserCallback: Traversal::Member, - protected virtual Context + struct ParserCallback: Traversal::Member, Context { ParserCallback (Context& c) : Context (c) @@ -246,8 +244,7 @@ namespace CXX // // - struct ParserModifier: Traversal::Member, - protected virtual Context + struct ParserModifier: Traversal::Member, Context { ParserModifier (Context& c) : Context (c) @@ -277,8 +274,7 @@ namespace CXX // // - struct ParserMember: Traversal::Member, - protected virtual Context + struct ParserMember: Traversal::Member, Context { ParserMember (Context& c) : Context (c) @@ -311,7 +307,7 @@ namespace CXX struct Particle: Traversal::All, Traversal::Choice, Traversal::Sequence, - protected virtual Context + Context { Particle (Context& c) : Context (c) @@ -389,8 +385,7 @@ namespace CXX // // - struct AttributeValidationState: Traversal::Attribute, - protected virtual Context + struct AttributeValidationState: Traversal::Attribute, Context { AttributeValidationState (Context& c) : Context (c) @@ -409,8 +404,7 @@ namespace CXX // // - struct Complex : Traversal::Complex, - protected virtual Context + struct Complex: Traversal::Complex, Context { Complex (Context& c) : Context (c), @@ -1130,11 +1124,10 @@ namespace CXX Boolean nmtoken_; }; - struct FundNamespace : Namespace, - protected virtual Context + struct FundNamespace: Namespace, Context { FundNamespace (Context& c) - : Context (c), Namespace (c) + : Namespace (c), Context (c) { } diff --git a/xsd/cxx/parser/parser-inline.cxx b/xsd/cxx/parser/parser-inline.cxx index f2d3bd8..432d045 100644 --- a/xsd/cxx/parser/parser-inline.cxx +++ b/xsd/cxx/parser/parser-inline.cxx @@ -16,7 +16,7 @@ namespace CXX { // // - struct List: Traversal::List, protected virtual Context + struct List: Traversal::List, Context { List (Context& c) : Context (c) @@ -68,8 +68,7 @@ namespace CXX // // - struct ParserModifier: Traversal::Member, - protected virtual Context + struct ParserModifier: Traversal::Member, Context { ParserModifier (Context& c) : Context (c) @@ -111,8 +110,7 @@ namespace CXX // // - struct ParserMemberSet: Traversal::Member, - protected virtual Context + struct ParserMemberSet: Traversal::Member, Context { ParserMemberSet (Context& c) : Context (c) @@ -133,8 +131,7 @@ namespace CXX // // - struct ParserMemberInit: Traversal::Member, - protected virtual Context + struct ParserMemberInit: Traversal::Member, Context { ParserMemberInit (Context& c) : Context (c), first_ (true) @@ -174,7 +171,7 @@ namespace CXX struct ParserBaseSet: Traversal::Complex, Traversal::List, - protected virtual Context + Context { ParserBaseSet (Context& c) : Context (c), member_ (c) @@ -208,8 +205,7 @@ namespace CXX Traversal::Names names_; }; - struct Particle: Traversal::All, - protected virtual Context + struct Particle: Traversal::All, Context { Particle (Context& c) : Context (c) @@ -232,8 +228,7 @@ namespace CXX // // - struct Complex: Traversal::Complex, - protected virtual Context + struct Complex: Traversal::Complex, Context { Complex (Context& c) : Context (c), diff --git a/xsd/cxx/parser/parser-source.cxx b/xsd/cxx/parser/parser-source.cxx index be6c8df..20e447a 100644 --- a/xsd/cxx/parser/parser-source.cxx +++ b/xsd/cxx/parser/parser-source.cxx @@ -14,8 +14,7 @@ namespace CXX { namespace { - struct Enumeration: Traversal::Enumeration, - protected virtual Context + struct Enumeration: Traversal::Enumeration, Context { Enumeration (Context& c) : Context (c) @@ -120,7 +119,7 @@ namespace CXX // // - struct List: Traversal::List, protected virtual Context + struct List: Traversal::List, Context { List (Context& c) : Context (c) @@ -216,7 +215,7 @@ namespace CXX // // - struct Union: Traversal::Union, protected virtual Context + struct Union: Traversal::Union, Context { Union (Context& c) : Context (c) @@ -271,8 +270,7 @@ namespace CXX // // - struct StartElement : Traversal::Element, - protected virtual Context + struct StartElement: Traversal::Element, Context { StartElement (Context& c) : Context (c) @@ -371,8 +369,7 @@ namespace CXX // // - struct EndElement : Traversal::Element, - protected virtual Context + struct EndElement: Traversal::Element, Context { EndElement (Context& c) : Context (c) @@ -445,8 +442,7 @@ namespace CXX // // - struct Attribute : Traversal::Attribute, - protected virtual Context + struct Attribute: Traversal::Attribute, Context { Attribute (Context& c) : Context (c) @@ -497,8 +493,7 @@ namespace CXX // // - struct ParserCallback: Traversal::Member, - protected virtual Context + struct ParserCallback: Traversal::Member, Context { ParserCallback (Context& c) : Context (c) @@ -528,8 +523,7 @@ namespace CXX // // - struct Complex : Traversal::Complex, - protected virtual Context + struct Complex: Traversal::Complex, Context { Complex (Context& c) : Context (c), @@ -781,8 +775,7 @@ namespace CXX // Generate substitution group map entries. // - struct GlobalElement: Traversal::Element, - protected virtual Context + struct GlobalElement: Traversal::Element, Context { GlobalElement (Context& c) : Context (c) diff --git a/xsd/cxx/parser/validator.cxx b/xsd/cxx/parser/validator.cxx index 8d6b968..526c941 100644 --- a/xsd/cxx/parser/validator.cxx +++ b/xsd/cxx/parser/validator.cxx @@ -81,15 +81,14 @@ namespace CXX // // - struct Any : Traversal::Any, protected virtual ValidationContext + struct Any: Traversal::Any, ValidationContext { Any (ValidationContext& c) : ValidationContext (c) { } - struct Element: Traversal::Element, - protected virtual ValidationContext + struct Element: Traversal::Element, ValidationContext { Element (ValidationContext& c, SemanticGraph::Any& any) : ValidationContext (c), @@ -250,11 +249,11 @@ namespace CXX // // - struct Traverser : Traversal::Schema, - Traversal::Complex, - Traversal::Type, - Traversal::Element, - protected virtual ValidationContext + struct Traverser: Traversal::Schema, + Traversal::Complex, + Traversal::Type, + Traversal::Element, + ValidationContext { Traverser (ValidationContext& c) : ValidationContext (c), @@ -390,11 +389,11 @@ namespace CXX }; - struct AnonymousType : Traversal::Schema, - Traversal::Complex, - Traversal::Element, - Traversal::Attribute, - protected virtual ValidationContext + struct AnonymousType: Traversal::Schema, + Traversal::Complex, + Traversal::Element, + Traversal::Attribute, + ValidationContext { AnonymousType (ValidationContext& c) : ValidationContext (c), -- cgit v1.1