diff options
author | Benjamin Kosnik <bkoz@redhat.com> | 2007-01-29 18:22:37 +0000 |
---|---|---|
committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2007-01-29 18:22:37 +0000 |
commit | 4ffe6e87dc5f2aecddf83192b7528202f647faaa (patch) | |
tree | da98ca8f6597468843b19cf9367201ffebc2b1e8 /libstdc++-v3/testsuite/ext/codecvt | |
parent | 68254f23e8c232a4da9b6f0e3fdabe1800a4b014 (diff) | |
download | gcc-4ffe6e87dc5f2aecddf83192b7528202f647faaa.tar.gz |
enc_filebuf.h: Resurrect, update.
2007-01-29 Benjamin Kosnik <bkoz@redhat.com>
* include/ext/enc_filebuf.h: Resurrect, update.
* include/ext/codecvt_specializations.h: Remove
_GLIBCXX_USE_ICONV, _GLIBCXX_USE_ENCODING_STATE.
* include/bits/localefwd.h: Remove declaration for __enc_traits.
* docs/html/22_locale/codecvt.html: Change __enc_traits to
encoding_state.
* scripts/testsuite_flags.in: Remove ICONV.
* configure.ac: Remove GLIBCXX_CHECK_ICONV_SUPPORT.
* acinclude.m4 (GLIBCXX_CHECK_ICONV_SUPPORT): Remove.
* crossconfig.m4: Remove use of GLIBCXX_CHECK_ICONV_SUPPORT.
* config.h.in: Remove HAVE_ICONV_CLOSE, HAVE_ICONV_OPEN,
HAVE_NL_LANGINFO, _GLIBCXX_USE_ICONV.
* include/Makefile.am: Uglify ICONV_CONST.
* configure: Regenerate.
* aclocal.m4: Regenerate.
* Makefile.in: Regenerate.
* src/Makefile.in: Regenerate.
* po/Makefile.in: Regenerate.
* libmath/Makefile.in: Regenerate.
* include/Makefile.in: Regenerate.
* libsupc++/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
* testsuite/ext/enc_filebuf/wchar_t/13189.cc: Use
dg-require-iconv, fix up for encoding_state changes.
* testsuite/ext/enc_filebuf/char/13189.cc: Same.
* testsuite/ext/enc_filebuf/char/13598.cc: Same.
* testsuite/22_locale/codecvt/unicode: Move...
* testsuite/22_locale/codecvt/unicode/char.cc: Move...
* testsuite/22_locale/codecvt/unicode/1.cc: Move...
* testsuite/22_locale/codecvt/unicode/wchar_t.cc: Move...
* testsuite/ext/codecvt: New.
* testsuite/ext/codecvt/char-1.cc: ...here. Also, use dg-require-iconv.
* testsuite/ext/codecvt/char-2.cc: ...here. Same.
* testsuite/ext/codecvt/1.cc: ...here. Same.
* testsuite/ext/codecvt/wchar_t.cc: ...here. Same.
* testsuite/22_locale/locale/cons/unicode: Delete directory.
* testsuite/22_locale/locale/cons/unicode/1.cc: Move...
* testsuite/22_locale/locale/cons/unicode.cc: ...here.
From-SVN: r121297
Diffstat (limited to 'libstdc++-v3/testsuite/ext/codecvt')
-rw-r--r-- | libstdc++-v3/testsuite/ext/codecvt/1.cc | 58 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/ext/codecvt/char-1.cc | 140 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/ext/codecvt/char-2.cc | 138 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/ext/codecvt/wchar_t.cc | 128 |
4 files changed, 464 insertions, 0 deletions
diff --git a/libstdc++-v3/testsuite/ext/codecvt/1.cc b/libstdc++-v3/testsuite/ext/codecvt/1.cc new file mode 100644 index 00000000000..2e3fb746bef --- /dev/null +++ b/libstdc++-v3/testsuite/ext/codecvt/1.cc @@ -0,0 +1,58 @@ +// { dg-require-iconv "UCS-2BE" } +// { dg-require-iconv "ISO-8859-15" } +// 2003-02-06 Petur Runolfsson <peturr02@ru.is> + +// Copyright (C) 2003, 2007 Free Software Foundation +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +// 22.2.1.5 - Template class codecvt [lib.locale.codecvt] + +#include <locale> +#include <testsuite_hooks.h> +#include <ext/codecvt_specializations.h> + +// Partial specialization using encoding_state +// codecvt<unicode_t, char, encoding_state> +// UNICODE - UCS2 (big endian) +void test01() +{ + using namespace std; + typedef unsigned short int_type; + typedef char ext_type; + typedef __gnu_cxx::encoding_state state_type; + typedef codecvt<int_type, ext_type, state_type> unicode_codecvt; + + bool test __attribute__((unused)) = true; + const ext_type* e_lit = "black pearl jasmine tea"; + int size = strlen(e_lit); + + // construct a locale object with the specialized facet. + locale loc(locale::classic(), new unicode_codecvt); + // sanity check the constructed locale has the specialized facet. + VERIFY( has_facet<unicode_codecvt>(loc) ); + const unicode_codecvt& cvt = use_facet<unicode_codecvt>(loc); + + unicode_codecvt::state_type state04("UCS-2BE", "ISO-8859-15", 0xfeff, 0); + cvt.length(state04, e_lit, e_lit + size, 5); +} + +int main () +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/ext/codecvt/char-1.cc b/libstdc++-v3/testsuite/ext/codecvt/char-1.cc new file mode 100644 index 00000000000..507d7136ee7 --- /dev/null +++ b/libstdc++-v3/testsuite/ext/codecvt/char-1.cc @@ -0,0 +1,140 @@ +// { dg-require-iconv "UCS-2BE" } +// { dg-require-iconv "ISO-8859-15" } + +// 2000-08-22 Benjamin Kosnik <bkoz@cygnus.com> + +// Copyright (C) 2000, 2001, 2002, 2003, 2007 Free Software Foundation +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +// 22.2.1.5 - Template class codecvt [lib.locale.codecvt] +#include <locale> +#include <testsuite_hooks.h> +#include <ext/codecvt_specializations.h> + +/* +> how do I check that these conversions are correct? +Very easy. Since all the characters are from ASCII you simply +zero-extend the values. + +drepper$ echo 'black pearl jasmine tea' | od -t x1 +0000000 62 6c 61 63 6b 20 70 65 61 72 6c 20 6a 61 73 6d +0000020 69 6e 65 20 74 65 61 0a + +So the UCS-2 string is + +0x0062, 0x006c, 0x0061, ... + +You get the idea. With iconv() you have to take care of the +byte-order, though. UCS-2 can mean little- or big endian. Looking at +your result + +> $9 = 25856 + +it shows that the other byte-order is used (25856 == 0x6500). +*/ + +// Partial specialization using encoding_state. +// codecvt<unicode_t, char, encoding_state> +// UNICODE - UCS2 (big endian) +void test01() +{ + using namespace std; + typedef codecvt_base::result result; + typedef unsigned short int_type; + typedef char ext_type; + typedef __gnu_cxx::encoding_state state_type; + typedef codecvt<int_type, ext_type, state_type> unicode_codecvt; + typedef char_traits<int_type> int_traits; + typedef char_traits<ext_type> ext_traits; + + bool test __attribute__((unused)) = true; + const ext_type* e_lit = "black pearl jasmine tea"; + int size = strlen(e_lit); + + char i_lit_base[50] __attribute__((aligned(__alignof__(int_type)))) = + { + 0x00, 0x62, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x63, 0x00, 0x6b, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x65, 0x00, 0x61, 0x00, 0x72, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x6a, 0x00, 0x61, 0x00, 0x73, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x61, 0x00, 0xa0 + }; + const int_type* i_lit = reinterpret_cast<int_type*>(i_lit_base); + + const ext_type* efrom_next; + const int_type* ifrom_next; + ext_type* e_arr = new ext_type[size + 1]; + ext_type* eto_next; + int_type* i_arr = new int_type[size + 1]; + int_type* ito_next; + + // construct a locale object with the specialized facet. + locale loc(locale::classic(), new unicode_codecvt); + // sanity check the constructed locale has the specialized facet. + VERIFY( has_facet<unicode_codecvt>(loc) ); + const unicode_codecvt& cvt = use_facet<unicode_codecvt>(loc); + + // in + // unicode_codecvt::state_type state01("UCS-2BE", "ISO-8859-15", 0xfeff, 0); + unicode_codecvt::state_type state01("UCS-2BE", "ISO-8859-15", 0, 0); + + // internal encoding is bigger because of bom + result r1 = cvt.in(state01, e_lit, e_lit + size, efrom_next, + i_arr, i_arr + size + 1, ito_next); + VERIFY( r1 == codecvt_base::ok ); + VERIFY( !int_traits::compare(i_arr, i_lit, size) ); + VERIFY( efrom_next == e_lit + size ); + VERIFY( ito_next == i_arr + size ); + + // out + unicode_codecvt::state_type state02("UCS-2BE", "ISO-8859-15", 0, 0); + result r2 = cvt.out(state02, i_lit, i_lit + size, ifrom_next, + e_arr, e_arr + size, eto_next); + VERIFY( r2 == codecvt_base::ok ); + VERIFY( !ext_traits::compare(e_arr, e_lit, size) ); + VERIFY( ifrom_next == i_lit + size ); + VERIFY( eto_next == e_arr + size ); + + // unshift + ext_traits::copy(e_arr, e_lit, size); + unicode_codecvt::state_type state03("UCS-2BE", "ISO-8859-15", 0, 0); + result r3 = cvt.unshift(state03, e_arr, e_arr + size, eto_next); + VERIFY( r3 == codecvt_base::noconv ); + VERIFY( !ext_traits::compare(e_arr, e_lit, size) ); + VERIFY( eto_next == e_arr ); + + int i = cvt.encoding(); + VERIFY( i == 2 ); // Target-dependent. + + VERIFY( !cvt.always_noconv() ); + + unicode_codecvt::state_type state04("UCS-2BE", "ISO-8859-15", 0, 0); + int j = cvt.length(state03, e_lit, e_lit + size, 5); + VERIFY( j == 5 ); + + int k = cvt.max_length(); + VERIFY( k == 1 ); + + delete [] e_arr; + delete [] i_arr; +} + +int main () +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/ext/codecvt/char-2.cc b/libstdc++-v3/testsuite/ext/codecvt/char-2.cc new file mode 100644 index 00000000000..19e28aa024b --- /dev/null +++ b/libstdc++-v3/testsuite/ext/codecvt/char-2.cc @@ -0,0 +1,138 @@ +// { dg-require-iconv "UCS-2LE" } +// { dg-require-iconv "ISO-8859-15" } + +// 2000-08-22 Benjamin Kosnik <bkoz@cygnus.com> + +// Copyright (C) 2000, 2001, 2002, 2003, 2007 Free Software Foundation +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +// 22.2.1.5 - Template class codecvt [lib.locale.codecvt] +#include <locale> +#include <testsuite_hooks.h> +#include <ext/codecvt_specializations.h> + +/* +> how do I check that these conversions are correct? +Very easy. Since all the characters are from ASCII you simply +zero-extend the values. + +drepper$ echo 'black pearl jasmine tea' | od -t x1 +0000000 62 6c 61 63 6b 20 70 65 61 72 6c 20 6a 61 73 6d +0000020 69 6e 65 20 74 65 61 0a + +So the UCS-2 string is + +0x0062, 0x006c, 0x0061, ... + +You get the idea. With iconv() you have to take care of the +byte-order, though. UCS-2 can mean little- or big endian. Looking at +your result + +> $9 = 25856 + +it shows that the other byte-order is used (25856 == 0x6500). +*/ + +// Partial specialization using encoding_state. +// codecvt<unicode_t, char, encoding_state> +// UNICODE - UCS2 (little endian) +void test02() +{ + using namespace std; + typedef codecvt_base::result result; + typedef unsigned short int_type; + typedef char ext_type; + typedef __gnu_cxx::encoding_state state_type; + typedef codecvt<int_type, ext_type, state_type> unicode_codecvt; + typedef char_traits<int_type> int_traits; + typedef char_traits<ext_type> ext_traits; + + bool test __attribute__((unused)) = true; + const ext_type* e_lit = "black pearl jasmine tea"; + int size = strlen(e_lit); + + char i_lit_base[50] __attribute__((aligned(__alignof__(int_type)))) = + { + 0x62, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x63, 0x00, 0x6b, 0x00, 0x20, 0x00, + 0x70, 0x00, 0x65, 0x00, 0x61, 0x00, 0x72, 0x00, 0x6c, 0x00, 0x20, 0x00, + 0x6a, 0x00, 0x61, 0x00, 0x73, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x6e, 0x00, + 0x65, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x61, 0x00, 0xa0, 0x00 + }; + const int_type* i_lit = reinterpret_cast<int_type*>(i_lit_base); + + const ext_type* efrom_next; + const int_type* ifrom_next; + ext_type* e_arr = new ext_type[size + 1]; + ext_type* eto_next; + int_type* i_arr = new int_type[size + 1]; + int_type* ito_next; + + // construct a locale object with the specialized facet. + locale loc(locale::classic(), new unicode_codecvt); + // sanity check the constructed locale has the specialized facet. + VERIFY( has_facet<unicode_codecvt>(loc) ); + const unicode_codecvt& cvt = use_facet<unicode_codecvt>(loc); + + // in + unicode_codecvt::state_type state01("UCS-2LE", "ISO-8859-15", 0, 0); + // internal encoding is bigger because of bom + result r1 = cvt.in(state01, e_lit, e_lit + size, efrom_next, + i_arr, i_arr + size + 1, ito_next); + VERIFY( r1 == codecvt_base::ok ); + VERIFY( !int_traits::compare(i_arr, i_lit, size) ); + VERIFY( efrom_next == e_lit + size ); + VERIFY( ito_next == i_arr + size ); + + // out + unicode_codecvt::state_type state02("UCS-2LE", "ISO-8859-15", 0, 0); + result r2 = cvt.out(state02, i_lit, i_lit + size, ifrom_next, + e_arr, e_arr + size, eto_next); + VERIFY( r2 == codecvt_base::ok ); + VERIFY( !ext_traits::compare(e_arr, e_lit, size) ); + VERIFY( ifrom_next == i_lit + size ); + VERIFY( eto_next == e_arr + size ); + + // unshift + ext_traits::copy(e_arr, e_lit, size); + unicode_codecvt::state_type state03("UCS-2LE", "ISO-8859-15", 0, 0); + result r3 = cvt.unshift(state03, e_arr, e_arr + size, eto_next); + VERIFY( r3 == codecvt_base::noconv ); + VERIFY( !ext_traits::compare(e_arr, e_lit, size) ); + VERIFY( eto_next == e_arr ); + + int i = cvt.encoding(); + VERIFY( i == 2 ); // Target-dependent. + + VERIFY( !cvt.always_noconv() ); + + unicode_codecvt::state_type state04("UCS-2LE", "ISO-8859-15", 0, 0); + int j = cvt.length(state03, e_lit, e_lit + size, 5); + VERIFY( j == 5 ); + + int k = cvt.max_length(); + VERIFY( k == 1 ); + + delete [] e_arr; + delete [] i_arr; +} + +int main () +{ + test02(); + return 0; +} diff --git a/libstdc++-v3/testsuite/ext/codecvt/wchar_t.cc b/libstdc++-v3/testsuite/ext/codecvt/wchar_t.cc new file mode 100644 index 00000000000..fcc3d0220f0 --- /dev/null +++ b/libstdc++-v3/testsuite/ext/codecvt/wchar_t.cc @@ -0,0 +1,128 @@ +// { dg-require-iconv "UCS-2BE" } +// { dg-require-iconv "UCS-4BE" } + +// 2000-08-23 Benjamin Kosnik <bkoz@cygnus.com> + +// Copyright (C) 2000, 2001, 2002, 2003, 2007 Free Software Foundation +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +// 22.2.1.5 - Template class codecvt [lib.locale.codecvt] + +#include <locale> +#include <testsuite_hooks.h> +#include <ext/codecvt_specializations.h> + +// Partial specialization using encoding_state. +// codecvt<unicode_t, wchar_t, encoding_state> +void test01() +{ + using namespace std; + typedef codecvt_base::result result; + typedef unsigned short int_type; + typedef wchar_t ext_type; + typedef __gnu_cxx::encoding_state state_type; + typedef codecvt<int_type, ext_type, state_type> unicode_codecvt; + typedef char_traits<int_type> int_traits; + typedef char_traits<ext_type> ext_traits; + + bool test __attribute__((unused)) = true; + int size = 23; + char e_lit_base[96] __attribute__((aligned(__alignof__(ext_type)))) = + { + 0x00, 0x00, 0x00, 0x62, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, 0x61, + 0x00, 0x00, 0x00, 0x63, 0x00, 0x00, 0x00, 0x6b, 0x00, 0x00, 0x00, 0x20, + 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x65, 0x00, 0x00, 0x00, 0x61, + 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, 0x20, + 0x00, 0x00, 0x00, 0x6a, 0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x00, 0x73, + 0x00, 0x00, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x69, 0x00, 0x00, 0x00, 0x6e, + 0x00, 0x00, 0x00, 0x65, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x74, + 0x00, 0x00, 0x00, 0x65, 0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x00, 0xa0 + }; + const ext_type* e_lit = reinterpret_cast<ext_type*>(e_lit_base); + + char i_lit_base[48] __attribute__((aligned(__alignof__(int_type)))) = + { + 0x00, 0x62, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x63, 0x00, 0x6b, 0x00, 0x20, + 0x00, 0x70, 0x00, 0x65, 0x00, 0x61, 0x00, 0x72, 0x00, 0x6c, 0x00, 0x20, + 0x00, 0x6a, 0x00, 0x61, 0x00, 0x73, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x6e, + 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x61, 0x00, 0xa0 + }; + const int_type* i_lit = reinterpret_cast<int_type*>(i_lit_base); + + const ext_type* efrom_next; + const int_type* ifrom_next; + ext_type* e_arr = new ext_type[size + 1]; + ext_type* eto_next; + int_type* i_arr = new int_type[size + 1]; + int_type* ito_next; + + // construct a locale object with the specialized facet. + locale loc(locale::classic(), new unicode_codecvt); + // sanity check the constructed locale has the specialized facet. + VERIFY( has_facet<unicode_codecvt>(loc) ); + const unicode_codecvt& cvt = use_facet<unicode_codecvt>(loc); + + // in + // unicode_codecvt::state_type state01("UCS-2BE", "UCS-4BE", 0xfeff, 0); + unicode_codecvt::state_type state01("UCS-2BE", "UCS-4BE", 0, 0); + result r1 = cvt.in(state01, e_lit, e_lit + size, efrom_next, + i_arr, i_arr + size + 1, ito_next); + VERIFY( r1 == codecvt_base::ok ); + VERIFY( !int_traits::compare(i_arr, i_lit, size) ); + VERIFY( efrom_next == e_lit + size ); + VERIFY( ito_next == i_arr + size ); + + // out + unicode_codecvt::state_type state02("UCS-2BE", "UCS-4BE", 0, 0); + result r2 = cvt.out(state02, i_lit, i_lit + size, ifrom_next, + e_arr, e_arr + size, eto_next); + VERIFY( r2 == codecvt_base::ok ); // XXX? + VERIFY( !ext_traits::compare(e_arr, e_lit, size) ); + VERIFY( ifrom_next == i_lit + size ); + VERIFY( eto_next == e_arr + size ); + + // unshift + ext_traits::copy(e_arr, e_lit, size); + unicode_codecvt::state_type state03("UCS-2BE", "UCS-4BE", 0, 0); + result r3 = cvt.unshift(state03, e_arr, e_arr + size, eto_next); + VERIFY( r3 == codecvt_base::noconv ); + VERIFY( !ext_traits::compare(e_arr, e_lit, size) ); + VERIFY( eto_next == e_arr ); + + int i = cvt.encoding(); + VERIFY( i == 0 ); + + VERIFY( !cvt.always_noconv() ); + + unicode_codecvt::state_type state04("UCS-2BE", "UCS-4BE", 0, 0); + int j = cvt.length(state03, e_lit, e_lit + size, 5); + VERIFY( j == 5 ); + + int k = cvt.max_length(); + VERIFY( k == 1 ); + + delete [] e_arr; + delete [] i_arr; +} + +int main () +{ + test01(); + return 0; +} + |