Adjust to changed predicate names

10 files changed, 31 insertions, 31 deletions

diff --git a/xsde/cxx/serializer/attribute-validation-source.cxx b/xsde/cxx/serializer/attribute-validation-source.cxx
index 38e0f87..79ae256 100644
--- a/xsde/cxx/serializer/attribute-validation-source.cxx
+++ b/xsde/cxx/serializer/attribute-validation-source.cxx
@@ -105,7 +105,7 @@ namespace CXX
           os << "// " << name << endl
              << "//" << endl;
 
-          if (a.optional ())
+          if (a.optional_p ())
           {
             os << "if (this->" << epresent (a) << " ())";
           }
@@ -147,7 +147,7 @@ namespace CXX
 
           if (exceptions)
           {
-            if (a.qualified () && a.namespace_ ().name ())
+            if (a.qualified_p () && a.namespace_ ().name ())
               os << "this->_start_attribute (" <<
                 strlit (a.namespace_ ().name ()) << ", " <<
                 strlit (a.name ()) << ");";
@@ -158,7 +158,7 @@ namespace CXX
           {
             os << "if (!";
 
-            if (a.qualified () && a.namespace_ ().name ())
+            if (a.qualified_p () && a.namespace_ ().name ())
               os << "this->_start_attribute (" <<
                 strlit (a.namespace_ ().name ()) << ", " <<
                 strlit (a.name ()) << ")";
@@ -210,7 +210,7 @@ namespace CXX
 
           os << "}"; // if (inst)
 
-          if (!a.optional ())
+          if (!a.optional_p ())
           {
             os << "else"
                << "{"
@@ -222,7 +222,7 @@ namespace CXX
 
           os << "}";
 
-          if (a.optional () && !exceptions)
+          if (a.optional_p () && !exceptions)
           {
             os << "if (ctx.error_type ())" << endl
                << "return;"
diff --git a/xsde/cxx/serializer/element-validation-source.cxx b/xsde/cxx/serializer/element-validation-source.cxx
index 06a8aa0..b39fed7 100644
--- a/xsde/cxx/serializer/element-validation-source.cxx
+++ b/xsde/cxx/serializer/element-validation-source.cxx
@@ -434,9 +434,9 @@ namespace CXX
 
           // Only a globally-defined element can be a subst-group root.
           //
-          if (poly && e.global ())
+          if (poly && e.global_p ())
           {
-            if (e.qualified () && e.namespace_ ().name ())
+            if (e.qualified_p () && e.namespace_ ().name ())
               os << "const char* ns = " <<
                 strlit (e.namespace_ ().name ()) << ";";
             else
@@ -477,7 +477,7 @@ namespace CXX
           {
             if (exceptions)
             {
-              if (e.qualified () && e.namespace_ ().name ())
+              if (e.qualified_p () && e.namespace_ ().name ())
                 os << "this->_start_element (" <<
                   strlit (e.namespace_ ().name ()) << ", " <<
                   strlit (e.name ()) << ");";
@@ -488,7 +488,7 @@ namespace CXX
             {
               os << "if (!";
 
-              if (e.qualified () && e.namespace_ ().name ())
+              if (e.qualified_p () && e.namespace_ ().name ())
                 os << "this->_start_element (" <<
                   strlit (e.namespace_ ().name ()) << ", " <<
                   strlit (e.name ()) << ")";
diff --git a/xsde/cxx/serializer/elements.cxx b/xsde/cxx/serializer/elements.cxx
index ba59a82..12a715c 100644
--- a/xsde/cxx/serializer/elements.cxx
+++ b/xsde/cxx/serializer/elements.cxx
@@ -86,7 +86,7 @@ namespace CXX
     {
       using namespace SemanticGraph;
 
-      if (c.mixed ())
+      if (c.mixed_p ())
         return Content::mixed;
 
       if (c.inherits_p ())
diff --git a/xsde/cxx/serializer/elements.hxx b/xsde/cxx/serializer/elements.hxx
index 470d6c4..df1f486 100644
--- a/xsde/cxx/serializer/elements.hxx
+++ b/xsde/cxx/serializer/elements.hxx
@@ -319,7 +319,7 @@ namespace CXX
       virtual Void
       traverse (Type& a)
       {
-        if (!result_ && !a.optional ())
+        if (!result_ && !a.optional_p ())
           result_ = true;
       }
 
diff --git a/xsde/cxx/serializer/impl-header.cxx b/xsde/cxx/serializer/impl-header.cxx
index 82ce803..94b982a 100644
--- a/xsde/cxx/serializer/impl-header.cxx
+++ b/xsde/cxx/serializer/impl-header.cxx
@@ -305,7 +305,7 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Attribute& a)
         {
-          if (a.optional ())
+          if (a.optional_p ())
           {
             os << "virtual bool" << endl
                << epresent (a) << " ();"
diff --git a/xsde/cxx/serializer/impl-source.cxx b/xsde/cxx/serializer/impl-source.cxx
index 74eabbd..280d74c 100644
--- a/xsde/cxx/serializer/impl-source.cxx
+++ b/xsde/cxx/serializer/impl-source.cxx
@@ -455,7 +455,7 @@ namespace CXX
           String const& s (
             eimpl (dynamic_cast<SemanticGraph::Complex&> (a.scope ())));
 
-          if (a.optional ())
+          if (a.optional_p ())
           {
             os << "bool " << s << "::" << endl
                << epresent (a) << " ()"
diff --git a/xsde/cxx/serializer/name-processor.cxx b/xsde/cxx/serializer/name-processor.cxx
index bc7ac8a..ec4c442 100644
--- a/xsde/cxx/serializer/name-processor.cxx
+++ b/xsde/cxx/serializer/name-processor.cxx
@@ -603,7 +603,7 @@ namespace CXX
           {
             String const& base (ac.get<String> ("s:name"));
 
-            if (a.optional ())
+            if (a.optional_p ())
               ac.set ("s:present", find_name (base + L"_present", set_));
 
             ac.set ("s:serializer", find_name (base + L"_serializer", set_));
@@ -615,7 +615,7 @@ namespace CXX
               *ac.get<Attribute*> ("xsd-frontend-restriction-correspondence"));
             SemanticGraph::Context& bc (b.context ());
 
-            if (a.optional ())
+            if (a.optional_p ())
               ac.set ("s:present", bc.get<String> ("s:present"));
 
             ac.set ("s:serializer", bc.get<String> ("s:serializer"));
diff --git a/xsde/cxx/serializer/serializer-header.cxx b/xsde/cxx/serializer/serializer-header.cxx
index b432f15..dd20289 100644
--- a/xsde/cxx/serializer/serializer-header.cxx
+++ b/xsde/cxx/serializer/serializer-header.cxx
@@ -862,7 +862,7 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Attribute& a)
         {
-          if (a.optional ())
+          if (a.optional_p ())
           {
             os << "virtual bool" << endl
                << epresent (a) << " ();"
diff --git a/xsde/cxx/serializer/serializer-source.cxx b/xsde/cxx/serializer/serializer-source.cxx
index e4fd239..a5765a0 100644
--- a/xsde/cxx/serializer/serializer-source.cxx
+++ b/xsde/cxx/serializer/serializer-source.cxx
@@ -1095,9 +1095,9 @@ namespace CXX
 
             // Only a globally-defined element can be a subst-group root.
             //
-            if (poly && e.global ())
+            if (poly && e.global_p ())
             {
-              if (e.qualified () && e.namespace_ ().name ())
+              if (e.qualified_p () && e.namespace_ ().name ())
                 os << "const char* ns = " <<
                   strlit (e.namespace_ ().name ()) << ";";
               else
@@ -1119,7 +1119,7 @@ namespace CXX
             }
             else
             {
-              if (e.qualified () && e.namespace_ ().name ())
+              if (e.qualified_p () && e.namespace_ ().name ())
                 os << "this->_start_element (" <<
                   strlit (e.namespace_ ().name ()) << ", " <<
                   strlit (e.name ()) << ");";
@@ -1177,9 +1177,9 @@ namespace CXX
 
             // Only a globally-defined element can be a subst-group root.
             //
-            if (poly && e.global ())
+            if (poly && e.global_p ())
             {
-              if (e.qualified () && e.namespace_ ().name ())
+              if (e.qualified_p () && e.namespace_ ().name ())
                 os << "const char* ns = " <<
                   strlit (e.namespace_ ().name ()) << ";";
               else
@@ -1207,7 +1207,7 @@ namespace CXX
             }
             else
             {
-              if (e.qualified () && e.namespace_ ().name ())
+              if (e.qualified_p () && e.namespace_ ().name ())
                 os << "if (!this->_start_element (" <<
                   strlit (e.namespace_ ().name ()) << ", " <<
                   strlit (e.name ()) << "))" << endl
@@ -1432,7 +1432,7 @@ namespace CXX
           os << "// " << name << endl
              << "//" << endl;
 
-          if (a.optional ())
+          if (a.optional_p ())
           {
             os << "if (this->" << epresent (a) << " ())";
           }
@@ -1465,7 +1465,7 @@ namespace CXX
             else
               os << "this->" << inst << "->pre (r);";
 
-            if (a.qualified () && a.namespace_ ().name ())
+            if (a.qualified_p () && a.namespace_ ().name ())
               os << "this->_start_attribute (" <<
                 strlit (a.namespace_ ().name ()) << ", " <<
                 strlit (a.name ()) << ");";
@@ -1494,7 +1494,7 @@ namespace CXX
                << "return;"
                << endl;
 
-            if (a.qualified () && a.namespace_ ().name ())
+            if (a.qualified_p () && a.namespace_ ().name ())
               os << "if (!this->_start_attribute (" <<
                 strlit (a.namespace_ ().name ()) << ", " <<
                 strlit (a.name ()) << "))" << endl
@@ -1545,7 +1545,7 @@ namespace CXX
           os << "}"  // if (inst)
              << "}";
 
-          if (a.optional () && !exceptions)
+          if (a.optional_p () && !exceptions)
           {
             os << "if (ctx.error_type ())" << endl
                << "return;"
@@ -2160,7 +2160,7 @@ namespace CXX
           if (tiein)
             impl = etiein (dynamic_cast<SemanticGraph::Type&> (a.scope ()));
 
-          if (a.optional ())
+          if (a.optional_p ())
           {
             String const& present (epresent (a));
 
diff --git a/xsde/cxx/serializer/validator.cxx b/xsde/cxx/serializer/validator.cxx
index f5125e0..b3e60d9 100644
--- a/xsde/cxx/serializer/validator.cxx
+++ b/xsde/cxx/serializer/validator.cxx
@@ -54,7 +54,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 ());
 
@@ -108,7 +108,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 ())
             {
@@ -144,7 +144,7 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Type& t)
         {
-          if (t.named ())
+          if (t.named_p ())
           {
             types_.insert (t.scope ().name () + L"#" + t.name ());
           }
@@ -218,7 +218,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> ())
           {