diff options
Diffstat (limited to 'xsde/cxx/elements.cxx')
-rw-r--r-- | xsde/cxx/elements.cxx | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/xsde/cxx/elements.cxx b/xsde/cxx/elements.cxx index ba93854..cc41e08 100644 --- a/xsde/cxx/elements.cxx +++ b/xsde/cxx/elements.cxx @@ -5,8 +5,6 @@ #include <cxx/elements.hxx> -#include <backend-elements/regex.hxx> - #include <cctype> // std::toupper #include <sstream> #include <iostream> @@ -211,7 +209,7 @@ namespace CXX for (Containers::Vector<NarrowString>::ConstIterator i (nsr.begin ()), e (nsr.end ()); i != e; ++i) { - nsr_mapping_.push_back (Regex (*i)); + nsr_mapping_.push_back (Regex (String (*i))); } // Custom direct mapping. @@ -244,7 +242,7 @@ namespace CXX for (Containers::Vector<NarrowString>::ConstIterator i (ir.begin ()), e (ir.end ()); i != e; ++i) { - include_mapping_.push_back (Regex (*i)); + include_mapping_.push_back (Regex (String (*i))); } // Reserved names. @@ -345,12 +343,12 @@ namespace CXX e != nsr_mapping.rend (); ++e) { if (trace_namespace_regex) - wcerr << "try: '" << e->pattern () << "' : "; + wcerr << "try: '" << e->regex () << "' : "; if (e->match (pair)) { - tmp = e->merge (pair); - tmp = colon.merge (tmp); // replace `/' with `::' + tmp = e->replace (pair); + tmp = colon.replace (tmp); // replace `/' with `::' // Check the result. // @@ -381,7 +379,7 @@ namespace CXX } else { - tmp = colon.merge (n); // replace `/' with `::' + tmp = colon.replace (n); // replace `/' with `::' if (!cxx_id_expr.match (tmp)) { @@ -390,8 +388,8 @@ namespace CXX if (urn_mapping.match (n)) { Regex filter (L"#[.:-]#_#"); - tmp = urn_mapping.merge (n); - tmp = filter.merge (tmp); + tmp = urn_mapping.replace (n); + tmp = filter.replace (tmp); if (!cxx_id_expr.match (tmp)) throw NoNamespaceMapping ( @@ -1120,11 +1118,11 @@ namespace CXX e != include_mapping.rend (); ++e) { if (trace_include_regex) - wcerr << "try: '" << e->pattern () << "' : "; + wcerr << "try: '" << e->regex () << "' : "; if (e->match (path)) { - r = e->merge (path); + r = e->replace (path); found = true; if (trace_include_regex) |