diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2012-05-09 11:50:57 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2012-05-09 11:50:57 +0200 |
commit | 6bf1e46ccc93777ca9f62746ada0e18c72fcf138 (patch) | |
tree | 89af9295e53ed2751f8343e32b55f799ce385c07 /xsd/cxx/tree/elements.cxx | |
parent | 3067cb353cca291d25b4b1fcf6acdb110e560536 (diff) |
Port to use regex from libcutl instead of libbackend-elements
Diffstat (limited to 'xsd/cxx/tree/elements.cxx')
-rw-r--r-- | xsd/cxx/tree/elements.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xsd/cxx/tree/elements.cxx b/xsd/cxx/tree/elements.cxx index 0b69fff..233063a 100644 --- a/xsd/cxx/tree/elements.cxx +++ b/xsd/cxx/tree/elements.cxx @@ -291,7 +291,7 @@ namespace CXX } regex_custom_type_map.push_back ( - RegexCustomTypeMapInfo (pat, type, base)); + RegexCustomTypeMapInfo (WideRegexPat (pat), type, base)); } } } @@ -414,7 +414,7 @@ namespace CXX return true; } - r = i->pat.merge (i->type_sub, name); + r = i->pat.replace (name, i->type_sub); return true; } } @@ -467,7 +467,7 @@ namespace CXX { if (!i->base_sub.empty ()) { - r = i->pat.merge (i->base_sub, name); + r = i->pat.replace (name, i->base_sub); } else r.clear (); @@ -1354,25 +1354,25 @@ namespace CXX { case forward: { - inc_path = ctx_.fwd_expr->merge (path_str); + inc_path = ctx_.fwd_expr->replace (path_str); break; } case header: case source: { - inc_path = ctx_.hxx_expr->merge (path_str); + inc_path = ctx_.hxx_expr->replace (path_str); break; } case inline_: { if (weak) { - inc_path = ctx_.hxx_expr->merge (path_str); + inc_path = ctx_.hxx_expr->replace (path_str); ctx_.os << "#include " << ctx_.process_include_path (inc_path) << endl; } - inc_path = ctx_.ixx_expr->merge (path_str); + inc_path = ctx_.ixx_expr->replace (path_str); break; } } |