Adjust to changed predicate names

12 files changed, 43 insertions, 43 deletions

diff --git a/xsde/cxx/hybrid/aggregate-include.hxx b/xsde/cxx/hybrid/aggregate-include.hxx
index 87de6c0..cffbd9c 100644
--- a/xsde/cxx/hybrid/aggregate-include.hxx
+++ b/xsde/cxx/hybrid/aggregate-include.hxx
@@ -134,7 +134,7 @@ namespace CXX
         //
         for (;;)
         {
-          if (!s->used ())
+          if (!s->used_p ())
             break;
 
           SemanticGraph::Uses& u (*s->used_begin ());
diff --git a/xsde/cxx/hybrid/extraction-source.cxx b/xsde/cxx/hybrid/extraction-source.cxx
index a437613..3b98100 100644
--- a/xsde/cxx/hybrid/extraction-source.cxx
+++ b/xsde/cxx/hybrid/extraction-source.cxx
@@ -164,7 +164,7 @@ namespace CXX
         {
           // Nothing is serialized for fixed attributes.
           //
-          if (a.fixed ())
+          if (a.fixed_p ())
             return;
 
           SemanticGraph::Type& t (a.type ());
@@ -182,9 +182,9 @@ namespace CXX
 
           os << "{";
 
-          if (a.optional ())
+          if (a.optional_p ())
           {
-            if (!a.default_ ())
+            if (!a.default_p ())
             {
               os << "bool p;";
 
@@ -257,9 +257,9 @@ namespace CXX
                  << "return false;";
           }
 
-          if (a.optional ())
+          if (a.optional_p ())
           {
-            if (!a.default_ ())
+            if (!a.default_p ())
             {
               os << "}"
                  << "else" << endl
diff --git a/xsde/cxx/hybrid/insertion-source.cxx b/xsde/cxx/hybrid/insertion-source.cxx
index 1324147..2122e8a 100644
--- a/xsde/cxx/hybrid/insertion-source.cxx
+++ b/xsde/cxx/hybrid/insertion-source.cxx
@@ -147,12 +147,12 @@ namespace CXX
         {
           // Don't waste space on fixed attributes.
           //
-          if (a.fixed ())
+          if (a.fixed_p ())
             return;
 
-          if (a.optional ())
+          if (a.optional_p ())
           {
-            if (!a.default_ ())
+            if (!a.default_p ())
             {
               String const& present (epresent (a));
 
@@ -190,7 +190,7 @@ namespace CXX
             os << "if (!(s << x." << name << " ()))" << endl
                << "return false;";
 
-          if (a.optional ())
+          if (a.optional_p ())
             os << "}";
         }
       };
diff --git a/xsde/cxx/hybrid/parser-header.cxx b/xsde/cxx/hybrid/parser-header.cxx
index 65f7024..d67cdca 100644
--- a/xsde/cxx/hybrid/parser-header.cxx
+++ b/xsde/cxx/hybrid/parser-header.cxx
@@ -543,7 +543,7 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Attribute& a)
         {
-          if (a.fixed ())
+          if (a.fixed_p ())
             return;
 
           String const& arg (parg_type (a.type ()));
diff --git a/xsde/cxx/hybrid/parser-source.cxx b/xsde/cxx/hybrid/parser-source.cxx
index c13cbd2..525f364 100644
--- a/xsde/cxx/hybrid/parser-source.cxx
+++ b/xsde/cxx/hybrid/parser-source.cxx
@@ -1300,7 +1300,7 @@ namespace CXX
         {
           using SemanticGraph::Complex;
 
-          if (a.fixed ())
+          if (a.fixed_p ())
             return;
 
           String const& name (epname (a));
diff --git a/xsde/cxx/hybrid/serializer-header.cxx b/xsde/cxx/hybrid/serializer-header.cxx
index 55b1697..ad56f43 100644
--- a/xsde/cxx/hybrid/serializer-header.cxx
+++ b/xsde/cxx/hybrid/serializer-header.cxx
@@ -461,7 +461,7 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Attribute& a)
         {
-          if (a.optional ())
+          if (a.optional_p ())
           {
             os << "virtual bool" << endl
                << espresent (a) << " ();"
diff --git a/xsde/cxx/hybrid/serializer-source.cxx b/xsde/cxx/hybrid/serializer-source.cxx
index b9099f6..9377c5f 100644
--- a/xsde/cxx/hybrid/serializer-source.cxx
+++ b/xsde/cxx/hybrid/serializer-source.cxx
@@ -1044,17 +1044,17 @@ namespace CXX
 
           String access (access_seq (a));
 
-          if (a.optional ())
+          if (a.optional_p ())
           {
             os << "bool " << s << "::" << endl
                << espresent (a) << " ()"
                << "{";
 
-            if (a.default_ ())
+            if (a.default_p ())
             {
               Boolean omit (options.value<CLI::omit_default_attributes> ());
 
-              if (a.fixed ())
+              if (a.fixed_p ())
                 os << "return " << (omit ? "false" : "true") << ";";
               else
               {
diff --git a/xsde/cxx/hybrid/tree-header.cxx b/xsde/cxx/hybrid/tree-header.cxx
index a7bf6ed..7e748bb 100644
--- a/xsde/cxx/hybrid/tree-header.cxx
+++ b/xsde/cxx/hybrid/tree-header.cxx
@@ -977,7 +977,7 @@ namespace CXX
           virtual Void
           traverse (Type& a)
           {
-            if (!a.fixed ())
+            if (!a.fixed_p ())
               Traversal::Attribute::traverse (a);
           }
         };
@@ -1002,14 +1002,14 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Attribute& a)
         {
-          if (!a.fixed ())
+          if (!a.fixed_p ())
           {
             SemanticGraph::Type& t (a.type ());
 
             var_.dispatch (t);
             os << " " << emember (a) << ";";
 
-            if (a.optional () && !a.default_ () && fixed_length (t))
+            if (a.optional_p () && !a.default_p () && fixed_length (t))
               os << "unsigned char " << epresent_member (a) << ";";
           }
         }
@@ -1317,14 +1317,14 @@ namespace CXX
           os << "// " << comment (a.name ()) << endl
              << "// " << endl;
 
-          Boolean def (a.default_ ());
-          Boolean fix (a.fixed ());
+          Boolean def (a.default_p ());
+          Boolean fix (a.fixed_p ());
 
           String const& name (ename (a));
           SemanticGraph::Type& t (a.type ());
 
 
-          if (a.optional () && !fix)
+          if (a.optional_p () && !fix)
           {
             String const& name (def ? edefault (a) : epresent (a));
 
diff --git a/xsde/cxx/hybrid/tree-inline.cxx b/xsde/cxx/hybrid/tree-inline.cxx
index d2e625f..1da9261 100644
--- a/xsde/cxx/hybrid/tree-inline.cxx
+++ b/xsde/cxx/hybrid/tree-inline.cxx
@@ -357,8 +357,8 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Attribute& a)
         {
-          Boolean def (a.default_ ());
-          Boolean fix (a.fixed ());
+          Boolean def (a.default_p ());
+          Boolean fix (a.fixed_p ());
 
           String const& name (ename (a));
           String member;
@@ -370,7 +370,7 @@ namespace CXX
           Boolean fl (fixed_length (t));
           String scope (Context::scope (a));
 
-          if (a.optional () && !fix)
+          if (a.optional_p () && !fix)
           {
             String const& name (def ? edefault (a) : epresent (a));
 
@@ -537,7 +537,7 @@ namespace CXX
 
             os << "this->" << member << " = x;";
 
-            if (fl && !def && a.optional ())
+            if (fl && !def && a.optional_p ())
               os << "this->" << epresent_member (a) << " = true;";
 
             os << "}";
diff --git a/xsde/cxx/hybrid/tree-name-processor.cxx b/xsde/cxx/hybrid/tree-name-processor.cxx
index 10a9280..95aab7b 100644
--- a/xsde/cxx/hybrid/tree-name-processor.cxx
+++ b/xsde/cxx/hybrid/tree-name-processor.cxx
@@ -409,14 +409,14 @@ namespace CXX
         {
           SemanticGraph::Context& ac (a.context ());
 
-          Boolean def (a.default_ ());
-          Boolean fix (a.fixed ());
+          Boolean def (a.default_p ());
+          Boolean fix (a.fixed_p ());
 
           String const& base (ac.get<String> ("name"));
 
           if (!data_members_)
           {
-            if (a.optional () && !fix)
+            if (a.optional_p () && !fix)
             {
               String n;
               if (def)
@@ -440,7 +440,7 @@ namespace CXX
           }
           else if (!fix)
           {
-            if (a.optional () && !a.default_ () && fixed_length (a.type ()))
+            if (a.optional_p () && !a.default_p () && fixed_length (a.type ()))
             {
               ac.set ("present-member",
                       find_name (ac.get<String> ("present") + L"_", set_));
diff --git a/xsde/cxx/hybrid/tree-source.cxx b/xsde/cxx/hybrid/tree-source.cxx
index 0c988c1..ba2562d 100644
--- a/xsde/cxx/hybrid/tree-source.cxx
+++ b/xsde/cxx/hybrid/tree-source.cxx
@@ -314,7 +314,7 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Attribute& a)
         {
-          if (a.default_ ())
+          if (a.default_p ())
           {
             SemanticGraph::Type& t (a.type ());
 
@@ -797,9 +797,9 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Attribute& a)
         {
-          if (!a.fixed ())
+          if (!a.fixed_p ())
           {
-            Boolean def (a.default_ ());
+            Boolean def (a.default_p ());
             Boolean fl (fixed_length (a.type ()));
 
             if (!fl)
@@ -812,7 +812,7 @@ namespace CXX
                 edefault_value (a) << " ();";
             }
 
-            if (fl && !def && a.optional ())
+            if (fl && !def && a.optional_p ())
               os << "this->" << epresent_member (a) << " = false;";
           }
         }
@@ -934,7 +934,7 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Attribute& a)
         {
-          if (!a.fixed ())
+          if (!a.fixed_p ())
           {
             SemanticGraph::Type& t (a.type ());
 
@@ -1063,11 +1063,11 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Attribute& a)
         {
-          if (!a.fixed ())
+          if (!a.fixed_p ())
           {
             String const& member (emember (a));
 
-            if (a.optional () && !a.default_ ())
+            if (a.optional_p () && !a.default_p ())
             {
               String const& present (epresent_member (a));
 
@@ -1207,11 +1207,11 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Attribute& a)
         {
-          if (!a.fixed ())
+          if (!a.fixed_p ())
           {
             String const& member (emember (a));
 
-            if (a.optional () && !a.default_ ())
+            if (a.optional_p () && !a.default_p ())
             {
               String const& present (epresent_member (a));
 
diff --git a/xsde/cxx/hybrid/validator.cxx b/xsde/cxx/hybrid/validator.cxx
index 7641025..579af88 100644
--- a/xsde/cxx/hybrid/validator.cxx
+++ b/xsde/cxx/hybrid/validator.cxx
@@ -57,7 +57,7 @@ namespace CXX
           if (n.is_a<SemanticGraph::Namespace> ())
             return L"<namespace-level>"; // There is a bug if you see this.
 
-          assert (n.named ());
+          assert (n.named_p ());
 
           SemanticGraph::Scope& scope (n.scope ());
 
@@ -111,7 +111,7 @@ namespace CXX
           {
             SemanticGraph::Type& t (c.inherits ().base ());
 
-            if (t.named () &&
+            if (t.named_p () &&
                 types_.find (
                   t.scope ().name () + L"#" + t.name ()) == types_.end ())
             {
@@ -147,7 +147,7 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Type& t)
         {
-          if (t.named ())
+          if (t.named_p ())
           {
             types_.insert (t.scope ().name () + L"#" + t.name ());
           }
@@ -221,7 +221,7 @@ namespace CXX
         {
           SemanticGraph::Type& t (m.type ());
 
-          if (!t.named ()
+          if (!t.named_p ()
               && !t.is_a<SemanticGraph::Fundamental::IdRef> ()
               && !t.is_a<SemanticGraph::Fundamental::IdRefs> ())
           {