From 6bf1e46ccc93777ca9f62746ada0e18c72fcf138 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 9 May 2012 11:50:57 +0200
Subject: Port to use regex from libcutl instead of libbackend-elements

---
 xsd/type-map/parser.cxx   |  8 ++++----
 xsd/type-map/type-map.hxx | 29 +++++++++++++++++++++++++----
 2 files changed, 29 insertions(+), 8 deletions(-)

(limited to 'xsd/type-map')

diff --git a/xsd/type-map/parser.cxx b/xsd/type-map/parser.cxx
index 823f3cd..5bc2ffc 100644
--- a/xsd/type-map/parser.cxx
+++ b/xsd/type-map/parser.cxx
@@ -5,7 +5,7 @@
 
 #include <iostream>
 
-#include <backend-elements/regex.hxx>
+#include <cutl/re.hxx>
 
 #include <type-map/parser.hxx>
 
@@ -14,7 +14,7 @@ using std::endl;
 namespace TypeMap
 {
   typedef Lexer::Token Token;
-  typedef BackendElements::Regex::Format<WideChar> Format;
+  typedef cutl::re::wformat Format;
 
   Parser::Parser (Lexer& lex, String const& path)
       : lex_ (lex), path_ (path), e (std::wcerr)
@@ -99,7 +99,7 @@ namespace TypeMap
     catch (Format const& ex)
     {
       e << path_ << ":" << t.line () << ": invalid namespace pattern: "
-        << ex.description () << endl;
+        << ex.description ().c_str () << endl;
       return false;
     }
 
@@ -234,7 +234,7 @@ namespace TypeMap
     catch (Format const& ex)
     {
       e << path_ << ":" << t.line () << ": invalid namespace pattern: "
-        << ex.description () << endl;
+        << ex.description ().c_str () << endl;
       return false;
     }
 
diff --git a/xsd/type-map/type-map.hxx b/xsd/type-map/type-map.hxx
index ab8231c..e5715dd 100644
--- a/xsd/type-map/type-map.hxx
+++ b/xsd/type-map/type-map.hxx
@@ -6,20 +6,29 @@
 #ifndef XSD_TYPE_MAP_TYPE_MAP_HXX
 #define XSD_TYPE_MAP_TYPE_MAP_HXX
 
+#include <cutl/re.hxx>
+
 #include <cult/types.hxx>
 #include <cult/containers/vector.hxx>
 
-#include <backend-elements/regex.hxx>
-
 namespace TypeMap
 {
   using namespace Cult::Types;
   typedef WideString String;
-  typedef BackendElements::Regex::Pattern<WideChar> Pattern;
+  typedef cutl::re::wregex Pattern;
 
   class Type
   {
   public:
+    Type (String const& xsd_name,
+          String const& cxx_ret_name,
+          String const& cxx_arg_name)
+        : xsd_name_ (xsd_name),
+          cxx_ret_name_ (cxx_ret_name),
+          cxx_arg_name_ (cxx_arg_name)
+    {
+    }
+
     Type (Pattern const& xsd_name,
           String const& cxx_ret_name,
           String const& cxx_arg_name)
@@ -56,6 +65,11 @@ namespace TypeMap
   class Namespace
   {
   public:
+    Namespace (String const& xsd_name)
+        : xsd_name_ (xsd_name), has_cxx_name_ (false)
+    {
+    }
+
     Namespace (Pattern const& xsd_name)
         : xsd_name_ (xsd_name), has_cxx_name_ (false)
     {
@@ -116,6 +130,14 @@ namespace TypeMap
     }
 
     Void
+    types_push_back (String const& xsd_type,
+                     String const& cxx_ret_type,
+                     String const& cxx_arg_type = L"")
+    {
+      types_.push_back (Type (xsd_type, cxx_ret_type, cxx_arg_type));
+    }
+
+    Void
     types_push_back (Pattern const& xsd_type,
                      String const& cxx_ret_type,
                      String const& cxx_arg_type = L"")
@@ -157,4 +179,3 @@ namespace TypeMap
 }
 
 #endif // XSD_TYPE_MAP_TYPE_MAP_HXX
-
-- 
cgit v1.1