From 0d62005a3ff3b62d02c2eb3fd8644e0e19b202e8 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 16 Mar 2009 11:11:54 +0200 Subject: Change sequence names to be consistent with documentation The *_seq names were changed to *_sequence. Also, the generated code now uses sequence names from the xml_schema namespace instead of the implementation namespaces (xsde::cxx::hybrid). --- xsde/cxx/hybrid/elements.cxx | 19 +++++++++++--- xsde/cxx/hybrid/elements.hxx | 42 +++++++++++++++++++++--------- xsde/cxx/hybrid/tree-forward.cxx | 10 +++---- xsde/cxx/hybrid/tree-header.cxx | 56 ++++++++++++---------------------------- 4 files changed, 66 insertions(+), 61 deletions(-) (limited to 'xsde') diff --git a/xsde/cxx/hybrid/elements.cxx b/xsde/cxx/hybrid/elements.cxx index a28dfc1..80dc5c4 100644 --- a/xsde/cxx/hybrid/elements.cxx +++ b/xsde/cxx/hybrid/elements.cxx @@ -43,6 +43,11 @@ namespace CXX hxx_expr (he), ixx_expr (ie), ns_stack (ns_stack_), + pod_seq (pod_seq_), + fix_seq (fix_seq_), + var_seq (var_seq_), + str_seq (str_seq_), + data_seq (data_seq_), istreams (ops.value ()), ostreams (ops.value ()), icdrstream (icdrstream_), @@ -54,16 +59,22 @@ namespace CXX string_type = L"::xsde::cxx::ro_string"; + pod_seq_ = xs_ns + L"::pod_sequence"; + fix_seq_ = xs_ns + L"::fix_sequence"; + var_seq_ = xs_ns + L"::var_sequence"; + str_seq_ = xs_ns + L"::string_sequence"; + data_seq_ = xs_ns + L"::data_sequence"; + if (!ostreams.empty ()) { - ocdrstream = xs_ns + L"::ocdrstream"; - oxdrstream = xs_ns + L"::oxdrstream"; + ocdrstream_ = xs_ns + L"::ocdrstream"; + oxdrstream_ = xs_ns + L"::oxdrstream"; } if (!istreams.empty ()) { - icdrstream = xs_ns + L"::icdrstream"; - ixdrstream = xs_ns + L"::ixdrstream"; + icdrstream_ = xs_ns + L"::icdrstream"; + ixdrstream_ = xs_ns + L"::ixdrstream"; } } diff --git a/xsde/cxx/hybrid/elements.hxx b/xsde/cxx/hybrid/elements.hxx index d324b04..7f3ba3a 100644 --- a/xsde/cxx/hybrid/elements.hxx +++ b/xsde/cxx/hybrid/elements.hxx @@ -51,6 +51,11 @@ namespace CXX hxx_expr (c.hxx_expr), ixx_expr (c.ixx_expr), ns_stack (c.ns_stack), + pod_seq (c.pod_seq), + fix_seq (c.fix_seq), + var_seq (c.var_seq), + str_seq (c.str_seq), + data_seq (c.data_seq), istreams (c.istreams), ostreams (c.ostreams), icdrstream (c.icdrstream), @@ -75,6 +80,11 @@ namespace CXX hxx_expr (c.hxx_expr), ixx_expr (c.ixx_expr), ns_stack (c.ns_stack), + pod_seq (c.pod_seq), + fix_seq (c.fix_seq), + var_seq (c.var_seq), + str_seq (c.str_seq), + data_seq (c.data_seq), istreams (c.istreams), ostreams (c.ostreams), icdrstream (c.icdrstream), @@ -561,18 +571,30 @@ namespace CXX NamespaceStack& ns_stack; + String const& pod_seq; + String const& fix_seq; + String const& var_seq; + String const& str_seq; + String const& data_seq; + typedef Containers::Vector Streams; Streams const& istreams; Streams const& ostreams; - String& icdrstream; - String& ocdrstream; - String& ixdrstream; - String& oxdrstream; + String const& icdrstream; + String const& ocdrstream; + String const& ixdrstream; + String const& oxdrstream; private: NamespaceStack ns_stack_; + String pod_seq_; + String fix_seq_; + String var_seq_; + String str_seq_; + String data_seq_; + String icdrstream_; String ocdrstream_; String ixdrstream_; @@ -1342,12 +1364,8 @@ namespace CXX } case seq: { - if (fixed_length (t)) - os << "::xsde::cxx::hybrid::fix_seq"; - else - os << "::xsde::cxx::hybrid::var_seq"; - - os << "< " << fq << " >"; + os << (fixed_length (t) ? fix_seq : var_seq) << "< " << + fq << " >"; break; } } @@ -1365,7 +1383,7 @@ namespace CXX } case seq: { - os << "::xsde::cxx::hybrid::pod_seq< " << name << " >"; + os << pod_seq << "< " << name << " >"; break; } default: @@ -1422,7 +1440,7 @@ namespace CXX } case seq: { - os << "::xsde::cxx::hybrid::str_seq"; + os << str_seq; break; } } diff --git a/xsde/cxx/hybrid/tree-forward.cxx b/xsde/cxx/hybrid/tree-forward.cxx index 451f129..7b2cae6 100644 --- a/xsde/cxx/hybrid/tree-forward.cxx +++ b/xsde/cxx/hybrid/tree-forward.cxx @@ -593,11 +593,11 @@ namespace CXX // sequences // os << endl - << "using ::xsde::cxx::hybrid::pod_seq;" - << "using ::xsde::cxx::hybrid::fix_seq;" - << "using ::xsde::cxx::hybrid::var_seq;" - << "using ::xsde::cxx::hybrid::str_seq;" - << "using ::xsde::cxx::hybrid::data_seq;"; + << "using ::xsde::cxx::hybrid::pod_sequence;" + << "using ::xsde::cxx::hybrid::fix_sequence;" + << "using ::xsde::cxx::hybrid::var_sequence;" + << "using ::xsde::cxx::hybrid::string_sequence;" + << "using ::xsde::cxx::hybrid::data_sequence;"; // Data representation stream types. // diff --git a/xsde/cxx/hybrid/tree-header.cxx b/xsde/cxx/hybrid/tree-header.cxx index 207b35f..c2e8bf4 100644 --- a/xsde/cxx/hybrid/tree-header.cxx +++ b/xsde/cxx/hybrid/tree-header.cxx @@ -65,7 +65,7 @@ namespace CXX // sequence & iterators // - os << "typedef ::xsde::cxx::hybrid::data_seq " << sequence << ";" + os << "typedef " << data_seq << " " << sequence << ";" << "typedef " << sequence << "::iterator " << iterator << ";" << "typedef " << sequence << "::const_iterator " << const_iterator << ";" @@ -229,7 +229,7 @@ namespace CXX // sequence & iterators // - os << "typedef ::xsde::cxx::hybrid::data_seq " << sequence << ";" + os << "typedef " << data_seq << " " << sequence << ";" << "typedef " << sequence << "::iterator " << iterator << ";" << "typedef " << sequence << "::const_iterator " << const_iterator << ";" @@ -1295,7 +1295,7 @@ namespace CXX // sequence & iterators // - os << "typedef ::xsde::cxx::hybrid::data_seq " << sequence << ";" + os << "typedef " << data_seq << " " << sequence << ";" << "typedef " << sequence << "::iterator " << iterator << ";" << "typedef " << sequence << "::const_iterator " << const_iterator << ";" @@ -1537,7 +1537,7 @@ namespace CXX // sequence & iterators // - os << "typedef ::xsde::cxx::hybrid::data_seq " << sequence << ";" + os << "typedef " << data_seq << " " << sequence << ";" << "typedef " << sequence << "::iterator " << iterator << ";" << "typedef " << sequence << "::const_iterator " << const_iterator << ";" @@ -1583,14 +1583,8 @@ namespace CXX // sequence & iterators // - os << "typedef ::xsde::cxx::hybrid::"; - - if (fl) - os << "fix_seq"; - else - os << "var_seq"; - - os << "< " << type << " > " << sequence << ";" + os << "typedef " << (fl ? fix_seq : var_seq) << "< " << + type << " > " << sequence << ";" << "typedef " << sequence << "::iterator " << iterator << ";" << "typedef " << sequence << "::const_iterator " << const_iterator << ";" @@ -1761,7 +1755,7 @@ namespace CXX // sequence & iterators // - os << "typedef ::xsde::cxx::hybrid::data_seq " << sequence << ";" + os << "typedef " << data_seq << " " << sequence << ";" << "typedef " << sequence << "::iterator " << iterator << ";" << "typedef " << sequence << "::const_iterator " << const_iterator << ";" @@ -1806,14 +1800,8 @@ namespace CXX // sequence & iterators // - os << "typedef ::xsde::cxx::hybrid::"; - - if (fl) - os << "fix_seq"; - else - os << "var_seq"; - - os << "< " << type << " > " << sequence << ";" + os << "typedef " << (fl ? fix_seq : var_seq) << "< " << + type << " > " << sequence << ";" << "typedef " << sequence << "::iterator " << iterator << ";" << "typedef " << sequence << "::const_iterator " << const_iterator << ";" @@ -1962,7 +1950,7 @@ namespace CXX // sequence & iterators // - os << "typedef ::xsde::cxx::hybrid::data_seq " << sequence << ";" + os << "typedef " << data_seq << " " << sequence << ";" << "typedef " << sequence << "::iterator " << iterator << ";" << "typedef " << sequence << "::const_iterator " << const_iterator << ";" @@ -2002,14 +1990,8 @@ namespace CXX // sequence & iterators // - os << "typedef ::xsde::cxx::hybrid::"; - - if (fl) - os << "fix_seq"; - else - os << "var_seq"; - - os << "< " << type << " > " << sequence << ";" + os << "typedef " << (fl ? fix_seq : var_seq) << "< " << + type << " > " << sequence << ";" << "typedef " << sequence << "::iterator " << iterator << ";" << "typedef " << sequence << "::const_iterator " << const_iterator << ";" @@ -2148,7 +2130,7 @@ namespace CXX // sequence & iterators // - os << "typedef ::xsde::cxx::hybrid::data_seq " << sequence << ";" + os << "typedef " << data_seq << " " << sequence << ";" << "typedef " << sequence << "::iterator " << iterator << ";" << "typedef " << sequence << "::const_iterator " << const_iterator << ";" @@ -2188,14 +2170,8 @@ namespace CXX // sequence & iterators // - os << "typedef ::xsde::cxx::hybrid::"; - - if (fl) - os << "fix_seq"; - else - os << "var_seq"; - - os << "< " << type << " > " << sequence << ";" + os << "typedef " << (fl ? fix_seq : var_seq) << "< " << + type << " > " << sequence << ";" << "typedef " << sequence << "::iterator " << iterator << ";" << "typedef " << sequence << "::const_iterator " << const_iterator << ";" @@ -2424,7 +2400,7 @@ namespace CXX // sequence & iterators // - os << "typedef ::xsde::cxx::hybrid::data_seq " << sequence << ";" + os << "typedef " << data_seq << " " << sequence << ";" << "typedef " << sequence << "::iterator " << iterator << ";" << "typedef " << sequence << "::const_iterator " << const_iterator << ";" -- cgit v1.1