From c34158508eafb020fbb7bbb7c0b2479982c426cd Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 21 Jun 2012 10:20:42 +0200
Subject: Completion of the CLI port

---
 xsde/cxx/parser/elements.cxx | 35 +++++++++--------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

(limited to 'xsde/cxx/parser/elements.cxx')

diff --git a/xsde/cxx/parser/elements.cxx b/xsde/cxx/parser/elements.cxx
index bd5b09a..2f0c7e3 100644
--- a/xsde/cxx/parser/elements.cxx
+++ b/xsde/cxx/parser/elements.cxx
@@ -13,41 +13,24 @@ namespace CXX
     Context (std::wostream& o,
              SemanticGraph::Schema& root,
              SemanticGraph::Path const& path,
-             CLI::Options const& ops,
+             options_type const& ops,
              Regex const* he,
              Regex const* ie,
              Regex const* hie)
-        : CXX::Context (o,
-                        root,
-                        path,
-                        "p:name",
-                        "char",
-                        ops.value<CLI::char_encoding> (),
-                        ops.value<CLI::include_with_brackets> (),
-                        ops.value<CLI::include_prefix> (),
-                        "", // export symbol
-                        ops.value<CLI::namespace_map> (),
-                        ops.value<CLI::namespace_regex> (),
-                        ops.value<CLI::namespace_regex_trace> (),
-                        ops.value<CLI::include_regex> (),
-                        ops.value<CLI::include_regex_trace> (),
-                        ops.value<CLI::generate_inline> (),
-                        ops.value<CLI::custom_allocator> (),
-                        !ops.value<CLI::no_long_long> (),
-                        ops.value<CLI::reserved_name> ()),
+        : CXX::Context (o, root, path, ops, "p:name", "char"),
           options (ops),
           xml_parser (xml_parser_),
           simple_base (simple_base_),
           complex_base (complex_base_),
           list_base (list_base_),
           parser_map (parser_map_),
-          validation (!ops.value<CLI::suppress_validation> ()),
-          exceptions (!ops.value<CLI::no_exceptions> ()),
-          poly_code (ops.value<CLI::generate_polymorphic> ()),
-          poly_runtime (poly_code || ops.value<CLI::runtime_polymorphic> ()),
-          reset (!ops.value<CLI::suppress_reset> ()),
-          mixin (ops.value<CLI::reuse_style_mixin> ()),
-          tiein (!mixin && !ops.value<CLI::reuse_style_none> ()),
+          validation (!ops.suppress_validation ()),
+          exceptions (!ops.no_exceptions ()),
+          poly_code (ops.generate_polymorphic ()),
+          poly_runtime (poly_code || ops.runtime_polymorphic ()),
+          reset (!ops.suppress_reset ()),
+          mixin (ops.reuse_style_mixin ()),
+          tiein (!mixin && !ops.reuse_style_none ()),
           hxx_expr (he),
           ixx_expr (ie),
           hxx_impl_expr (hie),
-- 
cgit v1.1