diff options
Diffstat (limited to 'xsd-frontend/transformations')
-rw-r--r-- | xsd-frontend/transformations/anonymous.cxx | 12 | ||||
-rw-r--r-- | xsd-frontend/transformations/enum-synthesis.cxx | 4 | ||||
-rw-r--r-- | xsd-frontend/transformations/restriction.cxx | 28 |
3 files changed, 22 insertions, 22 deletions
diff --git a/xsd-frontend/transformations/anonymous.cxx b/xsd-frontend/transformations/anonymous.cxx index 4663c1d..6998176 100644 --- a/xsd-frontend/transformations/anonymous.cxx +++ b/xsd-frontend/transformations/anonymous.cxx @@ -152,7 +152,7 @@ namespace XSDFrontend break; } - if (!schema->used ()) + if (!schema->used_p ()) return schema_path; Uses& u (*schema->used_begin ()); @@ -166,7 +166,7 @@ namespace XSDFrontend if (dynamic_cast<SemanticGraph::Namespace*> (&n) != 0) return L"<namespace-level>"; // There is a bug if you see this. - assert (n.named ()); + assert (n.named_p ()); SemanticGraph::Scope& scope (n.scope ()); @@ -254,7 +254,7 @@ namespace XSDFrontend //@@ This IDREF stuff is really ugly! // - if (!t.named () && + if (!t.named_p () && !t.is_a<SemanticGraph::Fundamental::IdRef> () && !t.is_a<SemanticGraph::Fundamental::IdRefs> ()) { @@ -335,7 +335,7 @@ namespace XSDFrontend //@@ This IDREF stuff is really ugly! // - if (!t.named () && + if (!t.named_p () && !t.is_a<SemanticGraph::Fundamental::IdRef> () && !t.is_a<SemanticGraph::Fundamental::IdRefs> ()) { @@ -426,7 +426,7 @@ namespace XSDFrontend //@@ This IDREF stuff is really ugly! // - if (!t.named () && + if (!t.named_p () && !t.is_a<SemanticGraph::Fundamental::IdRef> () && !t.is_a<SemanticGraph::Fundamental::IdRefs> ()) { @@ -469,7 +469,7 @@ namespace XSDFrontend //@@ This IDREF stuff us really ugly! // - if (!t.named () && + if (!t.named_p () && !t.is_a<SemanticGraph::Fundamental::IdRef> () && !t.is_a<SemanticGraph::Fundamental::IdRefs> ()) { diff --git a/xsd-frontend/transformations/enum-synthesis.cxx b/xsd-frontend/transformations/enum-synthesis.cxx index 4a5156f..e10b9d3 100644 --- a/xsd-frontend/transformations/enum-synthesis.cxx +++ b/xsd-frontend/transformations/enum-synthesis.cxx @@ -161,8 +161,8 @@ namespace XSDFrontend schema_.add_edge_right (e, u.annotated ()); } - schema_.reset_right_node (u.named_ (), e); - schema_.add_edge_right (e, u.named_ ()); + schema_.reset_right_node (u.named (), e); + schema_.add_edge_right (e, u.named ()); for (Type::ClassifiesIterator i (u.classifies_begin ()), end (u.classifies_end ()); i != end; ++i) diff --git a/xsd-frontend/transformations/restriction.cxx b/xsd-frontend/transformations/restriction.cxx index a7f224b..c58d98f 100644 --- a/xsd-frontend/transformations/restriction.cxx +++ b/xsd-frontend/transformations/restriction.cxx @@ -252,16 +252,16 @@ namespace XSDFrontend Element& re (dynamic_cast<Element&> (r)); Element& be (dynamic_cast<Element&> (b)); - if (re.qualified ()) + if (re.qualified_p ()) { - if (be.qualified () && + if (be.qualified_p () && re.name () == be.name () && re.namespace_ ().name () == be.namespace_ ().name ()) return true; } else { - if (!be.qualified () && re.name () == be.name ()) + if (!be.qualified_p () && re.name () == be.name ()) return true; } @@ -308,9 +308,9 @@ namespace XSDFrontend if (a == 0) continue; - if (prot->qualified ()) + if (prot->qualified_p ()) { - if (a->qualified () && + if (a->qualified_p () && prot->namespace_ ().name () == a->namespace_ ().name ()) { break; @@ -318,7 +318,7 @@ namespace XSDFrontend } else { - if (!a->qualified ()) + if (!a->qualified_p ()) break; } @@ -330,24 +330,24 @@ namespace XSDFrontend a = &schema_.new_node<Attribute> (prot->file (), prot->line (), prot->column (), - prot->optional (), - prot->global (), - prot->qualified ()); + prot->optional_p (), + prot->global_p (), + prot->qualified_p ()); schema_.new_edge<Names> (c, *a, name); // Transfer namespace. // - if (prot->qualified ()) + if (prot->qualified_p ()) { schema_.new_edge<BelongsToNamespace> (*a, prot->namespace_ ()); } // Default and fixed values if any. // - if (prot->fixed ()) + if (prot->fixed_p ()) a->fixed (prot->value ()); - else if (prot->default_ ()) + else if (prot->default_p ()) a->default_ (prot->value ()); // Belongs edge. @@ -465,7 +465,7 @@ namespace XSDFrontend { SemanticGraph::Type& t (e.type ()); - if (!t.named () && !t.context ().count ("seen")) + if (!t.named_p () && !t.context ().count ("seen")) { t.context ().set ("seen", true); @@ -484,7 +484,7 @@ namespace XSDFrontend { SemanticGraph::Type& t (a.type ()); - if (!t.named () && !t.context ().count ("seen")) + if (!t.named_p () && !t.context ().count ("seen")) { t.context ().set ("seen", true); |