aboutsummaryrefslogtreecommitdiff
path: root/xsd
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2009-12-01 14:06:39 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2009-12-01 14:06:39 +0200
commitc155e6925211747af9a13a5994c2f768c5048971 (patch)
treecc7639c71d98aa86f1f4c05c2d5bb065a7bcd918 /xsd
parent55ef06dd6198181dfb5b681d4fa366851c9c0fd1 (diff)
Cosmetic changes
Diffstat (limited to 'xsd')
-rw-r--r--xsd/cxx/elements.hxx20
-rw-r--r--xsd/cxx/parser/attribute-validation-source.cxx18
-rw-r--r--xsd/cxx/parser/characters-validation-source.cxx3
-rw-r--r--xsd/cxx/parser/driver-source.cxx8
-rw-r--r--xsd/cxx/parser/element-validation-source.cxx19
-rw-r--r--xsd/cxx/parser/elements.hxx12
-rw-r--r--xsd/cxx/parser/impl-header.cxx13
-rw-r--r--xsd/cxx/parser/impl-source.cxx13
-rw-r--r--xsd/cxx/parser/name-processor.cxx115
-rw-r--r--xsd/cxx/parser/parser-forward.cxx11
-rw-r--r--xsd/cxx/parser/parser-header.cxx29
-rw-r--r--xsd/cxx/parser/parser-inline.cxx19
-rw-r--r--xsd/cxx/parser/parser-source.cxx25
-rw-r--r--xsd/cxx/parser/validator.cxx25
-rw-r--r--xsd/cxx/tree/elements.hxx143
-rw-r--r--xsd/cxx/tree/fundamental-header.hxx6
-rw-r--r--xsd/cxx/tree/name-processor.cxx118
-rw-r--r--xsd/cxx/tree/parser-header.cxx8
-rw-r--r--xsd/cxx/tree/parser-source.cxx4
-rw-r--r--xsd/cxx/tree/serialization-header.cxx16
-rw-r--r--xsd/cxx/tree/serialization-source.cxx35
-rw-r--r--xsd/cxx/tree/stream-extraction-source.cxx21
-rw-r--r--xsd/cxx/tree/stream-header.cxx8
-rw-r--r--xsd/cxx/tree/stream-insertion-header.cxx8
-rw-r--r--xsd/cxx/tree/stream-insertion-source.cxx12
-rw-r--r--xsd/cxx/tree/stream-source.cxx12
-rw-r--r--xsd/cxx/tree/tree-forward.cxx12
-rw-r--r--xsd/cxx/tree/tree-header.cxx30
-rw-r--r--xsd/cxx/tree/tree-inline.cxx23
-rw-r--r--xsd/cxx/tree/tree-source.cxx124
-rw-r--r--xsd/cxx/tree/validator.cxx25
31 files changed, 441 insertions, 494 deletions
diff --git a/xsd/cxx/elements.hxx b/xsd/cxx/elements.hxx
index 8ab2c87..e478234 100644
--- a/xsd/cxx/elements.hxx
+++ b/xsd/cxx/elements.hxx
@@ -397,7 +397,7 @@ namespace CXX
// Usual namespace mapping.
//
- struct Namespace : Traversal::Namespace
+ struct Namespace: Traversal::Namespace
{
struct ScopeTracker
{
@@ -509,15 +509,15 @@ namespace CXX
// Fundamental type mapping helper.
//
- struct Fundamental : Traversal::Fundamental::Type,
- Traversal::Fundamental::String,
- Traversal::Fundamental::NormalizedString,
- Traversal::Fundamental::Token,
- Traversal::Fundamental::Name,
- Traversal::Fundamental::NameToken,
- Traversal::Fundamental::NCName,
- Traversal::Fundamental::Id,
- Traversal::Fundamental::IdRef
+ struct Fundamental: Traversal::Fundamental::Type,
+ Traversal::Fundamental::String,
+ Traversal::Fundamental::NormalizedString,
+ Traversal::Fundamental::Token,
+ Traversal::Fundamental::Name,
+ Traversal::Fundamental::NameToken,
+ Traversal::Fundamental::NCName,
+ Traversal::Fundamental::Id,
+ Traversal::Fundamental::IdRef
{
virtual Void
fundamental_type (SemanticGraph::Fundamental::Type& t) = 0;
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),
diff --git a/xsd/cxx/tree/elements.hxx b/xsd/cxx/tree/elements.hxx
index 3d70aab..602291d 100644
--- a/xsd/cxx/tree/elements.hxx
+++ b/xsd/cxx/tree/elements.hxx
@@ -462,25 +462,25 @@ namespace CXX
// Check whether this Schema type maps to a fundamental C++ type.
//
- struct IsFundamentalType : 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
+ struct IsFundamentalType: 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
{
IsFundamentalType (Boolean& r)
@@ -602,15 +602,15 @@ namespace CXX
// Check whether this is a string-based type.
//
- struct IsStringBasedType : Traversal::Complex,
- Traversal::Union,
- Traversal::Fundamental::String,
- Traversal::Fundamental::NormalizedString,
- Traversal::Fundamental::Token,
- Traversal::Fundamental::Name,
- Traversal::Fundamental::NameToken,
- Traversal::Fundamental::NCName,
- Traversal::Fundamental::Language
+ struct IsStringBasedType: Traversal::Complex,
+ Traversal::Union,
+ Traversal::Fundamental::String,
+ Traversal::Fundamental::NormalizedString,
+ Traversal::Fundamental::Token,
+ Traversal::Fundamental::Name,
+ Traversal::Fundamental::NameToken,
+ Traversal::Fundamental::NCName,
+ Traversal::Fundamental::Language
{
IsStringBasedType (Boolean& r)
: r_ (r)
@@ -684,7 +684,7 @@ namespace CXX
// Check whether this is a enumeration-based type.
//
- struct IsEnumBasedType : Traversal::Complex
+ struct IsEnumBasedType: Traversal::Complex
{
IsEnumBasedType (SemanticGraph::Enumeration*& e)
: enum_ (e)
@@ -729,7 +729,7 @@ namespace CXX
//
//
- struct MemberTypeName : protected Context,
+ struct MemberTypeName : Context,
Traversal::Type,
Traversal::List,
Traversal::Union,
@@ -1307,10 +1307,10 @@ namespace CXX
// Initial value should be true.
//
- struct IsSimpleType : Traversal::Complex,
- Traversal::Member,
- Traversal::Any,
- Traversal::AnyAttribute
+ struct IsSimpleType: Traversal::Complex,
+ Traversal::Member,
+ Traversal::Any,
+ Traversal::AnyAttribute
{
IsSimpleType (Boolean& v)
: v_ (v)
@@ -1361,7 +1361,7 @@ namespace CXX
Traversal::Element,
Traversal::Attribute,
Traversal::Any,
- protected virtual Context
+ Context
{
// generate should initially be false.
//
@@ -1413,7 +1413,7 @@ namespace CXX
Traversal::Element,
Traversal::Attribute,
Traversal::Any,
- protected virtual Context
+ Context
{
Traverser (Context& c, Boolean& generate);
@@ -1445,7 +1445,7 @@ namespace CXX
//
struct HasComplexNonFundNonOptArgs: Traversal::Complex,
Traversal::Element,
- protected virtual Context
+ Context
{
// complex and non_fund should initially be false. clash
// should initially be true.
@@ -1474,10 +1474,10 @@ namespace CXX
// Immediate non-optional member. Note that AnyAttribute is always
// mapped to a sequence.
//
- struct FromBaseCtorArg : Traversal::Any,
- Traversal::Element,
- Traversal::Attribute,
- protected virtual Context
+ struct FromBaseCtorArg: Traversal::Any,
+ Traversal::Element,
+ Traversal::Attribute,
+ Context
{
enum ArgType
{
@@ -1505,13 +1505,13 @@ namespace CXX
// List of all non-optional members and a simple base. Note that
// AnyAttribute is always mapped to a sequence.
//
- struct CtorArgs : Traversal::Complex,
- Traversal::Enumeration,
- Traversal::Type,
- Traversal::Any,
- Traversal::Element,
- Traversal::Attribute,
- protected virtual Context
+ struct CtorArgs: Traversal::Complex,
+ Traversal::Enumeration,
+ Traversal::Type,
+ Traversal::Any,
+ Traversal::Element,
+ Traversal::Attribute,
+ Context
{
enum ArgType
{
@@ -1678,7 +1678,7 @@ namespace CXX
Traversal::Any,
Traversal::Element,
Traversal::Attribute,
- protected virtual Context
+ Context
{
enum ArgType
{
@@ -1801,8 +1801,8 @@ namespace CXX
traverse (SemanticGraph::Type& t);
};
- struct Includes : Traversal::Imports,
- Traversal::Includes
+ struct Includes: Traversal::Imports,
+ Traversal::Includes
{
enum Type
{
@@ -1852,27 +1852,26 @@ namespace CXX
//
//
- struct FundIncludes : 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,
- Context
-
+ struct FundIncludes: 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,
+ Context
{
FundIncludes (Context& c, String const& prefix)
: Context (c), prefix_ (prefix),
diff --git a/xsd/cxx/tree/fundamental-header.hxx b/xsd/cxx/tree/fundamental-header.hxx
index 5ea3596..9782e64 100644
--- a/xsd/cxx/tree/fundamental-header.hxx
+++ b/xsd/cxx/tree/fundamental-header.hxx
@@ -72,11 +72,11 @@ namespace CXX
Traversal::Fundamental::Entity,
Traversal::Fundamental::Entities,
- protected virtual Context
+ Context
{
FundamentalNamespace (Context& c)
- : Context (c),
- DocumentedNamespace (c),
+ : DocumentedNamespace (c),
+ Context (c),
export_ (c.options.value<CLI::export_xml_schema> () && type_exp)
{
*this >> names_ >> *this;
diff --git a/xsd/cxx/tree/name-processor.cxx b/xsd/cxx/tree/name-processor.cxx
index 1adfc38..53027af 100644
--- a/xsd/cxx/tree/name-processor.cxx
+++ b/xsd/cxx/tree/name-processor.cxx
@@ -1457,65 +1457,65 @@ namespace CXX
};
- struct FundamentalNamespace : Traversal::Namespace,
-
- 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::Id,
- Traversal::Fundamental::IdRef,
- Traversal::Fundamental::IdRefs,
-
- Traversal::Fundamental::AnyURI,
-
- Traversal::Fundamental::QName,
-
- 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 FundamentalNamespace: Traversal::Namespace,
+
+ 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::Id,
+ Traversal::Fundamental::IdRef,
+ Traversal::Fundamental::IdRefs,
+
+ Traversal::Fundamental::AnyURI,
+
+ Traversal::Fundamental::QName,
+
+ 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
{
FundamentalNamespace (Context& c)
: Context (c)
diff --git a/xsd/cxx/tree/parser-header.cxx b/xsd/cxx/tree/parser-header.cxx
index bf49821..8d924de 100644
--- a/xsd/cxx/tree/parser-header.cxx
+++ b/xsd/cxx/tree/parser-header.cxx
@@ -14,12 +14,12 @@ namespace CXX
{
namespace
{
- struct ElementFunction : Traversal::Element,
- GlobalElementBase,
- protected virtual Context
+ struct ElementFunction: Traversal::Element,
+ GlobalElementBase,
+ Context
{
ElementFunction (Context& c)
- : Context (c), GlobalElementBase (c)
+ : GlobalElementBase (c), Context (c)
{
}
diff --git a/xsd/cxx/tree/parser-source.cxx b/xsd/cxx/tree/parser-source.cxx
index 5c121f2..0dfae59 100644
--- a/xsd/cxx/tree/parser-source.cxx
+++ b/xsd/cxx/tree/parser-source.cxx
@@ -16,10 +16,10 @@ namespace CXX
{
struct ElementFunction: Traversal::Element,
GlobalElementBase,
- protected virtual Context
+ Context
{
ElementFunction (Context& c)
- : Context (c), GlobalElementBase (c)
+ : GlobalElementBase (c), Context (c)
{
}
diff --git a/xsd/cxx/tree/serialization-header.cxx b/xsd/cxx/tree/serialization-header.cxx
index 090f0f5..59db8a3 100644
--- a/xsd/cxx/tree/serialization-header.cxx
+++ b/xsd/cxx/tree/serialization-header.cxx
@@ -14,7 +14,7 @@ namespace CXX
{
namespace
{
- struct List: Traversal::List, protected virtual Context
+ struct List: Traversal::List, Context
{
List (Context& c)
: Context (c)
@@ -60,7 +60,7 @@ namespace CXX
};
- struct Union: Traversal::Union, protected virtual Context
+ struct Union: Traversal::Union, Context
{
Union (Context& c)
: Context (c)
@@ -105,7 +105,7 @@ namespace CXX
};
- struct Enumeration: Traversal::Enumeration, protected virtual Context
+ struct Enumeration: Traversal::Enumeration, Context
{
Enumeration (Context& c)
: Context (c)
@@ -149,7 +149,7 @@ namespace CXX
}
};
- struct Complex : Traversal::Complex, protected virtual Context
+ struct Complex: Traversal::Complex, Context
{
Complex (Context& c)
: Context (c)
@@ -204,10 +204,10 @@ namespace CXX
struct ElementType: Traversal::Element,
GlobalElementBase,
- protected virtual Context
+ Context
{
ElementType (Context& c)
- : Context (c), GlobalElementBase (c)
+ : GlobalElementBase (c), Context (c)
{
}
@@ -229,10 +229,10 @@ namespace CXX
struct ElementFunction: Traversal::Element,
GlobalElementBase,
- protected virtual Context
+ Context
{
ElementFunction (Context& c)
- : Context (c), GlobalElementBase (c)
+ : GlobalElementBase (c), Context (c)
{
}
diff --git a/xsd/cxx/tree/serialization-source.cxx b/xsd/cxx/tree/serialization-source.cxx
index 1d96883..dda363f 100644
--- a/xsd/cxx/tree/serialization-source.cxx
+++ b/xsd/cxx/tree/serialization-source.cxx
@@ -35,7 +35,7 @@ namespace CXX
//
//
- struct List : Traversal::List, protected virtual Context
+ struct List: Traversal::List, Context
{
List (Context& c)
: Context (c)
@@ -124,7 +124,7 @@ namespace CXX
};
- struct Union : Traversal::Union, protected virtual Context
+ struct Union: Traversal::Union, Context
{
Union (Context& c)
: Context (c)
@@ -192,7 +192,7 @@ namespace CXX
};
- struct Enumeration : Traversal::Enumeration, protected virtual Context
+ struct Enumeration: Traversal::Enumeration, Context
{
Enumeration (Context& c)
: Context (c), base_ (c)
@@ -277,7 +277,7 @@ namespace CXX
BaseTypeName base_;
};
- struct Element : Traversal::Element, protected virtual Context
+ struct Element: Traversal::Element, Context
{
Element (Context& c, String const& scope_)
: Context (c), scope (scope_)
@@ -509,7 +509,7 @@ namespace CXX
String scope;
};
- struct Any : Traversal::Any, protected virtual Context
+ struct Any: Traversal::Any, Context
{
Any (Context& c, String const& scope_)
: Context (c), scope (scope_)
@@ -567,7 +567,7 @@ namespace CXX
String scope;
};
- struct Attribute : Traversal::Attribute, protected virtual Context
+ struct Attribute: Traversal::Attribute, Context
{
Attribute (Context& c, String const& scope_)
: Context (c), scope (scope_)
@@ -663,8 +663,7 @@ namespace CXX
String scope;
};
- struct AnyAttribute : Traversal::AnyAttribute,
- protected virtual Context
+ struct AnyAttribute: Traversal::AnyAttribute, Context
{
AnyAttribute (Context& c, String const& scope_)
: Context (c), scope (scope_)
@@ -700,7 +699,7 @@ namespace CXX
String scope;
};
- struct Complex : Traversal::Complex, protected virtual Context
+ struct Complex: Traversal::Complex, Context
{
Complex (Context& c)
: Context (c), base_ (c)
@@ -843,12 +842,12 @@ namespace CXX
// Generate substitution group map entry.
//
- struct GlobalElement : Traversal::Element,
- GlobalElementBase,
- protected virtual Context
+ struct GlobalElement: Traversal::Element,
+ GlobalElementBase,
+ Context
{
GlobalElement (Context& c)
- : Context (c), GlobalElementBase (c), type_name_ (c)
+ : GlobalElementBase (c), Context (c), type_name_ (c)
{
belongs_ >> type_name_;
}
@@ -887,11 +886,11 @@ namespace CXX
struct ElementType: Traversal::Element,
GlobalElementBase,
- protected virtual Context
+ Context
{
ElementType (Context& c)
- : Context (c),
- GlobalElementBase (c),
+ : GlobalElementBase (c),
+ Context (c),
element_map_ (c.options.value<CLI::generate_element_map> ())
{
}
@@ -937,10 +936,10 @@ namespace CXX
struct ElementFunction: Traversal::Element,
GlobalElementBase,
- protected virtual Context
+ Context
{
ElementFunction (Context& c)
- : Context (c), GlobalElementBase (c)
+ : GlobalElementBase (c), Context (c)
{
}
diff --git a/xsd/cxx/tree/stream-extraction-source.cxx b/xsd/cxx/tree/stream-extraction-source.cxx
index 27b3ca7..14920e0 100644
--- a/xsd/cxx/tree/stream-extraction-source.cxx
+++ b/xsd/cxx/tree/stream-extraction-source.cxx
@@ -16,7 +16,7 @@ namespace CXX
{
typedef Containers::Vector<NarrowString> Streams;
- struct List : Traversal::List, protected virtual Context
+ struct List: Traversal::List, Context
{
List (Context& c)
: Context (c)
@@ -94,7 +94,7 @@ namespace CXX
};
- struct Union : Traversal::Union, protected virtual Context
+ struct Union: Traversal::Union, Context
{
Union (Context& c)
: Context (c)
@@ -150,7 +150,7 @@ namespace CXX
};
- struct Enumeration : Traversal::Enumeration, protected virtual Context
+ struct Enumeration: Traversal::Enumeration, Context
{
Enumeration (Context& c)
: Context (c), base_ (c)
@@ -222,8 +222,7 @@ namespace CXX
BaseTypeName base_;
};
- struct CtorMember : Traversal::Member,
- protected virtual Context
+ struct CtorMember: Traversal::Member, Context
{
CtorMember (Context& c)
: Context (c)
@@ -241,9 +240,9 @@ namespace CXX
}
};
- struct CtorAny : Traversal::Any,
- Traversal::AnyAttribute,
- protected virtual Context
+ struct CtorAny: Traversal::Any,
+ Traversal::AnyAttribute,
+ Context
{
CtorAny (Context& c)
: Context (c)
@@ -275,7 +274,7 @@ namespace CXX
}
};
- struct Element : Traversal::Element, protected virtual Context
+ struct Element: Traversal::Element, Context
{
Element (Context& c, String const& stream_)
: Context (c), stream (stream_)
@@ -459,7 +458,7 @@ namespace CXX
String stream;
};
- struct Attribute : Traversal::Attribute, protected virtual Context
+ struct Attribute: Traversal::Attribute, Context
{
Attribute (Context& c)
: Context (c)
@@ -526,7 +525,7 @@ namespace CXX
}
};
- struct Complex : Traversal::Complex, protected virtual Context
+ struct Complex: Traversal::Complex, Context
{
Complex (Context& c)
: Context (c), base_ (c), ctor_any_ (c), ctor_member_ (c)
diff --git a/xsd/cxx/tree/stream-header.cxx b/xsd/cxx/tree/stream-header.cxx
index 64964a3..9d8c5cf 100644
--- a/xsd/cxx/tree/stream-header.cxx
+++ b/xsd/cxx/tree/stream-header.cxx
@@ -14,7 +14,7 @@ namespace CXX
{
namespace
{
- struct List: Traversal::List, protected virtual Context
+ struct List: Traversal::List, Context
{
List (Context& c)
: Context (c)
@@ -41,7 +41,7 @@ namespace CXX
};
- struct Union: Traversal::Union, protected virtual Context
+ struct Union: Traversal::Union, Context
{
Union (Context& c)
: Context (c)
@@ -68,7 +68,7 @@ namespace CXX
};
- struct Enumeration: Traversal::Enumeration, protected virtual Context
+ struct Enumeration: Traversal::Enumeration, Context
{
Enumeration (Context& c)
: Context (c)
@@ -122,7 +122,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/tree/stream-insertion-header.cxx b/xsd/cxx/tree/stream-insertion-header.cxx
index 32cb402..a11ab0d 100644
--- a/xsd/cxx/tree/stream-insertion-header.cxx
+++ b/xsd/cxx/tree/stream-insertion-header.cxx
@@ -16,7 +16,7 @@ namespace CXX
{
typedef Containers::Vector<NarrowString> Streams;
- struct List: Traversal::List, protected virtual Context
+ struct List: Traversal::List, Context
{
List (Context& c)
: Context (c)
@@ -49,7 +49,7 @@ namespace CXX
};
- struct Union: Traversal::Union, protected virtual Context
+ struct Union: Traversal::Union, Context
{
Union (Context& c)
: Context (c)
@@ -82,7 +82,7 @@ namespace CXX
};
- struct Enumeration: Traversal::Enumeration, protected virtual Context
+ struct Enumeration: Traversal::Enumeration, Context
{
Enumeration (Context& c)
: Context (c)
@@ -114,7 +114,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/tree/stream-insertion-source.cxx b/xsd/cxx/tree/stream-insertion-source.cxx
index 87c7caa..867f0ed 100644
--- a/xsd/cxx/tree/stream-insertion-source.cxx
+++ b/xsd/cxx/tree/stream-insertion-source.cxx
@@ -16,7 +16,7 @@ namespace CXX
{
typedef Containers::Vector<NarrowString> Streams;
- struct List : Traversal::List, protected virtual Context
+ struct List: Traversal::List, Context
{
List (Context& c)
: Context (c)
@@ -93,7 +93,7 @@ namespace CXX
};
- struct Union : Traversal::Union, protected virtual Context
+ struct Union: Traversal::Union, Context
{
Union (Context& c)
: Context (c)
@@ -149,7 +149,7 @@ namespace CXX
};
- struct Enumeration : Traversal::Enumeration, protected virtual Context
+ struct Enumeration: Traversal::Enumeration, Context
{
Enumeration (Context& c)
: Context (c), base_ (c)
@@ -211,7 +211,7 @@ namespace CXX
BaseTypeName base_;
};
- struct Element : Traversal::Element, protected virtual Context
+ struct Element: Traversal::Element, Context
{
Element (Context& c, String const& scope_, String const& stream_)
: Context (c), scope (scope_), stream (stream_)
@@ -329,7 +329,7 @@ namespace CXX
String stream;
};
- struct Attribute : Traversal::Attribute, protected virtual Context
+ struct Attribute: Traversal::Attribute, Context
{
Attribute (Context& c)
: Context (c)
@@ -360,7 +360,7 @@ namespace CXX
};
- struct Complex : Traversal::Complex, protected virtual Context
+ struct Complex: Traversal::Complex, Context
{
Complex (Context& c)
: Context (c), base_ (c)
diff --git a/xsd/cxx/tree/stream-source.cxx b/xsd/cxx/tree/stream-source.cxx
index e30a4ab..57115a0 100644
--- a/xsd/cxx/tree/stream-source.cxx
+++ b/xsd/cxx/tree/stream-source.cxx
@@ -14,7 +14,7 @@ namespace CXX
{
namespace
{
- struct List : Traversal::List, protected virtual Context
+ struct List: Traversal::List, Context
{
List (Context& c)
: Context (c)
@@ -80,7 +80,7 @@ namespace CXX
};
- struct Union : Traversal::Union, protected virtual Context
+ struct Union: Traversal::Union, Context
{
Union (Context& c)
: Context (c)
@@ -123,7 +123,7 @@ namespace CXX
};
- struct Enumeration : Traversal::Enumeration, protected virtual Context
+ struct Enumeration: Traversal::Enumeration, Context
{
Enumeration (Context& c)
: Context (c), base_ (c)
@@ -204,7 +204,7 @@ namespace CXX
BaseTypeName base_;
};
- struct Element : Traversal::Element, protected virtual Context
+ struct Element: Traversal::Element, Context
{
Element (Context& c, String const& scope_)
: Context (c), scope (scope_)
@@ -305,7 +305,7 @@ namespace CXX
String scope;
};
- struct Attribute : Traversal::Attribute, protected virtual Context
+ struct Attribute: Traversal::Attribute, Context
{
Attribute (Context& c)
: Context (c)
@@ -336,7 +336,7 @@ namespace CXX
};
- struct Complex : Traversal::Complex, protected virtual Context
+ struct Complex: Traversal::Complex, Context
{
Complex (Context& c)
: Context (c), base_ (c)
diff --git a/xsd/cxx/tree/tree-forward.cxx b/xsd/cxx/tree/tree-forward.cxx
index 8ba8bc1..cceedb7 100644
--- a/xsd/cxx/tree/tree-forward.cxx
+++ b/xsd/cxx/tree/tree-forward.cxx
@@ -15,8 +15,7 @@ namespace CXX
{
namespace
{
- struct List : Traversal::List,
- protected virtual Context
+ struct List: Traversal::List, Context
{
List (Context& c)
: Context (c)
@@ -46,8 +45,7 @@ namespace CXX
}
};
- struct Union : Traversal::Union,
- protected virtual Context
+ struct Union: Traversal::Union, Context
{
Union (Context& c)
: Context (c)
@@ -77,8 +75,7 @@ namespace CXX
}
};
- struct Enumeration : Traversal::Enumeration,
- protected virtual Context
+ struct Enumeration: Traversal::Enumeration, Context
{
Enumeration (Context& c)
: Context (c)
@@ -108,8 +105,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/tree/tree-header.cxx b/xsd/cxx/tree/tree-header.cxx
index a63dcbe..7bb630c 100644
--- a/xsd/cxx/tree/tree-header.cxx
+++ b/xsd/cxx/tree/tree-header.cxx
@@ -19,7 +19,7 @@ namespace CXX
// List mapping.
//
- struct List: Traversal::List, protected virtual Context
+ struct List: Traversal::List, Context
{
List (Context& c)
: Context (c)
@@ -310,7 +310,7 @@ namespace CXX
// Union mapping.
//
- struct Union: Traversal::Union, protected virtual Context
+ struct Union: Traversal::Union, Context
{
Union (Context& c)
: Context (c)
@@ -543,7 +543,7 @@ namespace CXX
// Enum mapping.
//
- struct Enumerator: Traversal::Enumerator, protected virtual Context
+ struct Enumerator: Traversal::Enumerator, Context
{
Enumerator (Context& c)
: Context (c)
@@ -564,7 +564,7 @@ namespace CXX
}
};
- struct Enumeration: Traversal::Enumeration, protected virtual Context
+ struct Enumeration: Traversal::Enumeration, Context
{
Enumeration (Context& c)
: Context (c),
@@ -1050,7 +1050,7 @@ namespace CXX
//
//
- struct MemberFunction: Traversal::Member, protected virtual Context
+ struct MemberFunction: Traversal::Member, Context
{
MemberFunction (Context& c)
: Context (c)
@@ -1378,7 +1378,7 @@ namespace CXX
}
};
- struct AnyFunction: Traversal::Any, protected virtual Context
+ struct AnyFunction: Traversal::Any, Context
{
AnyFunction (Context& c)
: Context (c)
@@ -1728,7 +1728,7 @@ namespace CXX
//
//
- struct Member: Traversal::Member, protected virtual Context
+ struct Member: Traversal::Member, Context
{
Member (Context& c)
: Context (c),
@@ -1920,7 +1920,7 @@ namespace CXX
struct Any: Traversal::Any,
Traversal::AnyAttribute,
- protected virtual Context
+ Context
{
Any (Context& c)
: Context (c), any_function_ (c)
@@ -2105,7 +2105,7 @@ namespace CXX
AnyFunction any_function_;
};
- struct DataMember: Traversal::Member, protected virtual Context
+ struct DataMember: Traversal::Member, Context
{
DataMember (Context& c)
: Context (c)
@@ -2166,7 +2166,7 @@ namespace CXX
struct DataAny: Traversal::Any,
Traversal::AnyAttribute,
- protected virtual Context
+ Context
{
DataAny (Context& c)
: Context (c)
@@ -2206,7 +2206,7 @@ namespace CXX
};
- struct Complex : Traversal::Complex, protected virtual Context
+ struct Complex: Traversal::Complex, Context
{
Complex (Context& c)
: Context (c),
@@ -3032,12 +3032,12 @@ namespace CXX
};
- struct GlobalElement : Traversal::Element,
- GlobalElementBase,
- protected virtual Context
+ struct GlobalElement: Traversal::Element,
+ GlobalElementBase,
+ Context
{
GlobalElement (Context& c)
- : Context (c), GlobalElementBase (c), type_name_ (c)
+ : GlobalElementBase (c), Context (c), type_name_ (c)
{
belongs_ >> type_name_;
}
diff --git a/xsd/cxx/tree/tree-inline.cxx b/xsd/cxx/tree/tree-inline.cxx
index 0b834af..148369f 100644
--- a/xsd/cxx/tree/tree-inline.cxx
+++ b/xsd/cxx/tree/tree-inline.cxx
@@ -14,7 +14,7 @@ namespace CXX
{
namespace
{
- struct List : Traversal::List, protected virtual Context
+ struct List: Traversal::List, Context
{
List (Context& c)
: Context (c)
@@ -98,7 +98,7 @@ namespace CXX
};
- struct Union : Traversal::Union, protected virtual Context
+ struct Union: Traversal::Union, Context
{
Union (Context& c)
: Context (c)
@@ -174,7 +174,7 @@ namespace CXX
//
struct CtorCallSequence: Traversal::Complex,
Traversal::Fundamental::Type,
- protected virtual Context
+ Context
{
CtorCallSequence (Context& c, String const& arg)
: Context (c), arg_ (arg), base_type_name_ (c)
@@ -208,8 +208,7 @@ namespace CXX
BaseTypeName base_type_name_;
};
- struct Enumeration : Traversal::Enumeration,
- protected virtual Context
+ struct Enumeration: Traversal::Enumeration, Context
{
Enumeration (Context& c)
: Context (c), member_ (c)
@@ -420,7 +419,7 @@ namespace CXX
MemberTypeName member_;
};
- struct Member: Traversal::Member, protected virtual Context
+ struct Member: Traversal::Member, Context
{
Member (Context& c, String const& scope)
: Context (c), scope_ (scope)
@@ -629,7 +628,7 @@ namespace CXX
struct Any: Traversal::Any,
Traversal::AnyAttribute,
- protected virtual Context
+ Context
{
Any (Context& c, String const& scope)
: Context (c), scope_ (scope)
@@ -831,7 +830,7 @@ namespace CXX
String scope_;
};
- struct Complex : Traversal::Complex, protected virtual Context
+ struct Complex: Traversal::Complex, Context
{
Complex (Context& c)
: Context (c)
@@ -891,12 +890,12 @@ namespace CXX
};
- struct GlobalElement : Traversal::Element,
- GlobalElementBase,
- protected virtual Context
+ struct GlobalElement: Traversal::Element,
+ GlobalElementBase,
+ Context
{
GlobalElement (Context& c)
- : Context (c), GlobalElementBase (c)
+ : GlobalElementBase (c), Context (c)
{
}
diff --git a/xsd/cxx/tree/tree-source.cxx b/xsd/cxx/tree/tree-source.cxx
index 4b4b301..d1353b0 100644
--- a/xsd/cxx/tree/tree-source.cxx
+++ b/xsd/cxx/tree/tree-source.cxx
@@ -20,7 +20,7 @@ namespace CXX
{
namespace
{
- struct List: Traversal::List, protected virtual Context
+ struct List: Traversal::List, Context
{
List (Context& c)
: Context (c)
@@ -146,7 +146,7 @@ namespace CXX
};
- struct Union: Traversal::Union, protected virtual Context
+ struct Union: Traversal::Union, Context
{
Union (Context& c)
: Context (c)
@@ -244,8 +244,7 @@ namespace CXX
// Enumeration mapping.
//
- struct EnumeratorLiteral: Traversal::Enumerator,
- protected virtual Context
+ struct EnumeratorLiteral: Traversal::Enumerator, Context
{
EnumeratorLiteral (Context& c)
: Context (c)
@@ -284,8 +283,7 @@ namespace CXX
// Populate LiteralInfoList
//
- struct EnumeratorLiteralInfo: Traversal::Enumerator,
- protected virtual Context
+ struct EnumeratorLiteralInfo: Traversal::Enumerator, Context
{
EnumeratorLiteralInfo (Context& c, LiteralInfoList& list)
@@ -304,7 +302,7 @@ namespace CXX
};
- struct Enumeration: Traversal::Enumeration, protected virtual Context
+ struct Enumeration: Traversal::Enumeration, Context
{
Enumeration (Context& c)
: Context (c), enumerator_literal_ (c)
@@ -547,7 +545,7 @@ namespace CXX
//
//
- struct Member: Traversal::Member, protected virtual Context
+ struct Member: Traversal::Member, Context
{
Member (Context& c, String const& scope)
: Context (c), scope_ (scope)
@@ -626,7 +624,7 @@ namespace CXX
};
- struct Element: Traversal::Element, protected virtual Context
+ struct Element: Traversal::Element, Context
{
Element (Context& c)
: Context (c)
@@ -833,7 +831,7 @@ namespace CXX
}
};
- struct ElementTest : Traversal::Element, protected virtual Context
+ struct ElementTest: Traversal::Element, Context
{
ElementTest (Context& c)
: Context (c)
@@ -863,7 +861,7 @@ namespace CXX
}
};
- struct Any: Traversal::Any, protected virtual Context
+ struct Any: Traversal::Any, Context
{
Any (Context& c)
: Context (c)
@@ -1000,7 +998,7 @@ namespace CXX
}
};
- struct AnyTest : Traversal::Any, protected virtual Context
+ struct AnyTest: Traversal::Any, Context
{
AnyTest (Context& c)
: Context (c)
@@ -1025,7 +1023,7 @@ namespace CXX
}
};
- struct Attribute : Traversal::Attribute, protected virtual Context
+ struct Attribute: Traversal::Attribute, Context
{
Attribute (Context& c)
: Context (c)
@@ -1080,7 +1078,7 @@ namespace CXX
}
};
- struct AnyAttribute: Traversal::AnyAttribute, protected virtual Context
+ struct AnyAttribute: Traversal::AnyAttribute, Context
{
AnyAttribute (Context& c)
: Context (c)
@@ -1173,7 +1171,7 @@ namespace CXX
};
- struct AttributeTest : Traversal::Attribute, protected virtual Context
+ struct AttributeTest: Traversal::Attribute, Context
{
AttributeTest (Context& c)
: Context (c)
@@ -1234,10 +1232,10 @@ namespace CXX
//
//
- struct CtorBase : Traversal::Complex,
- Traversal::Enumeration,
- Traversal::Type,
- protected virtual Context
+ struct CtorBase: Traversal::Complex,
+ Traversal::Enumeration,
+ Traversal::Type,
+ Context
{
// If base_arg is empty then no base argument is
// generated.
@@ -1272,13 +1270,13 @@ namespace CXX
// No need to traverse AnyAttribute since it is always mapped
// to a sequence.
//
- struct Args : Traversal::Complex,
- Traversal::Enumeration,
- Traversal::Type,
- Traversal::Any,
- Traversal::Element,
- Traversal::Attribute,
- protected virtual Context
+ struct Args: Traversal::Complex,
+ Traversal::Enumeration,
+ Traversal::Type,
+ Traversal::Any,
+ Traversal::Element,
+ Traversal::Attribute,
+ Context
{
Args (Context& c, String const& base_arg)
: Context (c), base_arg_ (base_arg), first_ (true)
@@ -1363,9 +1361,9 @@ namespace CXX
};
- struct CtorMember : Traversal::Element,
- Traversal::Attribute,
- protected virtual Context
+ struct CtorMember: Traversal::Element,
+ Traversal::Attribute,
+ Context
{
CtorMember (Context& c)
: Context (c)
@@ -1442,9 +1440,9 @@ namespace CXX
}
};
- struct CtorAny : Traversal::Any,
- Traversal::AnyAttribute,
- protected virtual Context
+ struct CtorAny: Traversal::Any,
+ Traversal::AnyAttribute,
+ Context
{
CtorAny (Context& c)
: Context (c)
@@ -1496,9 +1494,7 @@ namespace CXX
};
- struct CopyMember : Traversal::Member,
- protected virtual Context
-
+ struct CopyMember: Traversal::Member, Context
{
CopyMember (Context& c, String const& arg_name_)
: Context (c), arg_name (arg_name_)
@@ -1522,10 +1518,9 @@ namespace CXX
String arg_name;
};
- struct CopyAny : Traversal::Any,
- Traversal::AnyAttribute,
- protected virtual Context
-
+ struct CopyAny: Traversal::Any,
+ Traversal::AnyAttribute,
+ Context
{
CopyAny (Context& c, String const& arg_name_)
: Context (c), arg_name (arg_name_)
@@ -1565,8 +1560,7 @@ namespace CXX
// Element parsing c-tor initializers.
//
- struct ElementCtorMember : Traversal::Member,
- protected virtual Context
+ struct ElementCtorMember: Traversal::Member, Context
{
ElementCtorMember (Context& c)
: Context (c)
@@ -1586,9 +1580,9 @@ namespace CXX
}
};
- struct ElementCtorAny : Traversal::Any,
- Traversal::AnyAttribute,
- protected virtual Context
+ struct ElementCtorAny: Traversal::Any,
+ Traversal::AnyAttribute,
+ Context
{
ElementCtorAny (Context& c)
: Context (c)
@@ -1623,9 +1617,9 @@ namespace CXX
// Default c-tor member initializer.
//
- struct DefaultCtorMemberInit : Traversal::Element,
- Traversal::Attribute,
- protected virtual Context
+ struct DefaultCtorMemberInit: Traversal::Element,
+ Traversal::Attribute,
+ Context
{
DefaultCtorMemberInit (Context& c)
: Context (c)
@@ -1664,9 +1658,9 @@ namespace CXX
}
};
- struct DefaultCtorAnyInit : Traversal::Any,
- Traversal::AnyAttribute,
- protected virtual Context
+ struct DefaultCtorAnyInit: Traversal::Any,
+ Traversal::AnyAttribute,
+ Context
{
DefaultCtorAnyInit (Context& c)
: Context (c)
@@ -1708,7 +1702,7 @@ namespace CXX
Traversal::Member,
Traversal::Any,
Traversal::AnyAttribute,
- protected virtual Context
+ Context
{
// generate should initially be false.
//
@@ -1783,9 +1777,9 @@ namespace CXX
//
//
- struct MemberComparison : Traversal::Element,
- Traversal::Attribute,
- protected virtual Context
+ struct MemberComparison: Traversal::Element,
+ Traversal::Attribute,
+ Context
{
MemberComparison (Context& c)
: Context (c)
@@ -1902,9 +1896,9 @@ namespace CXX
}
};
- struct AnyComparison : Traversal::Any,
- Traversal::AnyAttribute,
- protected virtual Context
+ struct AnyComparison: Traversal::Any,
+ Traversal::AnyAttribute,
+ Context
{
AnyComparison (Context& c)
: Context (c)
@@ -1946,7 +1940,7 @@ namespace CXX
Traversal::Any,
Traversal::Attribute,
Traversal::AnyAttribute,
- protected virtual Context
+ Context
{
HasParseFunction (Context& c, Boolean& has_el, Boolean& has_at)
: Context (c), has_el_ (has_el), has_at_ (has_at)
@@ -1999,7 +1993,7 @@ namespace CXX
//
//
- struct FacetArray: Traversal::Complex, protected virtual Context
+ struct FacetArray: Traversal::Complex, Context
{
FacetArray (Context& c)
: Context (c)
@@ -2073,7 +2067,7 @@ namespace CXX
//
//
- struct Complex: Traversal::Complex, protected virtual Context
+ struct Complex: Traversal::Complex, Context
{
Complex (Context& c)
: Context (c),
@@ -3112,13 +3106,13 @@ namespace CXX
// Generate element types and substitution group map entries.
//
- struct GlobalElement : Traversal::Element,
- GlobalElementBase,
- protected virtual Context
+ struct GlobalElement: Traversal::Element,
+ GlobalElementBase,
+ Context
{
GlobalElement (Context& c)
- : Context (c),
- GlobalElementBase (c),
+ : GlobalElementBase (c),
+ Context (c),
element_type_ (c.options.value<CLI::generate_element_type> ()),
element_map_ (c.options.value<CLI::generate_element_map> ()),
type_name_ (c)
diff --git a/xsd/cxx/tree/validator.cxx b/xsd/cxx/tree/validator.cxx
index 8027df7..7ef23fa 100644
--- a/xsd/cxx/tree/validator.cxx
+++ b/xsd/cxx/tree/validator.cxx
@@ -103,15 +103,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),
@@ -269,11 +268,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), any_ (c)
@@ -415,11 +414,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),