[adobe-source-commits] adobe-source/adobe/test/unicode main.cpp,1.2,1.3

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/adobe-source/adobe-source/adobe/test/unicode
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1031/adobe/test/unicode

Modified Files:
	main.cpp 
Log Message:
asl 1.0.13

Index: main.cpp
===================================================================
RCS file: /cvsroot/adobe-source/adobe-source/adobe/test/unicode/main.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main.cpp	6 Jan 2006 18:35:27 -0000	1.2
--- main.cpp	3 Feb 2006 18:20:49 -0000	1.3
***************
*** 1,6 ****
  /*
! 	Copyright 2005-2006 Adobe Systems Incorporated
! 	Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt
! 	or a copy at http://opensource.adobe.com/licenses.html)
  */

--- 1,6 ----
  /*
!     Copyright 2005-2006 Adobe Systems Incorporated
!     Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt
!     or a copy at http://opensource.adobe.com/licenses.html)
  */

***************
*** 21,86 ****
  void roundtrip_test(boost::uint32_t code_point, bool print = true)
  {
! 	/*
! 		We need to flex all parts of the unicode API given the code point that is passed in.
! 		This includes:
! 			- utf32 -> utf8 -> utf32
! 			- utf32 -> utf16 -> utf32
! 			- utf16 -> utf8 -> utf16
! 	*/

! 	typedef std::vector<boost::uint32_t>	utf32_buffer_t;
! 	typedef std::vector<boost::uint16_t>	utf16_buffer_t;
! 	typedef std::vector<boost::uint8_t>		utf8_buffer_t;

! 	utf16_buffer_t	utf16;
! 	utf8_buffer_t	utf8;

! 	adobe::to_utf16(code_point, std::back_inserter(utf16));
! 	adobe::to_utf8(code_point, std::back_inserter(utf8));

! 	utf32_buffer_t	utf16_roundtrip;
! 	utf32_buffer_t	utf8_roundtrip;

! 	if (print)
! 	{
! 		std::cout << "Flexing API for code point 0x" << std::hex << code_point << "..." << std::endl;
! 		std::cout << "   utf16 encoding is";
! 		for (utf16_buffer_t::iterator first(utf16.begin()), last(utf16.end()); first != last; ++first)
! 			std::cout << " 0x" << static_cast<boost::uint32_t>(*first);
! 		std::cout << std::endl;
! 		std::cout << "    utf8 encoding is";
! 		for (utf8_buffer_t::iterator first(utf8.begin()), last(utf8.end()); first != last; ++first)
! 			std::cout << " 0x" << static_cast<boost::uint32_t>(*first);
! 		std::cout << std::endl;
! 		std::cout << std::dec;
! 	}

! 	adobe::to_utf32(utf16.begin(), utf16.end(), std::back_inserter(utf16_roundtrip));
! 	adobe::to_utf32(utf8.begin(), utf8.end(), std::back_inserter(utf8_roundtrip));

! 	if (utf16_roundtrip[0] != code_point)
! 		throw std::runtime_error("In utf32 -> utf16 -> utf32: code point mismatch");
! 	else if (utf8_roundtrip[0] != code_point)
! 		throw std::runtime_error("In utf32 -> utf8 -> utf32: code point mismatch");

! 	utf8_buffer_t	utf8_2;
! 	utf16_buffer_t	utf16_2;

! 	adobe::to_utf8(utf16.begin(), utf16.end(), std::back_inserter(utf8_2));
! 	adobe::to_utf16(utf8.begin(), utf8.end(), std::back_inserter(utf16_2));

! 	utf32_buffer_t	utf16_roundtrip_2;

! 	adobe::to_utf32(utf16_2.begin(), utf16_2.end(), std::back_inserter(utf16_roundtrip_2));
! 	
! 	if (utf16_roundtrip_2[0] != code_point)
! 		throw std::runtime_error("In utf16 -> utf8 -> utf16: code point mismatch");

! 	if (print)
! 	{
! 		std::cout << "   code point 0x" << std::hex << code_point << std::dec << " (";
! 		adobe::copy(utf8, std::ostream_iterator<char>(std::cout));
! 		std::cout << ") roundtripped successfully." << std::endl;
! 	}
  }

--- 21,86 ----
  void roundtrip_test(boost::uint32_t code_point, bool print = true)
  {
!     /*
!         We need to flex all parts of the unicode API given the code point that is passed in.
!         This includes:
!             - utf32 -> utf8 -> utf32
!             - utf32 -> utf16 -> utf32
!             - utf16 -> utf8 -> utf16
!     */

!     typedef std::vector<boost::uint32_t>    utf32_buffer_t;
!     typedef std::vector<boost::uint16_t>    utf16_buffer_t;
!     typedef std::vector<boost::uint8_t>     utf8_buffer_t;

!     utf16_buffer_t  utf16;
!     utf8_buffer_t   utf8;

!     adobe::to_utf16(code_point, std::back_inserter(utf16));
!     adobe::to_utf8(code_point, std::back_inserter(utf8));

!     utf32_buffer_t  utf16_roundtrip;
!     utf32_buffer_t  utf8_roundtrip;

!     if (print)
!     {
!         std::cout << "Flexing API for code point 0x" << std::hex << code_point << "..." << std::endl;
!         std::cout << "   utf16 encoding is";
!         for (utf16_buffer_t::iterator first(utf16.begin()), last(utf16.end()); first != last; ++first)
!             std::cout << " 0x" << static_cast<boost::uint32_t>(*first);
!         std::cout << std::endl;
!         std::cout << "    utf8 encoding is";
!         for (utf8_buffer_t::iterator first(utf8.begin()), last(utf8.end()); first != last; ++first)
!             std::cout << " 0x" << static_cast<boost::uint32_t>(*first);
!         std::cout << std::endl;
!         std::cout << std::dec;
!     }

!     adobe::to_utf32(utf16.begin(), utf16.end(), std::back_inserter(utf16_roundtrip));
!     adobe::to_utf32(utf8.begin(), utf8.end(), std::back_inserter(utf8_roundtrip));

!     if (utf16_roundtrip[0] != code_point)
!         throw std::runtime_error("In utf32 -> utf16 -> utf32: code point mismatch");
!     else if (utf8_roundtrip[0] != code_point)
!         throw std::runtime_error("In utf32 -> utf8 -> utf32: code point mismatch");

!     utf8_buffer_t   utf8_2;
!     utf16_buffer_t  utf16_2;

!     adobe::to_utf8(utf16.begin(), utf16.end(), std::back_inserter(utf8_2));
!     adobe::to_utf16(utf8.begin(), utf8.end(), std::back_inserter(utf16_2));

!     utf32_buffer_t  utf16_roundtrip_2;

!     adobe::to_utf32(utf16_2.begin(), utf16_2.end(), std::back_inserter(utf16_roundtrip_2));
!     
!     if (utf16_roundtrip_2[0] != code_point)
!         throw std::runtime_error("In utf16 -> utf8 -> utf16: code point mismatch");

!     if (print)
!     {
!         std::cout << "   code point 0x" << std::hex << code_point << std::dec << " (";
!         adobe::copy(utf8, std::ostream_iterator<char>(std::cout));
!         std::cout << ") roundtripped successfully." << std::endl;
!     }
  }

***************
*** 89,94 ****
  bool valid_code_point(boost::uint32_t cp)
  {
! 	return	!(cp >= 0xd800 && cp <= 0xdbff) &&
! 			!(cp >= 0xdc00 && cp <= 0xdfff);
  }

--- 89,94 ----
  bool valid_code_point(boost::uint32_t cp)
  {
!     return  !(cp >= 0xd800 && cp <= 0xdbff) &&
!             !(cp >= 0xdc00 && cp <= 0xdfff);
  }

***************
*** 108,164 ****
  int main(int argc, char* argv[])
  {
! 	int result(0);

! 	try
! 	{
! 		std::cout << "Singleton Roundtrip Tests" << std::endl;

! 		roundtrip_test(0x03B4);		// GREEK SMALL LETTER DELTA
! 		roundtrip_test(0x10137);	// AEGEAN WEIGHT BASE UNIT
! 		roundtrip_test(0xc5);		// LATIN CAPITAL LETTER A WITH RING ABOVE
! 		roundtrip_test(0x212b);		// ANGSTROM SIGN
! 		roundtrip_test(0xF0000);	// Hypothetical private-use glyph

! 		if (argc > 1 && argv[1] == std::string("--full"))
! 		{
! 			std::cout << "Performing complete range roundtrip test..." << std::ends;

! 			boost::uint32_t first(0x0);
! 			boost::uint32_t last(0x10ffff);

! 			try
! 			{
! 				for (; first != last; ++first)
! 					if (valid_code_point(first))
! 						roundtrip_test(first, false);
! 			}
! 			catch (...)
! 			{
! 				std::cerr	<< std::endl << "While processing value " << std::hex
! 							<< first << std::dec << "..." << std::endl;
! 				throw;
! 			}

! 			std::cout << "passed!" << std::endl;
! 		}
! 		else
! 		{
! 			std::cout << "Complete roundtrip range test was skipped." << std::endl;
! 			std::cout << "Run this binary with argument --full to test conversion of all Unicode code points." << std::endl;
! 		}
! 	}
! 	catch (const std::exception& doh)
! 	{
! 		std::cerr << "Exception: " << doh.what() << "\n";

! 		result = 1;
! 	}
! 	catch (...)
! 	{
! 		std::cerr << "Unknown Exception\n";

! 		result = 1;
! 	}

! 	return result;
  }
--- 108,164 ----
  int main(int argc, char* argv[])
  {
!     int result(0);

!     try
!     {
!         std::cout << "Singleton Roundtrip Tests" << std::endl;

!         roundtrip_test(0x03B4);     // GREEK SMALL LETTER DELTA
!         roundtrip_test(0x10137);    // AEGEAN WEIGHT BASE UNIT
!         roundtrip_test(0xc5);       // LATIN CAPITAL LETTER A WITH RING ABOVE
!         roundtrip_test(0x212b);     // ANGSTROM SIGN
!         roundtrip_test(0xF0000);    // Hypothetical private-use glyph

!         if (argc > 1 && argv[1] == std::string("--full"))
!         {
!             std::cout << "Performing complete range roundtrip test..." << std::ends;

!             boost::uint32_t first(0x0);
!             boost::uint32_t last(0x10ffff);

!             try
!             {
!                 for (; first != last; ++first)
!                     if (valid_code_point(first))
!                         roundtrip_test(first, false);
!             }
!             catch (...)
!             {
!                 std::cerr   << std::endl << "While processing value " << std::hex
!                             << first << std::dec << "..." << std::endl;
!                 throw;
!             }

!             std::cout << "passed!" << std::endl;
!         }
!         else
!         {
!             std::cout << "Complete roundtrip range test was skipped." << std::endl;
!             std::cout << "Run this binary with argument --full to test conversion of all Unicode code points." << std::endl;
!         }
!     }
!     catch (const std::exception& doh)
!     {
!         std::cerr << "Exception: " << doh.what() << "\n";

!         result = 1;
!     }
!     catch (...)
!     {
!         std::cerr << "Unknown Exception\n";

!         result = 1;
!     }

!     return result;
  }