Change predicate names to end on _p

11 files changed, 112 insertions, 112 deletions

diff --git a/tests/dump/driver.cxx b/tests/dump/driver.cxx
index 2e55e97..5217ebf 100644
--- a/tests/dump/driver.cxx
+++ b/tests/dump/driver.cxx
@@ -56,11 +56,11 @@ namespace
               << endl;
 
       wcout << ind << "list " <<
-        (l.named () ? l.name () : String ("<anonymous>"));
+        (l.named_p () ? l.name () : String ("<anonymous>"));
 
       SemanticGraph::Type& t (l.argumented ().type ());
 
-      if (t.named ())
+      if (t.named_p ())
         wcout << " " << ref_name (t) << endl;
       else
       {
@@ -86,14 +86,14 @@ namespace
               << endl;
 
       wcout << ind << "union " <<
-        (u.named () ? u.name () : String ("<anonymous>")) << " ";
+        (u.named_p () ? u.name () : String ("<anonymous>")) << " ";
 
       for (Type::ArgumentedIterator i (u.argumented_begin ());
            i != u.argumented_end (); ++i)
       {
         SemanticGraph::Type& t (i->type ());
 
-        if (t.named ())
+        if (t.named_p ())
           wcout << ref_name (t) << " ";
         else
         {
@@ -135,7 +135,7 @@ namespace
               << endl;
 
       wcout << ind << "enumeration " <<
-        (e.named () ? e.name () : String ("<anonymous>")) << ": " <<
+        (e.named_p () ? e.name () : String ("<anonymous>")) << ": " <<
         ref_name (e.inherits ().base ()) << endl
             << ind << "{" << endl;
 
@@ -238,17 +238,17 @@ namespace
         wcout << ind << "<" << a.annotation ().documentation () << ">"
               << endl;
 
-      wcout << ind << (a.optional () ? "optional" : "required")
+      wcout << ind << (a.optional_p () ? "optional" : "required")
             << " attribute " << a.name ();
 
-      if (a.fixed ())
+      if (a.fixed_p ())
         wcout << "==" << a.value ();
-      else if (a.default_ ())
+      else if (a.default_p ())
         wcout << "=" << a.value ();
 
       SemanticGraph::Type& t (a.type ());
 
-      if (t.named ())
+      if (t.named_p ())
         wcout << " " << ref_name (t) << endl;
       else
       {
@@ -284,14 +284,14 @@ namespace
     {
       wcout << "element " << e.name ();
 
-      if (e.fixed ())
+      if (e.fixed_p ())
         wcout << "==" << e.value ();
-      else if (e.default_ ())
+      else if (e.default_p ())
         wcout << "=" << e.value ();
 
       SemanticGraph::Type& t (e.type ());
 
-      if (t.named ())
+      if (t.named_p ())
         wcout << " " << ref_name (t) << endl;
       else
       {
@@ -318,9 +318,9 @@ namespace
 
       wcout << ind << "element " << e.name ();
 
-      if (e.fixed ())
+      if (e.fixed_p ())
         wcout << "==" << e.value ();
-      else if (e.default_ ())
+      else if (e.default_p ())
         wcout << "=" << e.value ();
 
       wcout << endl;
@@ -369,7 +369,7 @@ namespace
               << endl;
 
       wcout << ind << "complex " <<
-        (c.named () ? c.name () : String ("<anonymous>"));
+        (c.named_p () ? c.name () : String ("<anonymous>"));
 
       if (c.inherits_p ())
         wcout << ": " << ref_name (c.inherits ().base ());
@@ -398,14 +398,14 @@ namespace
 
       wcout << ind << "attribute " << a.name ();
 
-      if (a.fixed ())
+      if (a.fixed_p ())
         wcout << "==" << a.value ();
-      else if (a.default_ ())
+      else if (a.default_p ())
         wcout << "=" << a.value ();
 
       SemanticGraph::Type& t (a.type ());
 
-      if (t.named ())
+      if (t.named_p ())
         wcout << " " << ref_name (t) << endl;
       else
       {
@@ -432,14 +432,14 @@ namespace
 
       wcout << ind << "element " << e.name ();
 
-      if (e.fixed ())
+      if (e.fixed_p ())
         wcout << "==" << e.value ();
-      else if (e.default_ ())
+      else if (e.default_p ())
         wcout << "=" << e.value ();
 
       SemanticGraph::Type& t (e.type ());
 
-      if (t.named ())
+      if (t.named_p ())
         wcout << " " << ref_name (t) << endl;
       else
       {
diff --git a/xsd-frontend/parser.cxx b/xsd-frontend/parser.cxx
index 49ab9c0..1e3e076 100644
--- a/xsd-frontend/parser.cxx
+++ b/xsd-frontend/parser.cxx
@@ -477,14 +477,14 @@ namespace XSDFrontend
             // Transfer default and fixed values if we haven't already
             // gotten them.
             //
-            if (!m.default_ ())
+            if (!m.default_p ())
             {
-              if (ref.fixed ())
+              if (ref.fixed_p ())
                 m.fixed (ref.value ());
-              else if (ref.default_ ())
+              else if (ref.default_p ())
                 m.default_ (ref.value ());
 
-              if (m.default_ ())
+              if (m.default_p ())
               {
                 m.context ().set (
                   "dom-node",
@@ -500,7 +500,7 @@ namespace XSDFrontend
 
             // Type info.
             //
-            if (ref.typed ())
+            if (ref.typed_p ())
               s_.new_edge<Belongs> (m, ref.type ());
             else
             {
@@ -1075,19 +1075,19 @@ namespace XSDFrontend
 
         Element& copy (
         s_.new_node<Element> (
-          e.file (), e.line (), e.column (), e.global (), e.qualified ()));
+          e.file (), e.line (), e.column (), e.global_p (), e.qualified_p ()));
 
-        if (e.qualified ())
+        if (e.qualified_p ())
           s_.new_edge<BelongsToNamespace> (copy, e.namespace_ ());
 
         // Transfer default and fixed values.
         //
-        if (e.fixed ())
+        if (e.fixed_p ())
           copy.fixed (e.value ());
-        else if (e.default_ ())
+        else if (e.default_p ())
           copy.default_ (e.value ());
 
-        if (copy.default_ ())
+        if (copy.default_p ())
         {
           copy.context ().set (
             "dom-node",
@@ -1102,7 +1102,7 @@ namespace XSDFrontend
 
         // Belongs edge.
         //
-        if (e.typed ())
+        if (e.typed_p ())
           s_.new_edge<Belongs> (copy, e.type ());
         else
           assert (!valid_);
@@ -1143,25 +1143,25 @@ namespace XSDFrontend
                 s_.new_node<Attribute> (p->file (),
                                         p->line (),
                                         p->column (),
-                                        p->optional (),
-                                        p->global (),
-                                        p->qualified ()));
+                                        p->optional_p (),
+                                        p->global_p (),
+                                        p->qualified_p ()));
 
               NodeArgs<Scope, Scope::NamesIterator> na (s, pos);
               s_.new_edge<Names> (na, a, p->name ());
               ++pos;
 
-              if (p->qualified ())
+              if (p->qualified_p ())
                 s_.new_edge<BelongsToNamespace> (a, p->namespace_ ());
 
               // Transfer default and fixed values if any.
               //
-              if (p->fixed ())
+              if (p->fixed_p ())
                 a.fixed (p->value ());
-              else if (p->default_ ())
+              else if (p->default_p ())
                 a.default_ (p->value ());
 
-              if (a.default_ ())
+              if (a.default_p ())
               {
                 a.context ().set (
                   "dom-node",
@@ -1176,7 +1176,7 @@ namespace XSDFrontend
 
               // Belongs edge.
               //
-              if (p->typed ())
+              if (p->typed_p ())
                 s_.new_edge<Belongs> (a, p->type ());
               else
                 assert (!valid_);
@@ -1944,8 +1944,8 @@ namespace XSDFrontend
         Void
         traverse_member (SemanticGraph::Member& m)
         {
-          if (m.typed () &&
-              !m.type ().named () &&
+          if (m.typed_p () &&
+              !m.type ().named_p () &&
               !m.type ().context ().count ("seen"))
           {
             m.type().context ().set ("seen", true);
@@ -1970,7 +1970,7 @@ namespace XSDFrontend
         virtual Void
         traverse (SemanticGraph::Type& t)
         {
-          if (!t.named ())
+          if (!t.named_p ())
             base_.dispatch (t);
         }
 
@@ -2019,7 +2019,7 @@ namespace XSDFrontend
             //
             String ns (XML::ns_name (e, XML::prefix (v)));
 
-            if (m.fixed ())
+            if (m.fixed_p ())
               m.fixed (ns + L'#' + v);
             else
               m.default_ (ns + L'#' + v);
@@ -2191,8 +2191,8 @@ namespace XSDFrontend
         virtual Void
         traverse_member (SemanticGraph::Member& m)
         {
-          if (m.typed () &&
-              !m.type ().named () &&
+          if (m.typed_p () &&
+              !m.type ().named_p () &&
               !m.type ().context ().count ("seen"))
           {
             m.type().context ().set ("seen", true);
@@ -2217,7 +2217,7 @@ namespace XSDFrontend
         virtual Void
         traverse (SemanticGraph::Type& t)
         {
-          if (!t.named ())
+          if (!t.named_p ())
             base_.dispatch (t);
         }
 
@@ -2266,7 +2266,7 @@ namespace XSDFrontend
             //
             String ns (XML::ns_name (e, XML::prefix (v)));
 
-            if (m.fixed ())
+            if (m.fixed_p ())
               m.fixed (ns + L'#' + v);
             else
               m.default_ (ns + L'#' + v);
@@ -2514,7 +2514,7 @@ namespace XSDFrontend
       // Source'ed. I use this property to decide which edge to use.
       //
 
-      if (s.used () && s.used_begin ()->is_a<Sources> ())
+      if (s.used_p () && s.used_begin ()->is_a<Sources> ())
         s_->new_edge<Sources> (*cur_, s, path);
       else
         s_->new_edge<Includes> (*cur_, s, path);
@@ -3138,7 +3138,7 @@ namespace XSDFrontend
 
     Complex& node (s_->new_node<Complex> (file (), t.line (), t.column ()));
 
-    node.mixed (t["mixed"] == L"true" || t["mixed"] == L"1");
+    node.mixed_p (t["mixed"] == L"true" || t["mixed"] == L"1");
 
     if (String name = t["name"])
       s_->new_edge<Names> (scope (), node, name);
@@ -3361,7 +3361,7 @@ namespace XSDFrontend
   {
     if (c.attribute_p ("mixed"))
     {
-      type.mixed (c["mixed"] == L"true" || c["mixed"] == L"1");
+      type.mixed_p (c["mixed"] == L"true" || c["mixed"] == L"1");
     }
 
     push (c);
@@ -3715,7 +3715,7 @@ namespace XSDFrontend
       else if (e.attribute_p ("default"))
         node.default_ (e.attribute ("default"));
 
-      if (node.default_ ())
+      if (node.default_p ())
       {
         node.context ().set ("dom-node", e.dom_element ());
         default_values_.push_back (&node);
@@ -3840,7 +3840,7 @@ namespace XSDFrontend
       else if (e.attribute_p ("default"))
         node.default_ (e.attribute ("default"));
 
-      if (node.default_ ())
+      if (node.default_p ())
       {
         node.context ().set ("dom-node", e.dom_element ());
         default_values_.push_back (&node);
@@ -3883,14 +3883,14 @@ namespace XSDFrontend
         // Transfer default and fixed values if the ref declaration hasn't
         // defined its own.
         //
-        if (!node.default_ ())
+        if (!node.default_p ())
         {
-          if (prot.fixed ())
+          if (prot.fixed_p ())
             node.fixed (prot.value ());
-          else if (prot.default_ ())
+          else if (prot.default_p ())
             node.default_ (prot.value ());
 
-          if (node.default_ ())
+          if (node.default_p ())
           {
             node.context ().set (
               "dom-node",
@@ -3906,7 +3906,7 @@ namespace XSDFrontend
 
         // Set type information.
         //
-        if (prot.typed ())
+        if (prot.typed_p ())
         {
           s_->new_edge<Belongs> (node, prot.type ());
         }
@@ -4093,7 +4093,7 @@ namespace XSDFrontend
       else if (a.attribute_p ("default"))
         node.default_ (a.attribute ("default"));
 
-      if (node.default_ ())
+      if (node.default_p ())
       {
         node.context ().set ("dom-node", a.dom_element ());
         default_values_.push_back (&node);
@@ -4185,7 +4185,7 @@ namespace XSDFrontend
       else if (a.attribute_p ("default"))
         node.default_ (a.attribute ("default"));
 
-      if (node.default_ ())
+      if (node.default_p ())
       {
         node.context ().set ("dom-node", a.dom_element ());
         default_values_.push_back (&node);
@@ -4213,14 +4213,14 @@ namespace XSDFrontend
         // Transfer default and fixed values if the ref declaration hasn't
         // defined its own.
         //
-        if (!node.default_ ())
+        if (!node.default_p ())
         {
-          if (prot.fixed ())
+          if (prot.fixed_p ())
             node.fixed (prot.value ());
-          else if (prot.default_ ())
+          else if (prot.default_p ())
             node.default_ (prot.value ());
 
-          if (node.default_ ())
+          if (node.default_p ())
           {
             node.context ().set (
               "dom-node",
@@ -4236,7 +4236,7 @@ namespace XSDFrontend
 
         // Set type.
         //
-        if (prot.typed ())
+        if (prot.typed_p ())
         {
           s_->new_edge<Belongs> (node, prot.type ());
         }
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 ();
       }
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);