From 54110801525371740298d5cae378bfc778749935 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 22 Jun 2012 11:50:03 +0200
Subject: Get rid of dependency on libcult

---
 xsd/cxx/parser/generator.cxx | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

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

diff --git a/xsd/cxx/parser/generator.cxx b/xsd/cxx/parser/generator.cxx
index 338705e..7ef7183 100644
--- a/xsd/cxx/parser/generator.cxx
+++ b/xsd/cxx/parser/generator.cxx
@@ -9,9 +9,6 @@
 
 #include <cutl/re.hxx>
 
-#include <cult/containers/set.hxx>
-#include <cult/containers/vector.hxx>
-
 #include <cutl/compiler/code-stream.hxx>
 #include <cutl/compiler/cxx-indenter.hxx>
 #include <cutl/compiler/sloc-counter.hxx>
@@ -71,7 +68,7 @@ namespace CXX
 {
   namespace
   {
-    Char const copyright_gpl[] =
+    char const copyright_gpl[] =
     "// Copyright (c) 2005-2011 Code Synthesis Tools CC\n"
     "//\n"
     "// This program was generated by CodeSynthesis XSD, an XML Schema to\n"
@@ -105,7 +102,7 @@ namespace CXX
     "// in the accompanying FLOSSE file.\n"
     "//\n\n";
 
-    Char const copyright_proprietary[] =
+    char const copyright_proprietary[] =
     "// Copyright (c) 2005-2011 Code Synthesis Tools CC\n"
     "//\n"
     "// This program was generated by CodeSynthesis XSD, an XML Schema\n"
@@ -115,7 +112,7 @@ namespace CXX
     "// conditions.\n"
     "//\n\n";
 
-    Char const copyright_impl[] =
+    char const copyright_impl[] =
     "// Not copyrighted - public domain.\n"
     "//\n"
     "// This sample parser implementation was generated by CodeSynthesis XSD,\n"
@@ -124,7 +121,7 @@ namespace CXX
     "//\n\n";
   }
 
-  Void Parser::Generator::
+  void Parser::Generator::
   usage ()
   {
     CXX::Parser::options::print_usage (wcout);
@@ -134,7 +131,7 @@ namespace CXX
   namespace
   {
     template <typename S>
-    Void
+    void
     open (S& ifs, NarrowString const& path)
     {
       try
@@ -159,7 +156,7 @@ namespace CXX
       }
     }
 
-    Void
+    void
     append (WideOutputFileStream& os,
             NarrowString const& path,
             WideInputFileStream& default_is)
@@ -179,7 +176,7 @@ namespace CXX
       }
     }
 
-    Void
+    void
     append (WideOutputFileStream& os,
             NarrowStrings const& primary,
             NarrowStrings const& def)
@@ -195,13 +192,13 @@ namespace CXX
   }
 
 
-  UnsignedLong Parser::Generator::
+  size_t Parser::Generator::
   generate (Parser::options const& ops,
             Schema& schema,
             Path const& file_path,
-            Boolean fpt,
+            bool fpt,
             StringLiteralMap const& string_literal_map,
-            Boolean gen_driver,
+            bool gen_driver,
             const WarningSet& disabled_warnings,
             FileList& file_list,
             AutoUnlinks& unlinks)
@@ -212,7 +209,7 @@ namespace CXX
 
     try
     {
-      Boolean generate_xml_schema (ops.generate_xml_schema ());
+      bool generate_xml_schema (ops.generate_xml_schema ());
 
       // We could be compiling several schemas at once in which case
       // handling of the --generate-xml-schema option gets tricky: we
@@ -228,11 +225,11 @@ namespace CXX
         }
       }
 
-      Boolean impl (!generate_xml_schema &&
+      bool impl (!generate_xml_schema &&
                     (ops.generate_noop_impl () ||
                      ops.generate_print_impl ()));
 
-      Boolean driver (gen_driver && !generate_xml_schema &&
+      bool driver (gen_driver && !generate_xml_schema &&
                       ops.generate_test_driver ());
 
       // Evaluate the graph for possibility of generating something useful.
@@ -251,7 +248,7 @@ namespace CXX
         proc.process (ops, schema, file_path, string_literal_map);
       }
 
-      Boolean validation ((ops.xml_parser () == "expat" ||
+      bool validation ((ops.xml_parser () == "expat" ||
                            ops.generate_validation ()) &&
                           !ops.suppress_validation ());
 
@@ -393,8 +390,8 @@ namespace CXX
 
       //
       //
-      Boolean inline_ (ops.generate_inline () && !generate_xml_schema);
-      Boolean source (!generate_xml_schema);
+      bool inline_ (ops.generate_inline () && !generate_xml_schema);
+      bool source (!generate_xml_schema);
 
       // Generate code.
       //
@@ -697,7 +694,7 @@ namespace CXX
 
       // Print copyright and license.
       //
-      Char const* copyright (
+      char const* copyright (
         ops.proprietary_license () ? copyright_proprietary : copyright_gpl);
 
       hxx << copyright;
@@ -740,7 +737,7 @@ namespace CXX
       // SLOC counter.
       //
       size_t sloc_total (0);
-      Boolean show_sloc (ops.show_sloc ());
+      bool show_sloc (ops.show_sloc ());
 
       typedef
       compiler::ostream_filter<compiler::cxx_indenter, wchar_t>
-- 
cgit v1.1