Add support for translating schema paths in fpt mode

New options: --schema-file-regex, --schema-file-regex-trace.

3 files changed, 38 insertions, 16 deletions

diff --git a/xsde/cxx/parser/elements.cxx b/xsde/cxx/parser/elements.cxx
index 2261abd..fafcd52 100644
--- a/xsde/cxx/parser/elements.cxx
+++ b/xsde/cxx/parser/elements.cxx
@@ -206,6 +206,7 @@ namespace CXX
       // Support for weak (forward) inclusion used in the file-per-type
       // compilation model.
       //
+      SemanticGraph::Schema& s (u.schema ());
       Boolean weak (u.context ().count ("weak"));
 
       if (weak && (type_ == header || type_ == impl_header))
@@ -214,7 +215,7 @@ namespace CXX
         // in the impl files.
         //
         if (type_ == header)
-          schema_.dispatch (u.schema ());
+          schema_.dispatch (s);
 
         return;
       }
@@ -222,7 +223,10 @@ namespace CXX
       if (type_ == source && !weak)
         return;
 
-      SemanticGraph::Path path (u.path ());
+      SemanticGraph::Path path (
+        s.context ().count ("renamed")
+        ? s.context ().get<SemanticGraph::Path> ("renamed")
+        : u.path ());
 
       // Try to use the portable representation of the path. If that
       // fails, fall back to the native representation.
diff --git a/xsde/cxx/parser/generator.cxx b/xsde/cxx/parser/generator.cxx
index 1645525..c8a9f68 100644
--- a/xsde/cxx/parser/generator.cxx
+++ b/xsde/cxx/parser/generator.cxx
@@ -613,6 +613,7 @@ namespace CXX
   generate (Parser::CLI::Options const& ops,
             Schema& schema,
             Path const& file_path,
+            Boolean fpt,
             TypeMap::Namespaces& type_map,
             Boolean gen_driver,
             const WarningSet& disabled_warnings,
@@ -949,23 +950,13 @@ namespace CXX
         cxx_driver_path = Path (cxx_driver_name, boost::filesystem::native);
       }
 
-      if (NarrowString dir  = ops.value<CLI::output_dir> ())
+      Path out_dir;
+
+      if (NarrowString dir = ops.value<CLI::output_dir> ())
       {
         try
         {
-          Path path (dir, boost::filesystem::native);
-
-          hxx_path = path / hxx_path;
-          ixx_path = path / ixx_path;
-          cxx_path = path / cxx_path;
-
-          if (impl || driver)
-          {
-            hxx_impl_path = path / hxx_impl_path;
-            cxx_impl_path = path / cxx_impl_path;
-            cxx_driver_path = path /cxx_driver_path;
-          }
-
+          out_dir = Path (dir, boost::filesystem::native);
         }
         catch (InvalidPath const&)
         {
@@ -974,6 +965,32 @@ namespace CXX
         }
       }
 
+      if (fpt && !generate_xml_schema)
+      {
+        // In the file-per-type mode the schema files are always local
+        // unless the user added the directory so that we propagate this
+        // to the output files.
+        //
+        Path fpt_dir (file_path.branch_path ());
+
+        if (!fpt_dir.empty ())
+          out_dir /= fpt_dir;
+      }
+
+      if (!out_dir.empty ())
+      {
+        hxx_path = out_dir / hxx_path;
+        ixx_path = out_dir / ixx_path;
+        cxx_path = out_dir / cxx_path;
+
+        if (impl || driver)
+        {
+          hxx_impl_path = out_dir / hxx_impl_path;
+          cxx_impl_path = out_dir / cxx_impl_path;
+          cxx_driver_path = out_dir /cxx_driver_path;
+        }
+      }
+
       // Open the impl files first so that if open fails, the skel files
       // are not deleted.
       //
diff --git a/xsde/cxx/parser/generator.hxx b/xsde/cxx/parser/generator.hxx
index 10b3dd3..9c8f680 100644
--- a/xsde/cxx/parser/generator.hxx
+++ b/xsde/cxx/parser/generator.hxx
@@ -50,6 +50,7 @@ namespace CXX
       generate (CLI::Options const&,
                 XSDFrontend::SemanticGraph::Schema&,
                 XSDFrontend::SemanticGraph::Path const&,
+                Boolean file_per_type,
                 TypeMap::Namespaces& type_map,
                 Boolean gen_driver,
                 const WarningSet& disabled_warnings,