From 4326461b99a97153dd20a24570712adb04df89a9 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 12 Jan 2010 15:16:19 +0200
Subject: Include file component in regex strings for schema being compiled

---
 xsde/cxx/parser/generator.cxx | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'xsde/cxx/parser/generator.cxx')

diff --git a/xsde/cxx/parser/generator.cxx b/xsde/cxx/parser/generator.cxx
index 1936286..1645525 100644
--- a/xsde/cxx/parser/generator.cxx
+++ b/xsde/cxx/parser/generator.cxx
@@ -700,7 +700,7 @@ namespace CXX
         //
         String xns;
         {
-          Context ctx (std::wcerr, schema, ops, 0, 0, 0);
+          Context ctx (std::wcerr, schema, file_path, ops, 0, 0, 0);
           xns = ctx.xs_ns_name ();
         }
 
@@ -1175,7 +1175,8 @@ namespace CXX
       // HXX
       //
       {
-        Context ctx (hxx, schema, ops, &hxx_expr, &ixx_expr, &hxx_impl_expr);
+        Context ctx (
+          hxx, schema, file_path, ops, &hxx_expr, &ixx_expr, &hxx_impl_expr);
 
         Indentation::Clip<Indentation::SLOC, WideChar> hxx_sloc (hxx);
 
@@ -1432,7 +1433,8 @@ namespace CXX
       //
       if (inline_)
       {
-        Context ctx (ixx, schema, ops, &hxx_expr, &ixx_expr, &hxx_impl_expr);
+        Context ctx (
+          ixx, schema, file_path, ops, &hxx_expr, &ixx_expr, &hxx_impl_expr);
 
         Indentation::Clip<Indentation::SLOC, WideChar> ixx_sloc (ixx);
 
@@ -1488,7 +1490,8 @@ namespace CXX
       //
       if (source)
       {
-        Context ctx (cxx, schema, ops, &hxx_expr, &ixx_expr, &hxx_impl_expr);
+        Context ctx (
+          cxx, schema, file_path, ops, &hxx_expr, &ixx_expr, &hxx_impl_expr);
 
         Indentation::Clip<Indentation::SLOC, WideChar> cxx_sloc (cxx);
 
@@ -1552,7 +1555,7 @@ namespace CXX
       //
       if (impl)
       {
-        Context ctx (hxx_impl, schema, ops,
+        Context ctx (hxx_impl, schema, file_path, ops,
                      &hxx_expr, &ixx_expr, &hxx_impl_expr);
 
         String guard (guard_expr.merge (guard_prefix + hxx_impl_name));
@@ -1581,7 +1584,7 @@ namespace CXX
       //
       if (impl)
       {
-        Context ctx (cxx_impl, schema, ops,
+        Context ctx (cxx_impl, schema, file_path, ops,
                      &hxx_expr, &ixx_expr, &hxx_impl_expr);
 
         // Set auto-indentation.
@@ -1598,7 +1601,7 @@ namespace CXX
       //
       if (driver)
       {
-        Context ctx (cxx_driver, schema, ops,
+        Context ctx (cxx_driver, schema, file_path, ops,
                      &hxx_expr, &ixx_expr, &hxx_impl_expr);
 
         // Set auto-indentation.
-- 
cgit v1.1