Get rid of dependency on libcult

6 files changed, 23 insertions, 25 deletions

diff --git a/xsd-frontend/semantic-graph/annotation.hxx b/xsd-frontend/semantic-graph/annotation.hxx
index 3d6f098..6752a86 100644
--- a/xsd-frontend/semantic-graph/annotation.hxx
+++ b/xsd-frontend/semantic-graph/annotation.hxx
@@ -49,7 +49,7 @@ namespace XSDFrontend
     class Annotation: public virtual Node
     {
     public:
-      WideString const&
+      String const&
       documentation () const
       {
         return documentation_;
@@ -59,7 +59,7 @@ namespace XSDFrontend
       Annotation (Path const& file,
                   unsigned long line,
                   unsigned long column,
-                  WideString const& documentation)
+                  String const& documentation)
           : Node (file, line, column), documentation_ (documentation)
       {
       }
@@ -68,7 +68,7 @@ namespace XSDFrontend
       add_edge_left (Annotates&) {}
 
     private:
-      WideString documentation_;
+      String documentation_;
     };
   }
 }
diff --git a/xsd-frontend/semantic-graph/any-attribute.cxx b/xsd-frontend/semantic-graph/any-attribute.cxx
index 8a8660c..a5dcd36 100644
--- a/xsd-frontend/semantic-graph/any-attribute.cxx
+++ b/xsd-frontend/semantic-graph/any-attribute.cxx
@@ -16,7 +16,7 @@ namespace XSDFrontend
     AnyAttribute (Path const& file,
                   unsigned long line,
                   unsigned long column,
-                  WideString const& namespaces)
+                  String const& namespaces)
         : Node (file, line, column),
           prototype_ (0)
     {
@@ -26,9 +26,9 @@ namespace XSDFrontend
 
       for (size_t i (0), j (namespaces.find (L' '));;)
       {
-        if (j != WideString::npos)
+        if (j != String::npos)
         {
-          namespaces_.push_back (WideString (namespaces, i, j - i));
+          namespaces_.push_back (String (namespaces, i, j - i));
 
           i = j + 1;
           j = namespaces.find (L' ', i);
@@ -37,7 +37,7 @@ namespace XSDFrontend
         {
           // Last element.
           //
-          namespaces_.push_back (WideString (namespaces, i));
+          namespaces_.push_back (String (namespaces, i));
           break;
         }
       }
diff --git a/xsd-frontend/semantic-graph/any-attribute.hxx b/xsd-frontend/semantic-graph/any-attribute.hxx
index 8827987..a5ce78a 100644
--- a/xsd-frontend/semantic-graph/any-attribute.hxx
+++ b/xsd-frontend/semantic-graph/any-attribute.hxx
@@ -17,7 +17,7 @@ namespace XSDFrontend
   {
     class AnyAttribute: public virtual Nameable
     {
-      typedef std::vector<WideString> Namespaces;
+      typedef std::vector<String> Namespaces;
 
     public:
       typedef Namespaces::const_iterator NamespaceIterator;
@@ -63,7 +63,7 @@ namespace XSDFrontend
       AnyAttribute (Path const& file,
                     unsigned long line,
                     unsigned long column,
-                    WideString const& namespaces);
+                    String const& namespaces);
 
       AnyAttribute (Path const& file,
                     unsigned long line,
diff --git a/xsd-frontend/semantic-graph/any.cxx b/xsd-frontend/semantic-graph/any.cxx
index 75eb5dd..8aff295 100644
--- a/xsd-frontend/semantic-graph/any.cxx
+++ b/xsd-frontend/semantic-graph/any.cxx
@@ -16,7 +16,7 @@ namespace XSDFrontend
     Any (Path const& file,
          unsigned long line,
          unsigned long column,
-         WideString const& namespaces)
+         String const& namespaces)
         : Node (file, line, column),
           prototype_ (0)
     {
@@ -26,9 +26,9 @@ namespace XSDFrontend
 
       for (size_t i (0), j (namespaces.find (L' '));;)
       {
-        if (j != WideString::npos)
+        if (j != String::npos)
         {
-          namespaces_.push_back (WideString (namespaces, i, j - i));
+          namespaces_.push_back (String (namespaces, i, j - i));
 
           i = j + 1;
           j = namespaces.find (L' ', i);
@@ -37,7 +37,7 @@ namespace XSDFrontend
         {
           // Last element.
           //
-          namespaces_.push_back (WideString (namespaces, i));
+          namespaces_.push_back (String (namespaces, i));
           break;
         }
       }
diff --git a/xsd-frontend/semantic-graph/any.hxx b/xsd-frontend/semantic-graph/any.hxx
index b0506d0..47513b9 100644
--- a/xsd-frontend/semantic-graph/any.hxx
+++ b/xsd-frontend/semantic-graph/any.hxx
@@ -19,7 +19,7 @@ namespace XSDFrontend
     class Any: public virtual Nameable,
                public virtual Particle
     {
-      typedef std::vector<WideString> Namespaces;
+      typedef std::vector<String> Namespaces;
 
     public:
       typedef Namespaces::const_iterator NamespaceIterator;
@@ -65,7 +65,7 @@ namespace XSDFrontend
       Any (Path const& file,
            unsigned long line,
            unsigned long column,
-           WideString const& namespaces);
+           String const& namespaces);
 
       Any (Path const& file,
            unsigned long line,
diff --git a/xsd-frontend/semantic-graph/elements.hxx b/xsd-frontend/semantic-graph/elements.hxx
index ad70221..1847572 100644
--- a/xsd-frontend/semantic-graph/elements.hxx
+++ b/xsd-frontend/semantic-graph/elements.hxx
@@ -21,7 +21,7 @@
 #include <cutl/container/pointer-iterator.hxx>
 #include <cutl/compiler/context.hxx>
 
-#include <cult/types.hxx>
+#include <xsd-frontend/types.hxx>
 
 namespace XSDFrontend
 {
@@ -31,8 +31,6 @@ namespace XSDFrontend
 
     using container::pointer_iterator;
 
-    using namespace Cult::Types;
-
     //
     //
     typedef boost::filesystem::path Path;
@@ -181,7 +179,7 @@ namespace XSDFrontend
 
     //
     //
-    typedef WideString Name;
+    typedef String Name;
 
 
     //
@@ -648,7 +646,7 @@ namespace XSDFrontend
     class Restricts: public virtual Inherits
     {
     public:
-      typedef std::map<WideString, WideString> Facets;
+      typedef std::map<String, String> Facets;
       typedef Facets::iterator FacetIterator;
 
       bool
@@ -670,7 +668,7 @@ namespace XSDFrontend
       }
 
       FacetIterator
-      facet_find (WideString const& name)
+      facet_find (String const& name)
       {
         return facets_.find (name);
       }
@@ -782,7 +780,7 @@ namespace XSDFrontend
 
       struct NoValue {};
 
-      WideString
+      String
       value () const
       {
         if (value_type_ != ValueType::none)
@@ -794,14 +792,14 @@ namespace XSDFrontend
       //
       //
       void
-      default_ (WideString const& v)
+      default_ (String const& v)
       {
         value_ = v;
         value_type_ = ValueType::default_;
       }
 
       void
-      fixed (WideString const& v)
+      fixed (String const& v)
       {
         value_ = v;
         value_type_ = ValueType::fixed;
@@ -841,7 +839,7 @@ namespace XSDFrontend
         };
       };
 
-      WideString value_;
+      String value_;
       ValueType::Value value_type_;
     };