diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2009-03-16 11:11:54 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2009-03-16 11:11:54 +0200 |
commit | 0d62005a3ff3b62d02c2eb3fd8644e0e19b202e8 (patch) | |
tree | 6cda0acea2d58cff3649af8a43e92fe024e4861d | |
parent | f793c66692ef717ffec874b5002a9d95aef3485e (diff) |
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).
25 files changed, 586 insertions, 563 deletions
diff --git a/documentation/cxx/hybrid/guide/index.xhtml b/documentation/cxx/hybrid/guide/index.xhtml index 3586264..62603dc 100644 --- a/documentation/cxx/hybrid/guide/index.xhtml +++ b/documentation/cxx/hybrid/guide/index.xhtml @@ -675,7 +675,7 @@ public: // name // - typedef xsde::string_sequence name_sequence; + typedef xml_schema::string_sequence name_sequence; typedef name_sequence::iterator name_iterator; typedef name_sequence::const_iterator name_const_iterator; @@ -702,8 +702,8 @@ private: <p>It is also evident that the built-in XML Schema type <code>string</code> is mapped to <code>std::string</code>. - The internal <code>string_sequence</code> class that - is used in the <code>name_sequence</code> type definition + The <code>string_sequence</code> class that is used in + the <code>name_sequence</code> type definition has an interface similar to <code>std::vector</code>. The mapping between the built-in XML Schema types and C++ types is described in more detail in <a href="#5">Chapter 5, @@ -1599,7 +1599,7 @@ private: public: // person // - typedef xsde::fix_sequence<person> person_sequence; + typedef xml_schema::fix_sequence<person> person_sequence; typedef person_sequence::iterator person_iterator; typedef person_sequence::const_iterator person_const_iterator; @@ -1891,7 +1891,7 @@ class people { // person // - typedef xsde::fix_sequence<person> person_sequence; + typedef xml_schema::fix_sequence<person> person_sequence; typedef person_sequence::iterator person_iterator; typedef person_sequence::const_iterator person_const_iterator; @@ -1927,100 +1927,103 @@ class people are implemented in terms of the following class template:</p> <pre class="c++"> -template <typename T> -class fix_sequence +namespace xml_schema { -public: - typedef T value_type; - typedef T* pointer; - typedef const T* const_pointer; - typedef T& reference; - typedef const T& const_reference; + template <typename T> + class fix_sequence + { + public: + typedef T value_type; + typedef T* pointer; + typedef const T* const_pointer; + typedef T& reference; + typedef const T& const_reference; - typedef size_t size_type; - typedef ptrdiff_t difference_type; + typedef size_t size_type; + typedef ptrdiff_t difference_type; - typedef T* iterator; - typedef const T* const_iterator; + typedef T* iterator; + typedef const T* const_iterator; -public: - fix_sequence (); + public: + fix_sequence (); - void - swap (fix_sequence&); + void + swap (fix_sequence&); -private: - fix_sequence (const fix_sequence&); + private: + fix_sequence (const fix_sequence&); - fix_sequence& - operator= (fix_sequence&); + fix_sequence& + operator= (fix_sequence&); -public: - iterator - begin (); + public: + iterator + begin (); - const_iterator - begin () const; + const_iterator + begin () const; - iterator - end (); + iterator + end (); - const_iterator - end () const; + const_iterator + end () const; - T& - front (); + T& + front (); - const T& - front () const; + const T& + front () const; - T& - back (); + T& + back (); - const T& - back () const; + const T& + back () const; - T& - operator[] (size_t); + T& + operator[] (size_t); - const T& - operator[] (size_t) const; + const T& + operator[] (size_t) const; -public: - bool - empty () const; + public: + bool + empty () const; - size_t - size () const; + size_t + size () const; - size_t - capacity () const; + size_t + capacity () const; - size_t - max_size () const; + size_t + max_size () const; -public: - void - clear (); + public: + void + clear (); - void - pop_back (); + void + pop_back (); - iterator - erase (iterator); + iterator + erase (iterator); - void - push_back (const T&); + void + push_back (const T&); - iterator - insert (iterator, const T&); + iterator + insert (iterator, const T&); - void - reserve (size_t); + void + reserve (size_t); - void - assign (const T* src, size_t n); -}; + void + assign (const T* src, size_t n); + }; +} </pre> <p>When C++ exceptions are disabled, the signatures of the @@ -2029,34 +2032,37 @@ public: change as follows:</p> <pre class="c++"> -template <typename T> -class fix_sequence +namespace xml_schema { -public: - enum error + template <typename T> + class fix_sequence { - error_none, - error_no_memory - }; + public: + enum error + { + error_none, + error_no_memory + }; - ... + ... -public: - error - push_back (const T&); + public: + error + push_back (const T&); - error - insert (iterator, const T&); + error + insert (iterator, const T&); - error - insert (iterator, const T&, iterator& result); + error + insert (iterator, const T&, iterator& result); - error - reserve (size_t); + error + reserve (size_t); - error - assign (const T* src, size_t n); -}; + error + assign (const T* src, size_t n); + }; +} </pre> <p>That is, the functions that may require memory allocation @@ -2067,103 +2073,106 @@ public: are implemented in terms of the following class template:</p> <pre class="c++"> -template <typename T> -class var_sequence +namespace xml_schema { -public: - typedef T value_type; - typedef T* pointer; - typedef const T* const_pointer; - typedef T& reference; - typedef const T& const_reference; + template <typename T> + class var_sequence + { + public: + typedef T value_type; + typedef T* pointer; + typedef const T* const_pointer; + typedef T& reference; + typedef const T& const_reference; - typedef size_t size_type; - typedef ptrdiff_t difference_type; + typedef size_t size_type; + typedef ptrdiff_t difference_type; - typedef <implementation details> iterator; - typedef <implementation details> const_iterator; + typedef <implementation details> iterator; + typedef <implementation details> const_iterator; -public: - var_sequence (); + public: + var_sequence (); - void - swap (var_sequence&); + void + swap (var_sequence&); -private: - var_sequence (const var_sequence&); + private: + var_sequence (const var_sequence&); - var_sequence& - operator= (var_sequence&); + var_sequence& + operator= (var_sequence&); -public: - iterator - begin (); + public: + iterator + begin (); - const_iterator - begin () const; + const_iterator + begin () const; - iterator - end (); + iterator + end (); - const_iterator - end () const; + const_iterator + end () const; - T& - front (); + T& + front (); - const T& - front () const; + const T& + front () const; - T& - back (); + T& + back (); - const T& - back () const; + const T& + back () const; - T& - operator[] (size_t); + T& + operator[] (size_t); - const T& - operator[] (size_t) const; + const T& + operator[] (size_t) const; -public: - bool - empty () const; + public: + bool + empty () const; - size_t - size () const; + size_t + size () const; - size_t - capacity () const; + size_t + capacity () const; - size_t - max_size () const; + size_t + max_size () const; -public: - void - clear (); + public: + void + clear (); - void - push_back (T*); + void + push_back (T*); - iterator - insert (iterator, T*); + iterator + insert (iterator, T*); - void - pop_back (); + void + pop_back (); - iterator - erase (iterator); + iterator + erase (iterator); - void - reserve (size_t); + void + reserve (size_t); - T* - detach (iterator); + T* + detach (iterator); - void - attach (iterator, T*); -}; + void + attach (iterator, T*); + }; +} </pre> <p>Most of this interface is identical to the fixed-length type @@ -2175,7 +2184,7 @@ public: ownership of the passed object. To simplify error handling, these two functions delete the passed object if the reallocation of the underlying sequence buffer fails. The <code>var_sequence</code> - interface also provides the <code>detach()</code> and <code>attach()</code> + class template also provides the <code>detach()</code> and <code>attach()</code> functions. The <code>detach()</code> function allows you to detach the contained object at the specified position. A detached object should eventually be deallocated with operator <code>delete</code>. @@ -2187,39 +2196,42 @@ public: return an error code to signal the out of memory condition:</p> <pre class="c++"> -template <typename T> -class var_sequence +namespace xml_schema { -public: - enum error + template <typename T> + class var_sequence { - error_none, - error_no_memory - }; + public: + enum error + { + error_none, + error_no_memory + }; - ... + ... -public: - error - push_back (T*); + public: + error + push_back (T*); - error - insert (iterator, T*); + error + insert (iterator, T*); - error - insert (iterator, T*, iterator& result); + error + insert (iterator, T*, iterator& result); - error - reserve (size_t); -}; + error + reserve (size_t); + }; +} </pre> - <p>When STL is enabled, the string sequence have the same - interface as <code>fix_sequence<std::string></code>. When + <p>When STL is enabled, the <code>string_sequence</code> class has + the same interface as <code>fix_sequence<std::string></code>. When STL is disabled and strings are mapped to <code>char*</code>, - the string sequence has a special interface. When C++ exceptions are - enabled, it has the following definition:</p> + <code>string_sequence</code> has a special interface. When C++ + exceptions are enabled, it has the following definition:</p> <pre class="c++"> namespace xml_schema @@ -2333,7 +2345,7 @@ namespace xml_schema free the passed string if the reallocation of the underlying sequence buffer fails. The <code>push_back_copy()</code> function makes a copy of the passed string. - The <code>string_sequence</code> interface also provides the + The <code>string_sequence</code> class also provides the <code>detach()</code> and <code>attach()</code> functions. The <code>detach()</code> function allows you to detach the contained string at the specified position. A detached string @@ -2454,7 +2466,7 @@ public: // b // - typedef xsde::string_sequence b_sequence; + typedef xml_schema::string_sequence b_sequence; typedef b_sequence::iterator b_iterator; typedef b_sequence::const_iterator b_const_iterator; @@ -2518,7 +2530,7 @@ public: ... }; - typedef xsde::fix_sequence<sequence1_type> sequence1_sequence; + typedef xml_schema::fix_sequence<sequence1_type> sequence1_sequence; typedef sequence1_sequence::iterator sequence1_iterator; typedef sequence1_sequence::const_iterator sequence1_const_iterator; @@ -2782,7 +2794,7 @@ public: ... }; - typedef xsde::fix_sequence<choice_type> choice_sequence; + typedef xml_schema::fix_sequence<choice_type> choice_sequence; typedef choice_sequence::iterator choice_iterator; typedef choice_sequence::const_iterator choice_const_iterator; @@ -3158,7 +3170,7 @@ public: // Custom data. // - typedef xsde::data_sequence custom_data_sequence; + typedef xml_schema::data_sequence custom_data_sequence; typedef custom_data_sequence::iterator custom_data_iterator; typedef custom_data_sequence::const_iterator custom_data_const_iterator; @@ -3175,101 +3187,104 @@ public: custom data sequence has the following interface:</p> <pre class="c++"> -class data_sequence +namespace xml_schema { -public: - typedef void* value_type; - typedef void** pointer; - typedef const void** const_pointer; - typedef void* reference; - typedef const void* const_reference; + class data_sequence + { + public: + typedef void* value_type; + typedef void** pointer; + typedef const void** const_pointer; + typedef void* reference; + typedef const void* const_reference; - typedef size_t size_type; - typedef ptrdiff_t difference_type; + typedef size_t size_type; + typedef ptrdiff_t difference_type; - typedef void** iterator; - typedef const void* const* const_iterator; + typedef void** iterator; + typedef const void* const* const_iterator; - typedef void (*destroy_func) (void* data, size_t pos); + typedef void (*destroy_func) (void* data, size_t pos); -public: - data_sequence (); + public: + data_sequence (); - void - destructor (destroy_func); + void + destructor (destroy_func); - void - swap (data_sequence&); + void + swap (data_sequence&); -private: - data_sequence (const data_sequence&); + private: + data_sequence (const data_sequence&); - data_sequence& - operator= (data_sequence&); + data_sequence& + operator= (data_sequence&); -public: - iterator - begin (); + public: + iterator + begin (); - const_iterator - begin () const; + const_iterator + begin () const; - iterator - end (); + iterator + end (); - const_iterator - end () const; + const_iterator + end () const; - void* - front (); + void* + front (); - const void* - front () const; + const void* + front () const; - void* - back (); + void* + back (); - const void* - back () const; + const void* + back () const; - void* - operator[] (size_t); + void* + operator[] (size_t); - const void* - operator[] (size_t) const; + const void* + operator[] (size_t) const; -public: - bool - empty () const; + public: + bool + empty () const; - size_t - size () const; + size_t + size () const; - size_t - capacity () const; + size_t + capacity () const; - size_t - max_size () const; + size_t + max_size () const; -public: - void - clear (); + public: + void + clear (); - void - pop_back (); + void + pop_back (); - iterator - erase (iterator); + iterator + erase (iterator); - void - push_back (void*); + void + push_back (void*); - iterator - insert (iterator, void*); + iterator + insert (iterator, void*); - void - reserve (size_t); -}; + void + reserve (size_t); + }; +} </pre> <p>The <code>destructor()</code> modifier allows you to specify @@ -3286,30 +3301,33 @@ public: return an error code to signal the out of memory condition:</p> <pre class="c++"> -class data_sequence +namespace xml_schema { -public: - enum error + class data_sequence { - error_none, - error_no_memory - }; + public: + enum error + { + error_none, + error_no_memory + }; - ... + ... -public: - error - push_back (void*); + public: + error + push_back (void*); - error - insert (iterator, void*); + error + insert (iterator, void*); - error - insert (iterator, void*, iterator& result); + error + insert (iterator, void*, iterator& result); - error - reserve (size_t); -}; + error + reserve (size_t); + }; +} </pre> <p>The following code fragment shows how we can store and retrieve @@ -3453,7 +3471,7 @@ class people // person // - typedef xsde::fix_sequence<person> person_sequence; + typedef xml_schema::fix_sequence<person> person_sequence; typedef person_sequence::iterator person_iterator; typedef person_sequence::const_iterator person_const_iterator; diff --git a/examples/cxx/hybrid/binary/custom/irawstream.cxx b/examples/cxx/hybrid/binary/custom/irawstream.cxx index d3d6aae..d4829ea 100644 --- a/examples/cxx/hybrid/binary/custom/irawstream.cxx +++ b/examples/cxx/hybrid/binary/custom/irawstream.cxx @@ -56,7 +56,7 @@ operator>> (buffer& x) } void -operator>> (irawstream& s, str_seq& x) +operator>> (irawstream& s, string_sequence& x) { size_t n; irawstream::as_size as_size (n); diff --git a/examples/cxx/hybrid/binary/custom/irawstream.hxx b/examples/cxx/hybrid/binary/custom/irawstream.hxx index 94d2382..e4292a7 100644 --- a/examples/cxx/hybrid/binary/custom/irawstream.hxx +++ b/examples/cxx/hybrid/binary/custom/irawstream.hxx @@ -75,16 +75,16 @@ void operator>> (irawstream&, xml_schema::gyear&); void operator>> (irawstream&, xml_schema::gyear_month&); void operator>> (irawstream&, xml_schema::time&); -void operator>> (irawstream&, xml_schema::str_seq&); +void operator>> (irawstream&, xml_schema::string_sequence&); template <typename T> -void operator>> (irawstream&, xml_schema::pod_seq<T>&); +void operator>> (irawstream&, xml_schema::pod_sequence<T>&); template <typename T> -void operator>> (irawstream&, xml_schema::fix_seq<T>&); +void operator>> (irawstream&, xml_schema::fix_sequence<T>&); template <typename T> -void operator>> (irawstream&, xml_schema::var_seq<T>&); +void operator>> (irawstream&, xml_schema::var_sequence<T>&); #include "irawstream.ixx" #include "irawstream.txx" diff --git a/examples/cxx/hybrid/binary/custom/irawstream.txx b/examples/cxx/hybrid/binary/custom/irawstream.txx index b1bf757..635f131 100644 --- a/examples/cxx/hybrid/binary/custom/irawstream.txx +++ b/examples/cxx/hybrid/binary/custom/irawstream.txx @@ -6,7 +6,7 @@ template <typename T> void -operator>> (irawstream& s, xml_schema::pod_seq<T>& x) +operator>> (irawstream& s, xml_schema::pod_sequence<T>& x) { size_t n; irawstream::as_size as_size (n); @@ -21,7 +21,7 @@ operator>> (irawstream& s, xml_schema::pod_seq<T>& x) template <typename T> void -operator>> (irawstream& s, xml_schema::fix_seq<T>& x) +operator>> (irawstream& s, xml_schema::fix_sequence<T>& x) { size_t n; irawstream::as_size as_size (n); @@ -44,7 +44,7 @@ operator>> (irawstream& s, xml_schema::fix_seq<T>& x) template <typename T> void -operator>> (irawstream& s, xml_schema::var_seq<T>& x) +operator>> (irawstream& s, xml_schema::var_sequence<T>& x) { size_t n; irawstream::as_size as_size (n); @@ -59,7 +59,7 @@ operator>> (irawstream& s, xml_schema::var_seq<T>& x) while (n--) { T* p = new T; - typename xml_schema::var_seq<T>::guard g (p); + typename xml_schema::var_sequence<T>::guard g (p); s >> *p; g.release (); x.push_back (p); diff --git a/examples/cxx/hybrid/binary/custom/orawstream.cxx b/examples/cxx/hybrid/binary/custom/orawstream.cxx index dc4b477..d3c7867 100644 --- a/examples/cxx/hybrid/binary/custom/orawstream.cxx +++ b/examples/cxx/hybrid/binary/custom/orawstream.cxx @@ -63,11 +63,11 @@ operator<< (const buffer& x) } void -operator<< (orawstream& s, const str_seq& x) +operator<< (orawstream& s, const string_sequence& x) { s << orawstream::as_size (x.size ()); - for (str_seq::const_iterator i = x.begin (); + for (string_sequence::const_iterator i = x.begin (); i != x.end (); ++i) { s << *i; diff --git a/examples/cxx/hybrid/binary/custom/orawstream.hxx b/examples/cxx/hybrid/binary/custom/orawstream.hxx index 9689e61..04b5ace 100644 --- a/examples/cxx/hybrid/binary/custom/orawstream.hxx +++ b/examples/cxx/hybrid/binary/custom/orawstream.hxx @@ -74,16 +74,16 @@ void operator<< (orawstream&, const xml_schema::gyear&); void operator<< (orawstream&, const xml_schema::gyear_month&); void operator<< (orawstream&, const xml_schema::time&); -void operator<< (orawstream&, const xml_schema::str_seq&); +void operator<< (orawstream&, const xml_schema::string_sequence&); template <typename T> -void operator<< (orawstream&, const xml_schema::pod_seq<T>&); +void operator<< (orawstream&, const xml_schema::pod_sequence<T>&); template <typename T> -void operator<< (orawstream&, const xml_schema::fix_seq<T>&); +void operator<< (orawstream&, const xml_schema::fix_sequence<T>&); template <typename T> -void operator<< (orawstream&, const xml_schema::var_seq<T>&); +void operator<< (orawstream&, const xml_schema::var_sequence<T>&); #include "orawstream.ixx" #include "orawstream.txx" diff --git a/examples/cxx/hybrid/binary/custom/orawstream.txx b/examples/cxx/hybrid/binary/custom/orawstream.txx index 46c5b71..cc95de9 100644 --- a/examples/cxx/hybrid/binary/custom/orawstream.txx +++ b/examples/cxx/hybrid/binary/custom/orawstream.txx @@ -6,7 +6,7 @@ template <typename T> void -operator<< (orawstream& s, const xml_schema::pod_seq<T>& x) +operator<< (orawstream& s, const xml_schema::pod_sequence<T>& x) { size_t n = x.size (); @@ -22,11 +22,11 @@ operator<< (orawstream& s, const xml_schema::pod_seq<T>& x) template <typename T> void -operator<< (orawstream& s, const xml_schema::fix_seq<T>& x) +operator<< (orawstream& s, const xml_schema::fix_sequence<T>& x) { s << orawstream::as_size (x.size ()); - for (typename xml_schema::fix_seq<T>::const_iterator i = x.begin (); + for (typename xml_schema::fix_sequence<T>::const_iterator i = x.begin (); i != x.end (); ++i) { s << *i; @@ -35,11 +35,11 @@ operator<< (orawstream& s, const xml_schema::fix_seq<T>& x) template <typename T> void -operator<< (orawstream& s, const xml_schema::var_seq<T>& x) +operator<< (orawstream& s, const xml_schema::var_sequence<T>& x) { s << orawstream::as_size (x.size ()); - for (typename xml_schema::var_seq<T>::const_iterator i = x.begin (); + for (typename xml_schema::var_sequence<T>::const_iterator i = x.begin (); i != x.end (); ++i) { s << *i; diff --git a/examples/cxx/hybrid/custom/wildcard/envelope.hxx b/examples/cxx/hybrid/custom/wildcard/envelope.hxx index 56abedd..de2ba0a 100644 --- a/examples/cxx/hybrid/custom/wildcard/envelope.hxx +++ b/examples/cxx/hybrid/custom/wildcard/envelope.hxx @@ -15,7 +15,7 @@ namespace email class envelope: public envelope_base { public: - typedef xml_schema::var_seq<email::body> body_sequence; + typedef xml_schema::var_sequence<email::body> body_sequence; typedef body_sequence::iterator body_iterator; typedef body_sequence::const_iterator body_const_iterator; diff --git a/libxsde/xsde/cxx/hybrid/cdr/istream.hxx b/libxsde/xsde/cxx/hybrid/cdr/istream.hxx index 484010b..db61f88 100644 --- a/libxsde/xsde/cxx/hybrid/cdr/istream.hxx +++ b/libxsde/xsde/cxx/hybrid/cdr/istream.hxx @@ -155,22 +155,22 @@ namespace xsde #ifdef XSDE_EXCEPTIONS template <typename T> - void operator>> (icdrstream&, pod_seq<T>&); + void operator>> (icdrstream&, pod_sequence<T>&); template <typename T> - void operator>> (icdrstream&, fix_seq<T>&); + void operator>> (icdrstream&, fix_sequence<T>&); template <typename T> - void operator>> (icdrstream&, var_seq<T>&); + void operator>> (icdrstream&, var_sequence<T>&); #else template <typename T> - bool operator>> (icdrstream&, pod_seq<T>&); + bool operator>> (icdrstream&, pod_sequence<T>&); template <typename T> - bool operator>> (icdrstream&, fix_seq<T>&); + bool operator>> (icdrstream&, fix_sequence<T>&); template <typename T> - bool operator>> (icdrstream&, var_seq<T>&); + bool operator>> (icdrstream&, var_sequence<T>&); #endif } } diff --git a/libxsde/xsde/cxx/hybrid/cdr/istream.txx b/libxsde/xsde/cxx/hybrid/cdr/istream.txx index 9afc5f5..8ad16f0 100644 --- a/libxsde/xsde/cxx/hybrid/cdr/istream.txx +++ b/libxsde/xsde/cxx/hybrid/cdr/istream.txx @@ -13,7 +13,7 @@ namespace xsde template <typename T> void - operator>> (icdrstream& s, pod_seq<T>& x) + operator>> (icdrstream& s, pod_sequence<T>& x) { size_t n; icdrstream::as_size as_size (n); @@ -36,7 +36,7 @@ namespace xsde template <typename T> void - operator>> (icdrstream& s, fix_seq<T>& x) + operator>> (icdrstream& s, fix_sequence<T>& x) { size_t n; icdrstream::as_size as_size (n); @@ -59,7 +59,7 @@ namespace xsde template <typename T> void - operator>> (icdrstream& s, var_seq<T>& x) + operator>> (icdrstream& s, var_sequence<T>& x) { size_t n; icdrstream::as_size as_size (n); @@ -74,7 +74,7 @@ namespace xsde while (n--) { T* p = new T; - typename var_seq<T>::guard g (p); + typename var_sequence<T>::guard g (p); s >> *p; g.release (); x.push_back (p); @@ -86,7 +86,7 @@ namespace xsde template <typename T> bool - operator>> (icdrstream& s, pod_seq<T>& x) + operator>> (icdrstream& s, pod_sequence<T>& x) { size_t n; icdrstream::as_size as_size (n); @@ -114,7 +114,7 @@ namespace xsde template <typename T> bool - operator>> (icdrstream& s, fix_seq<T>& x) + operator>> (icdrstream& s, fix_sequence<T>& x) { size_t n; icdrstream::as_size as_size (n); @@ -142,7 +142,7 @@ namespace xsde template <typename T> bool - operator>> (icdrstream& s, var_seq<T>& x) + operator>> (icdrstream& s, var_sequence<T>& x) { size_t n; icdrstream::as_size as_size (n); diff --git a/libxsde/xsde/cxx/hybrid/cdr/ostream.hxx b/libxsde/xsde/cxx/hybrid/cdr/ostream.hxx index 6b33fe0..851882e 100644 --- a/libxsde/xsde/cxx/hybrid/cdr/ostream.hxx +++ b/libxsde/xsde/cxx/hybrid/cdr/ostream.hxx @@ -155,22 +155,22 @@ namespace xsde #ifdef XSDE_EXCEPTIONS template <typename T> - void operator<< (ocdrstream&, const pod_seq<T>&); + void operator<< (ocdrstream&, const pod_sequence<T>&); template <typename T> - void operator<< (ocdrstream&, const fix_seq<T>&); + void operator<< (ocdrstream&, const fix_sequence<T>&); template <typename T> - void operator<< (ocdrstream&, const var_seq<T>&); + void operator<< (ocdrstream&, const var_sequence<T>&); #else template <typename T> - bool operator<< (ocdrstream&, const pod_seq<T>&); + bool operator<< (ocdrstream&, const pod_sequence<T>&); template <typename T> - bool operator<< (ocdrstream&, const fix_seq<T>&); + bool operator<< (ocdrstream&, const fix_sequence<T>&); template <typename T> - bool operator<< (ocdrstream&, const var_seq<T>&); + bool operator<< (ocdrstream&, const var_sequence<T>&); #endif } } diff --git a/libxsde/xsde/cxx/hybrid/cdr/ostream.txx b/libxsde/xsde/cxx/hybrid/cdr/ostream.txx index 1dd40df..9527252 100644 --- a/libxsde/xsde/cxx/hybrid/cdr/ostream.txx +++ b/libxsde/xsde/cxx/hybrid/cdr/ostream.txx @@ -14,11 +14,11 @@ namespace xsde template <typename T> void - operator<< (ocdrstream& s, const pod_seq<T>& x) + operator<< (ocdrstream& s, const pod_sequence<T>& x) { s << ocdrstream::as_size (x.size ()); - for (typename pod_seq<T>::const_iterator i = x.begin (); + for (typename pod_sequence<T>::const_iterator i = x.begin (); i != x.end (); ++i) { s << *i; @@ -27,11 +27,11 @@ namespace xsde template <typename T> void - operator<< (ocdrstream& s, const fix_seq<T>& x) + operator<< (ocdrstream& s, const fix_sequence<T>& x) { s << ocdrstream::as_size (x.size ()); - for (typename fix_seq<T>::const_iterator i = x.begin (); + for (typename fix_sequence<T>::const_iterator i = x.begin (); i != x.end (); ++i) { s << *i; @@ -40,11 +40,11 @@ namespace xsde template <typename T> void - operator<< (ocdrstream& s, const var_seq<T>& x) + operator<< (ocdrstream& s, const var_sequence<T>& x) { s << ocdrstream::as_size (x.size ()); - for (typename var_seq<T>::const_iterator i = x.begin (); + for (typename var_sequence<T>::const_iterator i = x.begin (); i != x.end (); ++i) { s << *i; @@ -55,12 +55,12 @@ namespace xsde template <typename T> bool - operator<< (ocdrstream& s, const pod_seq<T>& x) + operator<< (ocdrstream& s, const pod_sequence<T>& x) { if (!(s << ocdrstream::as_size (x.size ()))) return false; - for (typename pod_seq<T>::const_iterator i = x.begin (); + for (typename pod_sequence<T>::const_iterator i = x.begin (); i != x.end (); ++i) { if (!(s << *i)) @@ -72,12 +72,12 @@ namespace xsde template <typename T> bool - operator<< (ocdrstream& s, const fix_seq<T>& x) + operator<< (ocdrstream& s, const fix_sequence<T>& x) { if (!(s << ocdrstream::as_size (x.size ()))) return false; - for (typename fix_seq<T>::const_iterator i = x.begin (); + for (typename fix_sequence<T>::const_iterator i = x.begin (); i != x.end (); ++i) { if (!(s << *i)) @@ -89,12 +89,12 @@ namespace xsde template <typename T> bool - operator<< (ocdrstream& s, const var_seq<T>& x) + operator<< (ocdrstream& s, const var_sequence<T>& x) { if (!(s << ocdrstream::as_size (x.size ()))) return false; - for (typename var_seq<T>::const_iterator i = x.begin (); + for (typename var_sequence<T>::const_iterator i = x.begin (); i != x.end (); ++i) { if (!(s << *i)) diff --git a/libxsde/xsde/cxx/hybrid/sequence.cxx b/libxsde/xsde/cxx/hybrid/sequence.cxx index da16e95..eed8e11 100644 --- a/libxsde/xsde/cxx/hybrid/sequence.cxx +++ b/libxsde/xsde/cxx/hybrid/sequence.cxx @@ -12,10 +12,10 @@ namespace xsde namespace hybrid { // - // data_seq + // data_sequence // - void data_seq:: + void data_sequence:: clear () { if (destructor_) diff --git a/libxsde/xsde/cxx/hybrid/sequence.hxx b/libxsde/xsde/cxx/hybrid/sequence.hxx index b0cdba2..251b448 100644 --- a/libxsde/xsde/cxx/hybrid/sequence.hxx +++ b/libxsde/xsde/cxx/hybrid/sequence.hxx @@ -26,7 +26,7 @@ namespace xsde // Sequence with fixed-length POD elements. // template <typename T> - class pod_seq: public sequence_base + class pod_sequence: public sequence_base { public: typedef T value_type; @@ -118,13 +118,13 @@ namespace xsde assign (const T*, size_t); void - swap (pod_seq&); + swap (pod_sequence&); }; // Sequence with fixed-length elements. // template <typename T> - class fix_seq: public sequence_base + class fix_sequence: public sequence_base { public: typedef T value_type; @@ -140,7 +140,7 @@ namespace xsde typedef const T* const_iterator; public: - ~fix_seq (); + ~fix_sequence (); public: iterator @@ -219,7 +219,7 @@ namespace xsde assign (const T*, size_t); void - swap (fix_seq&); + swap (fix_sequence&); private: static void @@ -712,7 +712,7 @@ namespace xsde // // template <typename T> - class var_seq: public sequence_base + class var_sequence: public sequence_base { public: typedef T value_type; @@ -728,7 +728,7 @@ namespace xsde typedef var_const_iterator<T> const_iterator; public: - ~var_seq (); + ~var_sequence (); public: iterator @@ -812,7 +812,7 @@ namespace xsde reserve (size_t); void - swap (var_seq&); + swap (var_sequence&); #ifdef XSDE_EXCEPTIONS public: @@ -833,12 +833,12 @@ namespace xsde // String sequence. // - typedef string_sequence str_seq; + using cxx::string_sequence; // Custom data sequence. // - class data_seq: public sequence_base + class data_sequence: public sequence_base { public: typedef void* value_type; @@ -854,8 +854,8 @@ namespace xsde typedef const void* const* const_iterator; public: - ~data_seq (); - data_seq (); + ~data_sequence (); + data_sequence (); typedef void (*destroy_func) (void* data, size_t pos); @@ -932,7 +932,7 @@ namespace xsde reserve (size_t); void - swap (data_seq&); + swap (data_sequence&); private: destroy_func destructor_; diff --git a/libxsde/xsde/cxx/hybrid/sequence.ixx b/libxsde/xsde/cxx/hybrid/sequence.ixx index a015e31..2c77763 100644 --- a/libxsde/xsde/cxx/hybrid/sequence.ixx +++ b/libxsde/xsde/cxx/hybrid/sequence.ixx @@ -14,32 +14,32 @@ namespace xsde namespace hybrid { // - // pod_seq + // pod_sequence // template <typename T> - inline size_t pod_seq<T>:: + inline size_t pod_sequence<T>:: max_size () const { return size_t (-1) / sizeof (T); } template <typename T> - inline void pod_seq<T>:: - swap (pod_seq& x) + inline void pod_sequence<T>:: + swap (pod_sequence& x) { swap_ (x); } template <typename T> - inline T* pod_seq<T>:: + inline T* pod_sequence<T>:: begin () { return static_cast<T*> (data_); } template <typename T> - inline const T* pod_seq<T>:: + inline const T* pod_sequence<T>:: begin () const { // g++ 2.95 does not like static_cast here. @@ -48,77 +48,77 @@ namespace xsde } template <typename T> - inline T* pod_seq<T>:: + inline T* pod_sequence<T>:: end () { return static_cast<T*> (data_) + size_; } template <typename T> - inline const T* pod_seq<T>:: + inline const T* pod_sequence<T>:: end () const { return ((const T*) (data_)) + size_; } template <typename T> - inline T& pod_seq<T>:: + inline T& pod_sequence<T>:: front () { return *static_cast<T*> (data_); } template <typename T> - inline const T& pod_seq<T>:: + inline const T& pod_sequence<T>:: front () const { return *((const T*) (data_)); } template <typename T> - inline T& pod_seq<T>:: + inline T& pod_sequence<T>:: back () { return static_cast<T*> (data_)[size_ - 1]; } template <typename T> - inline const T& pod_seq<T>:: + inline const T& pod_sequence<T>:: back () const { return ((const T*) (data_))[size_ - 1]; } template <typename T> - inline T& pod_seq<T>:: + inline T& pod_sequence<T>:: operator[] (size_t i) { return static_cast<T*> (data_)[i]; } template <typename T> - inline const T& pod_seq<T>:: + inline const T& pod_sequence<T>:: operator[] (size_t i) const { return ((const T*) (data_))[i]; } template <typename T> - inline void pod_seq<T>:: + inline void pod_sequence<T>:: clear () { size_ = 0; } template <typename T> - inline void pod_seq<T>:: + inline void pod_sequence<T>:: pop_back () { --size_; } template <typename T> - inline T* pod_seq<T>:: + inline T* pod_sequence<T>:: erase (T* i) { if (i != static_cast<T*> (data_) + (size_ - 1)) @@ -131,7 +131,7 @@ namespace xsde #ifdef XSDE_EXCEPTIONS template <typename T> - inline void pod_seq<T>:: + inline void pod_sequence<T>:: push_back (const T& x) { if (capacity_ < size_ + 1) @@ -141,7 +141,7 @@ namespace xsde } template <typename T> - inline T* pod_seq<T>:: + inline T* pod_sequence<T>:: insert (T* i, const T& x) { T* p = static_cast<T*> (insert_ (i, sizeof (T), 0, 0)); @@ -150,7 +150,7 @@ namespace xsde } template <typename T> - inline void pod_seq<T>:: + inline void pod_sequence<T>:: reserve (size_t n) { if (capacity_ < n) @@ -158,7 +158,7 @@ namespace xsde } template <typename T> - inline void pod_seq<T>:: + inline void pod_sequence<T>:: assign (const T* p, size_t n) { if (capacity_ < n) @@ -169,7 +169,7 @@ namespace xsde } #else template <typename T> - inline sequence_base::error pod_seq<T>:: + inline sequence_base::error pod_sequence<T>:: push_back (const T& x) { error r = error_none; @@ -184,7 +184,7 @@ namespace xsde } template <typename T> - inline sequence_base::error pod_seq<T>:: + inline sequence_base::error pod_sequence<T>:: insert (T* i, const T& x) { T* p = static_cast<T*> (insert_ (i, sizeof (T), 0, 0)); @@ -199,7 +199,7 @@ namespace xsde } template <typename T> - inline sequence_base::error pod_seq<T>:: + inline sequence_base::error pod_sequence<T>:: insert (T* i, const T& x, T*& r) { T* p = static_cast<T*> (insert_ (i, sizeof (T), 0, 0)); @@ -215,7 +215,7 @@ namespace xsde } template <typename T> - inline sequence_base::error pod_seq<T>:: + inline sequence_base::error pod_sequence<T>:: reserve (size_t n) { error r = error_none; @@ -225,7 +225,7 @@ namespace xsde } template <typename T> - inline sequence_base::error pod_seq<T>:: + inline sequence_base::error pod_sequence<T>:: assign (const T* p, size_t n) { if (capacity_ < n) @@ -241,102 +241,102 @@ namespace xsde #endif // - // fix_seq + // fix_sequence // template <typename T> - inline fix_seq<T>:: - ~fix_seq () + inline fix_sequence<T>:: + ~fix_sequence () { clear (); } template <typename T> - inline size_t fix_seq<T>:: + inline size_t fix_sequence<T>:: max_size () const { return size_t (-1) / sizeof (T); } template <typename T> - inline void fix_seq<T>:: - swap (fix_seq& x) + inline void fix_sequence<T>:: + swap (fix_sequence& x) { swap_ (x); } template <typename T> - inline T* fix_seq<T>:: + inline T* fix_sequence<T>:: begin () { return static_cast<T*> (data_); } template <typename T> - inline const T* fix_seq<T>:: + inline const T* fix_sequence<T>:: begin () const { return (const T*) (data_); } template <typename T> - inline T* fix_seq<T>:: + inline T* fix_sequence<T>:: end () { return static_cast<T*> (data_) + size_; } template <typename T> - inline const T* fix_seq<T>:: + inline const T* fix_sequence<T>:: end () const { return ((const T*) (data_)) + size_; } template <typename T> - inline T& fix_seq<T>:: + inline T& fix_sequence<T>:: front () { return *static_cast<T*> (data_); } template <typename T> - inline const T& fix_seq<T>:: + inline const T& fix_sequence<T>:: front () const { return *((const T*) (data_)); } template <typename T> - inline T& fix_seq<T>:: + inline T& fix_sequence<T>:: back () { return static_cast<T*> (data_)[size_ - 1]; } template <typename T> - inline const T& fix_seq<T>:: + inline const T& fix_sequence<T>:: back () const { return ((const T*) (data_))[size_ - 1]; } template <typename T> - inline T& fix_seq<T>:: + inline T& fix_sequence<T>:: operator[] (size_t i) { return static_cast<T*> (data_)[i]; } template <typename T> - inline const T& fix_seq<T>:: + inline const T& fix_sequence<T>:: operator[] (size_t i) const { return ((const T*) (data_))[i]; } template <typename T> - inline void fix_seq<T>:: + inline void fix_sequence<T>:: pop_back () { static_cast<T*> (data_)[size_ - 1].~T (); @@ -344,7 +344,7 @@ namespace xsde } template <typename T> - inline T* fix_seq<T>:: + inline T* fix_sequence<T>:: erase (T* i) { if (i != static_cast<T*> (data_) + (size_ - 1)) @@ -360,7 +360,7 @@ namespace xsde #ifdef XSDE_EXCEPTIONS template <typename T> - inline void fix_seq<T>:: + inline void fix_sequence<T>:: push_back (const T& x) { if (capacity_ < size_ + 1) @@ -371,7 +371,7 @@ namespace xsde } template <typename T> - inline T* fix_seq<T>:: + inline T* fix_sequence<T>:: insert (T* i, const T& x) { T* p = static_cast<T*> ( @@ -381,7 +381,7 @@ namespace xsde } template <typename T> - inline void fix_seq<T>:: + inline void fix_sequence<T>:: reserve (size_t n) { if (capacity_ < n) @@ -389,7 +389,7 @@ namespace xsde } #else template <typename T> - inline sequence_base::error fix_seq<T>:: + inline sequence_base::error fix_sequence<T>:: push_back (const T& x) { error r = error_none; @@ -407,7 +407,7 @@ namespace xsde } template <typename T> - inline sequence_base::error fix_seq<T>:: + inline sequence_base::error fix_sequence<T>:: insert (T* i, const T& x) { T* p = static_cast<T*> ( @@ -423,7 +423,7 @@ namespace xsde } template <typename T> - inline sequence_base::error fix_seq<T>:: + inline sequence_base::error fix_sequence<T>:: insert (T* i, const T& x, T*& r) { T* p = static_cast<T*> ( @@ -440,7 +440,7 @@ namespace xsde } template <typename T> - inline sequence_base::error fix_seq<T>:: + inline sequence_base::error fix_sequence<T>:: reserve (size_t n) { error r = error_none; @@ -451,67 +451,67 @@ namespace xsde #endif // - // var_seq + // var_sequence // template <typename T> - inline var_seq<T>:: - ~var_seq () + inline var_sequence<T>:: + ~var_sequence () { clear (); } template <typename T> - inline size_t var_seq<T>:: + inline size_t var_sequence<T>:: max_size () const { return size_t (-1) / sizeof (T*); } template <typename T> - inline void var_seq<T>:: - swap (var_seq& x) + inline void var_sequence<T>:: + swap (var_sequence& x) { swap_ (x); } template <typename T> - inline var_iterator<T> var_seq<T>:: + inline var_iterator<T> var_sequence<T>:: begin () { return iterator (static_cast<T**> (data_)); } template <typename T> - inline var_const_iterator<T> var_seq<T>:: + inline var_const_iterator<T> var_sequence<T>:: begin () const { return const_iterator ((const T**) (data_)); } template <typename T> - inline var_iterator<T> var_seq<T>:: + inline var_iterator<T> var_sequence<T>:: end () { return iterator (static_cast<T**> (data_) + size_); } template <typename T> - inline var_const_iterator<T> var_seq<T>:: + inline var_const_iterator<T> var_sequence<T>:: end () const { return const_iterator (((const T**) (data_)) + size_); } template <typename T> - inline T& var_seq<T>:: + inline T& var_sequence<T>:: front () { return **static_cast<T**> (data_); } template <typename T> - inline const T& var_seq<T>:: + inline const T& var_sequence<T>:: front () const { // g++ 2.95 does not like static_cast here. @@ -520,35 +520,35 @@ namespace xsde } template <typename T> - inline T& var_seq<T>:: + inline T& var_sequence<T>:: back () { return *(static_cast<T**> (data_)[size_ - 1]); } template <typename T> - inline const T& var_seq<T>:: + inline const T& var_sequence<T>:: back () const { return *(((const T* const*) (data_))[size_ - 1]); } template <typename T> - inline T& var_seq<T>:: + inline T& var_sequence<T>:: operator[] (size_t i) { return *(static_cast<T**> (data_)[i]); } template <typename T> - inline const T& var_seq<T>:: + inline const T& var_sequence<T>:: operator[] (size_t i) const { return *(((const T* const*) (data_))[i]); } template <typename T> - inline void var_seq<T>:: + inline void var_sequence<T>:: pop_back () { delete static_cast<T**> (data_)[size_ - 1]; @@ -556,7 +556,7 @@ namespace xsde } template <typename T> - inline var_iterator<T> var_seq<T>:: + inline var_iterator<T> var_sequence<T>:: erase (iterator i) { delete *i.i_; @@ -570,7 +570,7 @@ namespace xsde } template <typename T> - inline T* var_seq<T>:: + inline T* var_sequence<T>:: detach (iterator i) { T* r = *i.i_; @@ -579,7 +579,7 @@ namespace xsde } template <typename T> - inline void var_seq<T>:: + inline void var_sequence<T>:: attach (iterator i, T* x) { delete *i.i_; @@ -588,7 +588,7 @@ namespace xsde #ifdef XSDE_EXCEPTIONS template <typename T> - inline void var_seq<T>:: + inline void var_sequence<T>:: push_back (T* x) { guard g (x); @@ -602,7 +602,7 @@ namespace xsde } template <typename T> - inline var_iterator<T> var_seq<T>:: + inline var_iterator<T> var_sequence<T>:: insert (iterator i, T* x) { guard g (x); @@ -613,7 +613,7 @@ namespace xsde } template <typename T> - inline void var_seq<T>:: + inline void var_sequence<T>:: reserve (size_t n) { if (capacity_ < n) @@ -621,7 +621,7 @@ namespace xsde } #else template <typename T> - inline sequence_base::error var_seq<T>:: + inline sequence_base::error var_sequence<T>:: push_back (T* x) { error r = error_none; @@ -638,7 +638,7 @@ namespace xsde } template <typename T> - inline sequence_base::error var_seq<T>:: + inline sequence_base::error var_sequence<T>:: insert (iterator i, T* x) { T** p = static_cast<T**> (insert_ (i.i_, sizeof (T*), 0, 0)); @@ -656,7 +656,7 @@ namespace xsde } template <typename T> - inline sequence_base::error var_seq<T>:: + inline sequence_base::error var_sequence<T>:: insert (iterator i, T* x, iterator& r) { T** p = static_cast<T**> (insert_ (i.i_, sizeof (T*), 0, 0)); @@ -675,7 +675,7 @@ namespace xsde } template <typename T> - inline sequence_base::error var_seq<T>:: + inline sequence_base::error var_sequence<T>:: reserve (size_t n) { error r = error_none; @@ -686,46 +686,46 @@ namespace xsde #endif // - // data_seq + // data_sequence // - inline data_seq:: - ~data_seq () + inline data_sequence:: + ~data_sequence () { clear (); } - inline data_seq:: - data_seq () + inline data_sequence:: + data_sequence () : destructor_ (0) { } - inline void data_seq:: - destructor (data_seq::destroy_func d) + inline void data_sequence:: + destructor (data_sequence::destroy_func d) { destructor_ = d; } - inline size_t data_seq:: + inline size_t data_sequence:: max_size () const { return size_t (-1) / sizeof (void*); } - inline void data_seq:: - swap (data_seq& x) + inline void data_sequence:: + swap (data_sequence& x) { swap_ (x); } - inline data_seq::iterator data_seq:: + inline data_sequence::iterator data_sequence:: begin () { return static_cast<void**> (data_); } - inline data_seq::const_iterator data_seq:: + inline data_sequence::const_iterator data_sequence:: begin () const { // g++ 2.95 does not like static_cast here. @@ -733,55 +733,55 @@ namespace xsde return (const void* const*) (data_); } - inline data_seq::iterator data_seq:: + inline data_sequence::iterator data_sequence:: end () { return static_cast<void**> (data_) + size_; } - inline data_seq::const_iterator data_seq:: + inline data_sequence::const_iterator data_sequence:: end () const { return ((const void* const*) (data_)) + size_; } - inline void* data_seq:: + inline void* data_sequence:: front () { return *static_cast<void**> (data_); } - inline const void* data_seq:: + inline const void* data_sequence:: front () const { return *((const void* const*) (data_)); } - inline void* data_seq:: + inline void* data_sequence:: back () { return static_cast<void**> (data_)[size_ - 1]; } - inline const void* data_seq:: + inline const void* data_sequence:: back () const { return ((const void* const*) (data_))[size_ - 1]; } - inline void* data_seq:: + inline void* data_sequence:: operator[] (size_t i) { return static_cast<void**> (data_)[i]; } - inline const void* data_seq:: + inline const void* data_sequence:: operator[] (size_t i) const { return ((const void* const*) (data_))[i]; } - inline void data_seq:: + inline void data_sequence:: pop_back () { if (destructor_) @@ -789,7 +789,7 @@ namespace xsde --size_; } - inline data_seq::iterator data_seq:: + inline data_sequence::iterator data_sequence:: erase (iterator i) { if (destructor_) @@ -804,28 +804,28 @@ namespace xsde } #ifdef XSDE_EXCEPTIONS - namespace data_seq_bits + namespace data_sequence_bits { struct guard { ~guard () { if (p_ && d_) d_ (p_, i_); } - guard (data_seq::destroy_func d, void* p, size_t i) + guard (data_sequence::destroy_func d, void* p, size_t i) : d_ (d), p_ (p), i_ (i) {} void release () { p_ = 0; } private: - data_seq::destroy_func d_; + data_sequence::destroy_func d_; void* p_; size_t i_; }; } - inline void data_seq:: + inline void data_sequence:: push_back (void* x) { - data_seq_bits::guard g (destructor_, x, size_); + data_sequence_bits::guard g (destructor_, x, size_); if (capacity_ < size_ + 1) grow_ (0, sizeof (void*), 0); @@ -835,10 +835,10 @@ namespace xsde g.release (); } - inline data_seq::iterator data_seq:: + inline data_sequence::iterator data_sequence:: insert (iterator i, void* x) { - data_seq_bits::guard g ( + data_sequence_bits::guard g ( destructor_, x, i - static_cast<void**> (data_)); void** p = static_cast<void**> (insert_ (i, sizeof (void*), 0, 0)); @@ -847,14 +847,14 @@ namespace xsde return p; } - inline void data_seq:: + inline void data_sequence:: reserve (size_t n) { if (capacity_ < n) grow_ (n, sizeof (void*), 0); } #else - inline sequence_base::error data_seq:: + inline sequence_base::error data_sequence:: push_back (void* x) { error r = error_none; @@ -873,7 +873,7 @@ namespace xsde return r; } - inline sequence_base::error data_seq:: + inline sequence_base::error data_sequence:: insert (iterator i, void* x) { size_t pos = i - static_cast<void**> (data_); @@ -892,7 +892,7 @@ namespace xsde } } - inline sequence_base::error data_seq:: + inline sequence_base::error data_sequence:: insert (iterator i, void* x, iterator& r) { size_t pos = i - static_cast<void**> (data_); @@ -912,7 +912,7 @@ namespace xsde } } - inline sequence_base::error data_seq:: + inline sequence_base::error data_sequence:: reserve (size_t n) { error r = error_none; diff --git a/libxsde/xsde/cxx/hybrid/sequence.txx b/libxsde/xsde/cxx/hybrid/sequence.txx index a81ad11..2e8588a 100644 --- a/libxsde/xsde/cxx/hybrid/sequence.txx +++ b/libxsde/xsde/cxx/hybrid/sequence.txx @@ -12,11 +12,11 @@ namespace xsde namespace hybrid { // - // fix_seq + // fix_sequence // template <typename T> - void fix_seq<T>:: + void fix_sequence<T>:: clear () { for (size_t i = 0; i < size_; ++i) @@ -27,7 +27,7 @@ namespace xsde #ifdef XSDE_EXCEPTIONS template <typename T> - void fix_seq<T>:: + void fix_sequence<T>:: assign (const T* p, size_t n) { clear (); @@ -38,7 +38,7 @@ namespace xsde } #else template <typename T> - sequence_base::error fix_seq<T>:: + sequence_base::error fix_sequence<T>:: assign (const T* p, size_t n) { clear (); @@ -55,7 +55,7 @@ namespace xsde #ifdef XSDE_EXCEPTIONS template <typename T> - void fix_seq<T>:: + void fix_sequence<T>:: move_ (void* dst, void* src, size_t n) { T* d = static_cast<T*> (dst); @@ -77,7 +77,7 @@ namespace xsde } #else template <typename T> - void fix_seq<T>:: + void fix_sequence<T>:: move_ (void* dst, void* src, size_t n) { T* d = static_cast<T*> (dst); @@ -92,7 +92,7 @@ namespace xsde #endif template <typename T> - void fix_seq<T>:: + void fix_sequence<T>:: move_forward_ (void* p, size_t n) { // We are moving a sequence of elements one position to the left. @@ -110,7 +110,7 @@ namespace xsde #ifdef XSDE_EXCEPTIONS template <typename T> - void fix_seq<T>:: + void fix_sequence<T>:: move_backward_ (void* p, size_t n, size_t& size) { // We are moving a sequence of elements one position to the right. @@ -128,7 +128,7 @@ namespace xsde } #else template <typename T> - void fix_seq<T>:: + void fix_sequence<T>:: move_backward_ (void* p, size_t n) { // We are moving a sequence of elements one position to the right. @@ -144,11 +144,11 @@ namespace xsde #endif // - // var_seq + // var_sequence // template <typename T> - void var_seq<T>:: + void var_sequence<T>:: clear () { for (size_t i = 0; i < size_; ++i) diff --git a/libxsde/xsde/cxx/hybrid/xdr/istream.hxx b/libxsde/xsde/cxx/hybrid/xdr/istream.hxx index 559b136..c5c2f8b 100644 --- a/libxsde/xsde/cxx/hybrid/xdr/istream.hxx +++ b/libxsde/xsde/cxx/hybrid/xdr/istream.hxx @@ -154,22 +154,22 @@ namespace xsde #ifdef XSDE_EXCEPTIONS template <typename T> - void operator>> (ixdrstream&, pod_seq<T>&); + void operator>> (ixdrstream&, pod_sequence<T>&); template <typename T> - void operator>> (ixdrstream&, fix_seq<T>&); + void operator>> (ixdrstream&, fix_sequence<T>&); template <typename T> - void operator>> (ixdrstream&, var_seq<T>&); + void operator>> (ixdrstream&, var_sequence<T>&); #else template <typename T> - bool operator>> (ixdrstream&, pod_seq<T>&); + bool operator>> (ixdrstream&, pod_sequence<T>&); template <typename T> - bool operator>> (ixdrstream&, fix_seq<T>&); + bool operator>> (ixdrstream&, fix_sequence<T>&); template <typename T> - bool operator>> (ixdrstream&, var_seq<T>&); + bool operator>> (ixdrstream&, var_sequence<T>&); #endif } } diff --git a/libxsde/xsde/cxx/hybrid/xdr/istream.txx b/libxsde/xsde/cxx/hybrid/xdr/istream.txx index c13015d..9625d62 100644 --- a/libxsde/xsde/cxx/hybrid/xdr/istream.txx +++ b/libxsde/xsde/cxx/hybrid/xdr/istream.txx @@ -13,7 +13,7 @@ namespace xsde template <typename T> void - operator>> (ixdrstream& s, pod_seq<T>& x) + operator>> (ixdrstream& s, pod_sequence<T>& x) { size_t n; ixdrstream::as_size as_size (n); @@ -36,7 +36,7 @@ namespace xsde template <typename T> void - operator>> (ixdrstream& s, fix_seq<T>& x) + operator>> (ixdrstream& s, fix_sequence<T>& x) { size_t n; ixdrstream::as_size as_size (n); @@ -59,7 +59,7 @@ namespace xsde template <typename T> void - operator>> (ixdrstream& s, var_seq<T>& x) + operator>> (ixdrstream& s, var_sequence<T>& x) { size_t n; ixdrstream::as_size as_size (n); @@ -74,7 +74,7 @@ namespace xsde while (n--) { T* p = new T; - typename var_seq<T>::guard g (p); + typename var_sequence<T>::guard g (p); s >> *p; g.release (); x.push_back (p); @@ -86,7 +86,7 @@ namespace xsde template <typename T> bool - operator>> (ixdrstream& s, pod_seq<T>& x) + operator>> (ixdrstream& s, pod_sequence<T>& x) { size_t n; ixdrstream::as_size as_size (n); @@ -114,7 +114,7 @@ namespace xsde template <typename T> bool - operator>> (ixdrstream& s, fix_seq<T>& x) + operator>> (ixdrstream& s, fix_sequence<T>& x) { size_t n; ixdrstream::as_size as_size (n); @@ -142,7 +142,7 @@ namespace xsde template <typename T> bool - operator>> (ixdrstream& s, var_seq<T>& x) + operator>> (ixdrstream& s, var_sequence<T>& x) { size_t n; ixdrstream::as_size as_size (n); diff --git a/libxsde/xsde/cxx/hybrid/xdr/ostream.hxx b/libxsde/xsde/cxx/hybrid/xdr/ostream.hxx index 7a6a2b9..dfcde12 100644 --- a/libxsde/xsde/cxx/hybrid/xdr/ostream.hxx +++ b/libxsde/xsde/cxx/hybrid/xdr/ostream.hxx @@ -154,22 +154,22 @@ namespace xsde #ifdef XSDE_EXCEPTIONS template <typename T> - void operator<< (oxdrstream&, const pod_seq<T>&); + void operator<< (oxdrstream&, const pod_sequence<T>&); template <typename T> - void operator<< (oxdrstream&, const fix_seq<T>&); + void operator<< (oxdrstream&, const fix_sequence<T>&); template <typename T> - void operator<< (oxdrstream&, const var_seq<T>&); + void operator<< (oxdrstream&, const var_sequence<T>&); #else template <typename T> - bool operator<< (oxdrstream&, const pod_seq<T>&); + bool operator<< (oxdrstream&, const pod_sequence<T>&); template <typename T> - bool operator<< (oxdrstream&, const fix_seq<T>&); + bool operator<< (oxdrstream&, const fix_sequence<T>&); template <typename T> - bool operator<< (oxdrstream&, const var_seq<T>&); + bool operator<< (oxdrstream&, const var_sequence<T>&); #endif } } diff --git a/libxsde/xsde/cxx/hybrid/xdr/ostream.txx b/libxsde/xsde/cxx/hybrid/xdr/ostream.txx index 5211b80..1d8fe9e 100644 --- a/libxsde/xsde/cxx/hybrid/xdr/ostream.txx +++ b/libxsde/xsde/cxx/hybrid/xdr/ostream.txx @@ -14,11 +14,11 @@ namespace xsde template <typename T> void - operator<< (oxdrstream& s, const pod_seq<T>& x) + operator<< (oxdrstream& s, const pod_sequence<T>& x) { s << oxdrstream::as_size (x.size ()); - for (typename pod_seq<T>::const_iterator i = x.begin (); + for (typename pod_sequence<T>::const_iterator i = x.begin (); i != x.end (); ++i) { s << *i; @@ -27,11 +27,11 @@ namespace xsde template <typename T> void - operator<< (oxdrstream& s, const fix_seq<T>& x) + operator<< (oxdrstream& s, const fix_sequence<T>& x) { s << oxdrstream::as_size (x.size ()); - for (typename fix_seq<T>::const_iterator i = x.begin (); + for (typename fix_sequence<T>::const_iterator i = x.begin (); i != x.end (); ++i) { s << *i; @@ -40,11 +40,11 @@ namespace xsde template <typename T> void - operator<< (oxdrstream& s, const var_seq<T>& x) + operator<< (oxdrstream& s, const var_sequence<T>& x) { s << oxdrstream::as_size (x.size ()); - for (typename var_seq<T>::const_iterator i = x.begin (); + for (typename var_sequence<T>::const_iterator i = x.begin (); i != x.end (); ++i) { s << *i; @@ -55,12 +55,12 @@ namespace xsde template <typename T> bool - operator<< (oxdrstream& s, const pod_seq<T>& x) + operator<< (oxdrstream& s, const pod_sequence<T>& x) { if (!(s << oxdrstream::as_size (x.size ()))) return false; - for (typename pod_seq<T>::const_iterator i = x.begin (); + for (typename pod_sequence<T>::const_iterator i = x.begin (); i != x.end (); ++i) { if (!(s << *i)) @@ -72,12 +72,12 @@ namespace xsde template <typename T> bool - operator<< (oxdrstream& s, const fix_seq<T>& x) + operator<< (oxdrstream& s, const fix_sequence<T>& x) { if (!(s << oxdrstream::as_size (x.size ()))) return false; - for (typename fix_seq<T>::const_iterator i = x.begin (); + for (typename fix_sequence<T>::const_iterator i = x.begin (); i != x.end (); ++i) { if (!(s << *i)) @@ -89,12 +89,12 @@ namespace xsde template <typename T> bool - operator<< (oxdrstream& s, const var_seq<T>& x) + operator<< (oxdrstream& s, const var_sequence<T>& x) { if (!(s << oxdrstream::as_size (x.size ()))) return false; - for (typename var_seq<T>::const_iterator i = x.begin (); + for (typename var_sequence<T>::const_iterator i = x.begin (); i != x.end (); ++i) { if (!(s << *i)) diff --git a/tests/cxx/hybrid/sequences/driver.cxx b/tests/cxx/hybrid/sequences/driver.cxx index f3d848e..45993be 100644 --- a/tests/cxx/hybrid/sequences/driver.cxx +++ b/tests/cxx/hybrid/sequences/driver.cxx @@ -45,9 +45,9 @@ int main () { // - // pod_seq + // pod_sequence // - typedef pod_seq<int> pod; + typedef pod_sequence<int> pod; { pod s; @@ -121,9 +121,9 @@ main () } // - // fix_seq + // fix_sequence // - typedef fix_seq<string> fix; + typedef fix_sequence<string> fix; { fix s; @@ -199,9 +199,9 @@ main () } // - // var_seq + // var_sequence // - typedef var_seq<string> var; + typedef var_sequence<string> var; { var s; @@ -282,9 +282,9 @@ main () } // - // str_seq + // string_sequence // - typedef str_seq str; + typedef string_sequence str; #ifndef XSDE_STL using xsde::cxx::strdupx; @@ -450,9 +450,9 @@ main () #endif // - // data_seq + // data_sequence // - typedef data_seq data; + typedef data_sequence data; { data s; 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<CLI::generate_extraction> ()), ostreams (ops.value<CLI::generate_insertion> ()), 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<NarrowString> 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 << ";" |