diff options
Diffstat (limited to 'xsd-frontend/semantic-graph')
-rw-r--r-- | xsd-frontend/semantic-graph/any-attribute.cxx | 2 | ||||
-rw-r--r-- | xsd-frontend/semantic-graph/any.cxx | 2 | ||||
-rw-r--r-- | xsd-frontend/semantic-graph/attribute.hxx | 2 | ||||
-rw-r--r-- | xsd-frontend/semantic-graph/complex.hxx | 4 | ||||
-rw-r--r-- | xsd-frontend/semantic-graph/elements.hxx | 38 | ||||
-rw-r--r-- | xsd-frontend/semantic-graph/schema.hxx | 2 |
6 files changed, 25 insertions, 25 deletions
diff --git a/xsd-frontend/semantic-graph/any-attribute.cxx b/xsd-frontend/semantic-graph/any-attribute.cxx index 86b327f..e25e742 100644 --- a/xsd-frontend/semantic-graph/any-attribute.cxx +++ b/xsd-frontend/semantic-graph/any-attribute.cxx @@ -85,7 +85,7 @@ namespace XSDFrontend // is where the type was defined. // - if (n.named ()) + if (n.named_p ()) { Scope& s (n.scope ()); Namespace* ns (dynamic_cast<Namespace*> (&n)); diff --git a/xsd-frontend/semantic-graph/any.cxx b/xsd-frontend/semantic-graph/any.cxx index dd433fd..a6c9e72 100644 --- a/xsd-frontend/semantic-graph/any.cxx +++ b/xsd-frontend/semantic-graph/any.cxx @@ -86,7 +86,7 @@ namespace XSDFrontend // is where the type was defined. // - if (n.named ()) + if (n.named_p ()) { Scope& s (n.scope ()); Namespace* ns (dynamic_cast<Namespace*> (&n)); diff --git a/xsd-frontend/semantic-graph/attribute.hxx b/xsd-frontend/semantic-graph/attribute.hxx index ecfd312..f7a516d 100644 --- a/xsd-frontend/semantic-graph/attribute.hxx +++ b/xsd-frontend/semantic-graph/attribute.hxx @@ -16,7 +16,7 @@ namespace XSDFrontend { public: Boolean - optional () const + optional_p () const { return optional_; } diff --git a/xsd-frontend/semantic-graph/complex.hxx b/xsd-frontend/semantic-graph/complex.hxx index e7ee947..40327bc 100644 --- a/xsd-frontend/semantic-graph/complex.hxx +++ b/xsd-frontend/semantic-graph/complex.hxx @@ -19,7 +19,7 @@ namespace XSDFrontend { public: Boolean - mixed () const + mixed_p () const { return mixed_; } @@ -40,7 +40,7 @@ namespace XSDFrontend public: Void - mixed (Boolean m) + mixed_p (Boolean m) { mixed_ = m; } diff --git a/xsd-frontend/semantic-graph/elements.hxx b/xsd-frontend/semantic-graph/elements.hxx index 4ce7fd6..78b6615 100644 --- a/xsd-frontend/semantic-graph/elements.hxx +++ b/xsd-frontend/semantic-graph/elements.hxx @@ -393,57 +393,57 @@ namespace XSDFrontend { public: Boolean - named () const + named_p () const { - return named__ != 0; + return named_ != 0; } Name name () const { - assert (named ()); - return named__->name (); + assert (named_p ()); + return named_->name (); } Scope& scope () { - assert (named ()); - return named__->scope (); + assert (named_p ()); + return named_->scope (); } Names& - named_ () + named () { - assert (named ()); - return *named__; + assert (named_p ()); + return *named_; } protected: friend class Bits::Graph<Node, Edge>; Nameable () - : named__ (0) + : named_ (0) { } Void add_edge_right (Names& e) { - named__ = &e; + named_ = &e; } Void remove_edge_right (Names& e) { - assert (named__ == &e); - named__ = 0; + assert (named_ == &e); + named_ = 0; } using Node::add_edge_right; private: - Names* named__; + Names* named_; }; @@ -744,7 +744,7 @@ namespace XSDFrontend type () const; Boolean - typed () const + typed_p () const { return belongs_ != 0; } @@ -970,13 +970,13 @@ namespace XSDFrontend // or it is a ref="" of a global member. // Boolean - global () const + global_p () const { return global_; } Boolean - qualified () const + qualified_p () const { return qualified_; } @@ -996,13 +996,13 @@ namespace XSDFrontend // fixed value appears as if the default value was also set. // Boolean - default_ () const + default_p () const { return value_type_ != ValueType::none; } Boolean - fixed () const + fixed_p () const { return value_type_ == ValueType::fixed; } diff --git a/xsd-frontend/semantic-graph/schema.hxx b/xsd-frontend/semantic-graph/schema.hxx index 48d457d..10d2f75 100644 --- a/xsd-frontend/semantic-graph/schema.hxx +++ b/xsd-frontend/semantic-graph/schema.hxx @@ -178,7 +178,7 @@ namespace XSDFrontend } Boolean - used () const + used_p () const { return used_begin () != used_end (); } |