Make sure we don't process sourced schemas more than once

14 files changed, 17 insertions, 17 deletions

diff --git a/xsde/cxx/parser/attribute-validation-source.cxx b/xsde/cxx/parser/attribute-validation-source.cxx
index 8a30e25..c82e8f0 100644
--- a/xsde/cxx/parser/attribute-validation-source.cxx
+++ b/xsde/cxx/parser/attribute-validation-source.cxx
@@ -449,7 +449,7 @@ namespace CXX
     {
       Traversal::Schema schema;
 
-      Traversal::Sources sources;
+      Sources sources;
       Traversal::Names schema_names;
 
       Namespace ns (ctx);
diff --git a/xsde/cxx/parser/characters-validation-source.cxx b/xsde/cxx/parser/characters-validation-source.cxx
index c07e031..f17b135 100644
--- a/xsde/cxx/parser/characters-validation-source.cxx
+++ b/xsde/cxx/parser/characters-validation-source.cxx
@@ -56,7 +56,7 @@ namespace CXX
       //
       Traversal::Schema schema;
 
-      Traversal::Sources sources;
+      Sources sources;
       Traversal::Names schema_names;
 
       Namespace ns (ctx);
diff --git a/xsde/cxx/parser/driver-source.cxx b/xsde/cxx/parser/driver-source.cxx
index 897c1ca..516b836 100644
--- a/xsde/cxx/parser/driver-source.cxx
+++ b/xsde/cxx/parser/driver-source.cxx
@@ -782,7 +782,7 @@ namespace CXX
       SemanticGraph::Element* root (0);
       {
         Traversal::Schema schema;
-        Traversal::Sources sources;
+        Sources sources;
 
         schema >> sources >> schema;
 
diff --git a/xsde/cxx/parser/element-validation-source.cxx b/xsde/cxx/parser/element-validation-source.cxx
index 1ea9cab..e1216f7 100644
--- a/xsde/cxx/parser/element-validation-source.cxx
+++ b/xsde/cxx/parser/element-validation-source.cxx
@@ -2077,7 +2077,7 @@ namespace CXX
           // In case of an inheritance-by-extension, call our base first.
           // We don't need to generate this code for the 'all' compositor
           // because it can only inherit from the empty content model.
-          // Sattes of the root machine for sequence and choice:
+          // States of the root machine for sequence and choice:
           //
           //  0 - calling base
           //  1 - base returned false
@@ -2292,7 +2292,7 @@ namespace CXX
 
       Traversal::Schema schema;
 
-      Traversal::Sources sources;
+      Sources sources;
       Traversal::Names schema_names;
 
       Namespace ns (ctx);
diff --git a/xsde/cxx/parser/impl-header.cxx b/xsde/cxx/parser/impl-header.cxx
index 44a5b39..e909ce5 100644
--- a/xsde/cxx/parser/impl-header.cxx
+++ b/xsde/cxx/parser/impl-header.cxx
@@ -282,7 +282,7 @@ namespace CXX
     {
       Traversal::Schema schema;
 
-      Traversal::Sources sources;
+      Sources sources;
       Includes includes (ctx, Includes::impl_header);
       Traversal::Names schema_names;
 
diff --git a/xsde/cxx/parser/impl-source.cxx b/xsde/cxx/parser/impl-source.cxx
index 10c63a2..e9b87ca 100644
--- a/xsde/cxx/parser/impl-source.cxx
+++ b/xsde/cxx/parser/impl-source.cxx
@@ -518,7 +518,7 @@ namespace CXX
 
       Traversal::Schema schema;
 
-      Traversal::Sources sources;
+      Sources sources;
       Traversal::Names schema_names;
 
       Namespace ns (ctx);
diff --git a/xsde/cxx/parser/name-processor.cxx b/xsde/cxx/parser/name-processor.cxx
index c3c2ec3..ab8f318 100644
--- a/xsde/cxx/parser/name-processor.cxx
+++ b/xsde/cxx/parser/name-processor.cxx
@@ -1287,7 +1287,7 @@ namespace CXX
           //
           {
             Traversal::Schema schema;
-            Traversal::Sources sources;
+            Sources sources;
 
             schema >> sources >> schema;
 
diff --git a/xsde/cxx/parser/parser-forward.cxx b/xsde/cxx/parser/parser-forward.cxx
index 8d02cb9..f2ee20b 100644
--- a/xsde/cxx/parser/parser-forward.cxx
+++ b/xsde/cxx/parser/parser-forward.cxx
@@ -85,7 +85,7 @@ namespace CXX
 
       Traversal::Schema schema;
 
-      Traversal::Sources sources;
+      Sources sources;
       Traversal::Names schema_names;
 
       Namespace ns (ctx);
diff --git a/xsde/cxx/parser/parser-header.cxx b/xsde/cxx/parser/parser-header.cxx
index 9d45b45..238b5e6 100644
--- a/xsde/cxx/parser/parser-header.cxx
+++ b/xsde/cxx/parser/parser-header.cxx
@@ -1899,7 +1899,7 @@ namespace CXX
       {
         Traversal::Schema schema;
 
-        Traversal::Sources sources;
+        Sources sources;
         Includes includes (ctx, Includes::header);
         Traversal::Names schema_names;
 
diff --git a/xsde/cxx/parser/parser-inline.cxx b/xsde/cxx/parser/parser-inline.cxx
index 774dc8d..ac8ae2a 100644
--- a/xsde/cxx/parser/parser-inline.cxx
+++ b/xsde/cxx/parser/parser-inline.cxx
@@ -919,7 +919,7 @@ namespace CXX
 
       Traversal::Schema schema;
 
-      Traversal::Sources sources;
+      Sources sources;
       Traversal::Names schema_names;
 
       Namespace ns (ctx);
diff --git a/xsde/cxx/parser/parser-source.cxx b/xsde/cxx/parser/parser-source.cxx
index 68a2338..e7a4fe3 100644
--- a/xsde/cxx/parser/parser-source.cxx
+++ b/xsde/cxx/parser/parser-source.cxx
@@ -1642,7 +1642,7 @@ namespace CXX
 
       Traversal::Schema schema;
 
-      Traversal::Sources sources;
+      Sources sources;
       Traversal::Names schema_names;
 
       Namespace ns (ctx);
diff --git a/xsde/cxx/parser/state-processor.cxx b/xsde/cxx/parser/state-processor.cxx
index cd46472..3caeb00 100644
--- a/xsde/cxx/parser/state-processor.cxx
+++ b/xsde/cxx/parser/state-processor.cxx
@@ -301,7 +301,7 @@ namespace CXX
     process (SemanticGraph::Schema& tu, SemanticGraph::Path const&)
     {
       Traversal::Schema schema;
-      Traversal::Sources sources;
+      Sources sources;
       Traversal::Names schema_names;
       Traversal::Namespace ns;
       Traversal::Names ns_names;
diff --git a/xsde/cxx/parser/type-processor.cxx b/xsde/cxx/parser/type-processor.cxx
index 8b35250..07fa413 100644
--- a/xsde/cxx/parser/type-processor.cxx
+++ b/xsde/cxx/parser/type-processor.cxx
@@ -308,7 +308,7 @@ namespace CXX
           //
           Traversal::Schema schema;
           Traversal::Schema xs_schema;
-          Traversal::Sources sources;
+          Sources sources;
           Traversal::Implies implies;
 
           schema >> sources >> schema;
diff --git a/xsde/cxx/parser/validator.cxx b/xsde/cxx/parser/validator.cxx
index da5caf1..08029e1 100644
--- a/xsde/cxx/parser/validator.cxx
+++ b/xsde/cxx/parser/validator.cxx
@@ -380,7 +380,7 @@ namespace CXX
       private:
         Containers::Set<String> types_;
 
-        Traversal::Sources sources_;
+        Sources sources_;
 
         Traversal::Names schema_names_;
         Traversal::Namespace ns_;
@@ -525,7 +525,7 @@ namespace CXX
 
         Containers::Set<String> types_;
 
-        Traversal::Sources sources_;
+        Sources sources_;
 
         Traversal::Names schema_names_;
         Traversal::Namespace ns_;
@@ -688,7 +688,7 @@ namespace CXX
         SemanticGraph::Element* element (0);
 
         Traversal::Schema schema;
-        Traversal::Sources sources;
+        Sources sources;
 
         schema >> sources >> schema;