Support for schema evolution using substitution groups

New examples: hybrid/evolution/ignore and hybrid/evolution/passthrough.

5 files changed, 19 insertions, 6 deletions

diff --git a/xsde/cxx/parser/element-validation-source.cxx b/xsde/cxx/parser/element-validation-source.cxx
index 5533549..82428f6 100644
--- a/xsde/cxx/parser/element-validation-source.cxx
+++ b/xsde/cxx/parser/element-validation-source.cxx
@@ -494,9 +494,7 @@ namespace CXX
           }
           else
           {
-            os << "ctx.current_.any_ = true;"
-               << "ctx.current_.depth_++;"
-               << endl
+            os << "ctx.start_wildcard_content ();"
                << "this->_start_any_element (ns, n" <<
               (poly_runtime ? (poly_code ? ", t" : ", 0") : "") << ");"
                << "}"
diff --git a/xsde/cxx/parser/parser-header.cxx b/xsde/cxx/parser/parser-header.cxx
index 2498768..bf9e31e 100644
--- a/xsde/cxx/parser/parser-header.cxx
+++ b/xsde/cxx/parser/parser-header.cxx
@@ -1625,6 +1625,11 @@ namespace CXX
                << "using ::xsde::cxx::parser::parser_map_impl;"
                << endl;
 
+            os << "// Parser substitution map callack." << endl
+               << "//" << endl
+               << "using ::xsde::cxx::parser::parser_smap_callback;"
+               << endl;
+
             os << "// Substitution and inheritance hashmaps load querying." << endl
                << "//" << endl
                << "using ::xsde::cxx::parser::parser_smap_buckets;"
@@ -1775,6 +1780,7 @@ namespace CXX
         if (ctx.poly_code)
         {
           ctx.os << "#include <xsde/cxx/parser/map.hxx>" << endl
+                 << "#include <xsde/cxx/parser/substitution-map-callback.hxx>" << endl
                  << "#include <xsde/cxx/parser/substitution-map-load.hxx>" << endl;
 
           if (ctx.validation)
diff --git a/xsde/cxx/serializer/element-validation-source.cxx b/xsde/cxx/serializer/element-validation-source.cxx
index 3ca784d..bb09275 100644
--- a/xsde/cxx/serializer/element-validation-source.cxx
+++ b/xsde/cxx/serializer/element-validation-source.cxx
@@ -447,7 +447,8 @@ namespace CXX
 
             os << "if (dt != 0 && " <<
               "::xsde::cxx::serializer::substitution_map_instance ()" <<
-              ".check (ns, n, dt))" << endl
+              ".check (ns, n, dt, " << (ret == L"void" ? "0" : "&r") <<
+              "))" << endl
                << "dt = 0;"
                << endl;
 
diff --git a/xsde/cxx/serializer/serializer-header.cxx b/xsde/cxx/serializer/serializer-header.cxx
index bf2c724..2d65cf2 100644
--- a/xsde/cxx/serializer/serializer-header.cxx
+++ b/xsde/cxx/serializer/serializer-header.cxx
@@ -1787,6 +1787,11 @@ namespace CXX
                << "using ::xsde::cxx::serializer::serializer_map_impl;"
                << endl;
 
+            os << "// Serializer substitution map callack." << endl
+               << "//" << endl
+               << "using ::xsde::cxx::serializer::serializer_smap_callback;"
+               << endl;
+
             os << "// Substitution and inheritance hashmaps load querying." << endl
                << "//" << endl
                << "using ::xsde::cxx::serializer::serializer_smap_buckets;"
@@ -1938,6 +1943,7 @@ namespace CXX
         if (ctx.poly_code)
         {
           ctx.os << "#include <xsde/cxx/serializer/map.hxx>" << endl
+                 << "#include <xsde/cxx/serializer/substitution-map-callback.hxx>" << endl
                  << "#include <xsde/cxx/serializer/substitution-map-load.hxx>" << endl;
 
           if (ctx.validation)
diff --git a/xsde/cxx/serializer/serializer-source.cxx b/xsde/cxx/serializer/serializer-source.cxx
index e75a4ed..ab5c123 100644
--- a/xsde/cxx/serializer/serializer-source.cxx
+++ b/xsde/cxx/serializer/serializer-source.cxx
@@ -1108,7 +1108,8 @@ namespace CXX
 
               os << "if (dt != 0 && " <<
                  "::xsde::cxx::serializer::substitution_map_instance ()" <<
-                ".check (ns, n, dt))" << endl
+                ".check (ns, n, dt, " << (ret == L"void" ? "0" : "&r") <<
+                "))" << endl
                  << "dt = 0;"
                  << endl;
 
@@ -1190,7 +1191,8 @@ namespace CXX
 
               os << "if (dt != 0 && " <<
                  "::xsde::cxx::serializer::substitution_map_instance ()" <<
-                ".check (ns, n, dt))" << endl
+                ".check (ns, n, dt, " << (ret == L"void" ? "0" : "&r") <<
+                "))" << endl
                  << "dt = 0;"
                  << endl;