Adjust to changed predicate names

8 files changed, 24 insertions, 25 deletions

diff --git a/xsde/cxx/parser/attribute-validation-source.cxx b/xsde/cxx/parser/attribute-validation-source.cxx
index 218f192..22c70c4 100644
--- a/xsde/cxx/parser/attribute-validation-source.cxx
+++ b/xsde/cxx/parser/attribute-validation-source.cxx
@@ -28,7 +28,7 @@ namespace CXX
         {
           String const& name (a.name ());
 
-          if (a.qualified () && a.namespace_ ().name ())
+          if (a.qualified_p () && a.namespace_ ().name ())
           {
             String const& ns (a.namespace_ ().name ());
 
@@ -151,7 +151,7 @@ namespace CXX
 
           os << "}";
 
-          if (!a.optional ())
+          if (!a.optional_p ())
             os << "static_cast< v_state_attr_* > (" <<
               "this->v_state_attr_stack_.top ())->" << name << " = true;";
 
@@ -204,7 +204,7 @@ namespace CXX
         virtual Void
         traverse (Type& a)
         {
-          if (!a.optional ())
+          if (!a.optional_p ())
             os << "as." << ename (a) << " = false;";
         }
       };
@@ -222,9 +222,9 @@ namespace CXX
         virtual Void
         traverse (Type& a)
         {
-          if (!a.optional ())
+          if (!a.optional_p ())
           {
-            String ns (a.qualified () ? a.namespace_ ().name () : String ());
+            String ns (a.qualified_p () ? a.namespace_ ().name () : String ());
 
             os << "if (!as." << ename (a) << ")"
                << "{"
diff --git a/xsde/cxx/parser/characters-validation-source.cxx b/xsde/cxx/parser/characters-validation-source.cxx
index bcc5a22..f4f1bf5 100644
--- a/xsde/cxx/parser/characters-validation-source.cxx
+++ b/xsde/cxx/parser/characters-validation-source.cxx
@@ -26,7 +26,7 @@ namespace CXX
         virtual Void
         traverse (Type& c)
         {
-          if (!c.mixed ())
+          if (!c.mixed_p ())
             return;
 
           String const& name (ename (c));
@@ -73,4 +73,3 @@ namespace CXX
     }
   }
 }
-
diff --git a/xsde/cxx/parser/element-validation-source.cxx b/xsde/cxx/parser/element-validation-source.cxx
index c1ca326..5533549 100644
--- a/xsde/cxx/parser/element-validation-source.cxx
+++ b/xsde/cxx/parser/element-validation-source.cxx
@@ -211,12 +211,12 @@ namespace CXX
         traverse (SemanticGraph::Element& e)
         {
           String const& name (e.name ());
-          Boolean subst (poly_code && e.global ());
+          Boolean subst (poly_code && e.global_p ());
 
           if (subst)
             os << "(";
 
-          if (e.qualified () && e.namespace_ ().name ())
+          if (e.qualified_p () && e.namespace_ ().name ())
           {
             String const& ns (e.namespace_ ().name ());
 
@@ -338,7 +338,7 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Element& e)
         {
-          String ns (e.qualified () ? e.namespace_ ().name () : String ());
+          String ns (e.qualified_p () ? e.namespace_ ().name () : String ());
 
           os << L << strlit (ns) << ", " << L << strlit (e.name ());
         }
@@ -1323,7 +1323,7 @@ namespace CXX
               continue;
 
             Element& e (dynamic_cast<Element&> (ci->particle ()));
-            String ns (e.qualified () ? e.namespace_ ().name () : String ());
+            String ns (e.qualified_p () ? e.namespace_ ().name () : String ());
             UnsignedLong state (e.context ().get<UnsignedLong> ("p:state"));
 
             os << "if (count[" << state << "UL] == 0)"
diff --git a/xsde/cxx/parser/elements.cxx b/xsde/cxx/parser/elements.cxx
index fafcd52..0b98370 100644
--- a/xsde/cxx/parser/elements.cxx
+++ b/xsde/cxx/parser/elements.cxx
@@ -85,7 +85,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/parser/elements.hxx b/xsde/cxx/parser/elements.hxx
index f603400..4af395f 100644
--- a/xsde/cxx/parser/elements.hxx
+++ b/xsde/cxx/parser/elements.hxx
@@ -305,7 +305,7 @@ namespace CXX
       virtual Void
       traverse (Type& a)
       {
-        if (!result_ && !a.optional ())
+        if (!result_ && !a.optional_p ())
           result_ = true;
       }
 
diff --git a/xsde/cxx/parser/parser-header.cxx b/xsde/cxx/parser/parser-header.cxx
index 5bc9cb7..5062337 100644
--- a/xsde/cxx/parser/parser-header.cxx
+++ b/xsde/cxx/parser/parser-header.cxx
@@ -662,7 +662,7 @@ namespace CXX
         virtual Void
         traverse (Type& a)
         {
-          if (!a.optional ())
+          if (!a.optional_p ())
           {
             os << "bool " << ename (a) << ";";
           }
@@ -1011,7 +1011,7 @@ namespace CXX
 
           // characters
           //
-          if (validation && c.mixed ())
+          if (validation && c.mixed_p ())
           {
             os << "protected:" << endl
                << "virtual bool" << endl
diff --git a/xsde/cxx/parser/parser-source.cxx b/xsde/cxx/parser/parser-source.cxx
index f4da879..521f810 100644
--- a/xsde/cxx/parser/parser-source.cxx
+++ b/xsde/cxx/parser/parser-source.cxx
@@ -487,10 +487,10 @@ namespace CXX
         traverse (Type& e)
         {
           Boolean poly (poly_code && !anonymous (e.type ()));
-          Boolean subst (poly && e.global ());
+          Boolean subst (poly && e.global_p ());
           String const& inst (poly ? emember_cache (e) : emember (e));
 
-          if (e.qualified () && e.namespace_ ().name ())
+          if (e.qualified_p () && e.namespace_ ().name ())
           {
             os << "if (" << (subst ? "(" : "") <<
               "n == " << strlit (e.name ()) << " &&" << endl
@@ -600,10 +600,10 @@ namespace CXX
         {
           String const& name (ename (e));
           Boolean poly (poly_code && !anonymous (e.type ()));
-          Boolean subst (poly && e.global ());
+          Boolean subst (poly && e.global_p ());
           String const& inst (poly ? emember_cache (e) : emember (e));
 
-          if (e.qualified () && e.namespace_ ().name ())
+          if (e.qualified_p () && e.namespace_ ().name ())
           {
             os << "if (" << (subst ? "(" : "") <<
               "n == " << strlit (e.name ()) << " &&" << endl
@@ -701,7 +701,7 @@ namespace CXX
           String const& name (ename (a));
           String const& inst (emember (a));
 
-          if (a.qualified () && a.namespace_ ().name ())
+          if (a.qualified_p () && a.namespace_ ().name ())
           {
             os << "if (n == " << L << strlit (a.name ()) << " &&" << endl
                << "ns == " << L << strlit (a.namespace_ ().name ()) << ")"
diff --git a/xsde/cxx/parser/validator.cxx b/xsde/cxx/parser/validator.cxx
index 520ede6..aa0a6df 100644
--- a/xsde/cxx/parser/validator.cxx
+++ b/xsde/cxx/parser/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 ());
 
@@ -105,7 +105,7 @@ namespace CXX
           {
             using SemanticGraph::Any;
 
-            Boolean q (e.qualified ());
+            Boolean q (e.qualified_p ());
             String ns (q ? e.namespace_ ().name () : "");
 
             for (Any::NamespaceIterator i (any_.namespace_begin ());
@@ -290,7 +290,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 ())
             {
@@ -328,7 +328,7 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Type& t)
         {
-          if (t.named ())
+          if (t.named_p ())
           {
             types_.insert (t.scope ().name () + L"#" + t.name ());
           }
@@ -409,7 +409,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> ())
           {