ICU-1018 Change conflicts with versioning; moving ustream to ustdio.

X-SVN-Rev: 5617

icu4c/source/extra/ustdio/unicode/ustream.h

@@ -0,0 +1,39 @@
+/*
+**********************************************************************
+*   Copyright (C) 2001, International Business Machines
+*   Corporation and others.  All Rights Reserved.
+**********************************************************************
+*  FILE NAME : ustream.h
+*
+*   Modification History:
+*
+*   Date        Name        Description
+*   06/25/2001  grhoten     Move iostream from unistr.h
+******************************************************************************
+*/
+   
+#ifndef USTREAM_H
+#define USTREAM_H
+
+#include "unicode/unistr.h"
+
+// for unistrm.h
+/**
+ * Write the contents of a UnicodeString to an ostream. This functions writes
+ * the characters in a UnicodeString to an ostream. The UChars in the
+ * UnicodeString are truncated to char, leading to undefined results with
+ * anything not in the Latin1 character set.
+ *
+ * @deprecated This will move to the unsupported ustdio library after 2002-feb-01
+ */
+#if U_IOSTREAM_SOURCE >= 199711
+#include <iostream>
+U_COMMON_API std::ostream &operator<<(std::ostream& stream, const UnicodeString& s);
+#elif U_IOSTREAM_SOURCE >= 198506
+#include <iostream.h>
+U_COMMON_API ostream &operator<<(ostream& stream, const UnicodeString& s);
+#endif
+
+/* TODO: We should add the operator<< for UChar* and UDate. Also add the operator>>. */
+
+#endif

icu4c/source/extra/ustdio/ustdio.dsp

@@ -149,6 +149,10 @@ SOURCE=.\uscanset.c
 
 SOURCE=.\ustdio.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\ustream.cpp
+# End Source File
 # End Group
 # Begin Group "Header Files"
 
@@ -231,6 +235,10 @@ InputPath=.\unicode\ustdio.h
 
 !ENDIF 
 
+# End Source File
+# Begin Source File
+
+SOURCE=.\unicode\ustream.h
 # End Source File
 # End Group
 # Begin Group "Resource Files"

icu4c/source/extra/ustdio/ustream.cpp

@@ -0,0 +1,268 @@
+/*
+**********************************************************************
+*   Copyright (C) 2001, International Business Machines
+*   Corporation and others.  All Rights Reserved.
+**********************************************************************
+*  FILE NAME : ustream.cpp
+*
+*   Modification History:
+*
+*   Date        Name        Description
+*   06/25/2001  grhoten     Move iostream from unistr.h to here
+******************************************************************************
+*/
+
+
+#include "unicode/utypes.h"
+#include "unicode/ustream.h"
+#include "unicode/ucnv.h"
+#include "ustr_imp.h"
+
+class UnicodeStreamer {
+public:
+    inline static const UChar *getArrayStart(const UnicodeString& s) {return s.getArrayStart();}
+};
+// console IO
+
+#if U_IOSTREAM_SOURCE >= 198506
+
+#if U_IOSTREAM_SOURCE >= 199711
+#define STD_OSTREAM std::ostream
+#else
+#define STD_OSTREAM ostream
+#endif
+
+
+U_COMMON_API STD_OSTREAM &
+operator<<(STD_OSTREAM& stream, const UnicodeString& s)
+{
+    if(s.length() > 0) {
+        char buffer[200];
+        UConverter *converter;
+        UErrorCode errorCode = U_ZERO_ERROR;
+
+        // use the default converter to convert chunks of text
+        converter = u_getDefaultConverter(&errorCode);
+        if(U_SUCCESS(errorCode)) {
+            const UChar *us = UnicodeStreamer::getArrayStart(s);
+            const UChar *uLimit = us + s.length();
+            char *s, *sLimit = buffer + sizeof(buffer);
+            do {
+                errorCode = U_ZERO_ERROR;
+                s = buffer;
+                ucnv_fromUnicode(converter, &s, sLimit, &us, uLimit, 0, FALSE, &errorCode);
+
+                // write this chunk
+                if(s > buffer) {
+                    stream.write(buffer, s - buffer);
+                }
+            } while(errorCode == U_BUFFER_OVERFLOW_ERROR);
+            u_releaseDefaultConverter(converter);
+        }
+    }
+
+    stream.flush();
+    return stream;
+}
+
+#endif
+
+#if 0
+/* UnicodeStringStreamer insteranl API may be useful for future reference */
+#ifndef UNISTRM_H
+#define UNISTRM_H
+
+#include "filestrm.h"
+#include "umemstrm.h"
+#include "unicode/unistr.h"
+
+
+class U_COMMON_API UnicodeStringStreamer
+{
+public:
+    static void streamIn(UnicodeString* string, FileStream* is);
+    static void streamOut(const UnicodeString* string, FileStream* os);
+    static void streamIn(UnicodeString* string, UMemoryStream* is);
+    static void streamOut(const UnicodeString* string, UMemoryStream* os);
+};
+
+
+#endif
+
+//========================================
+// Streaming (to be removed)
+//========================================
+
+#include "unistrm.h"
+#include "filestrm.h"
+
+
+inline uint8_t
+uprv_hibyte(uint16_t x)
+{ return (uint8_t)(x >> 8); }
+
+inline uint8_t
+uprv_lobyte(uint16_t x)
+{ return (uint8_t)(x & 0xff); }
+
+inline uint16_t
+uprv_hiword(uint32_t x)
+{ return (uint16_t)(x >> 16); }
+
+inline uint16_t
+uprv_loword(uint32_t x)
+{ return (uint16_t)(x & 0xffff); }
+
+inline void
+writeLong(FileStream *os,
+      int32_t x)
+{
+  uint16_t word = uprv_hiword((uint32_t)x);
+  T_FileStream_putc(os, uprv_hibyte(word));
+  T_FileStream_putc(os, uprv_lobyte(word));
+  word = uprv_loword((uint32_t)x);
+  T_FileStream_putc(os, uprv_hibyte(word));
+  T_FileStream_putc(os, uprv_lobyte(word));
+}
+
+inline int32_t
+readLong(FileStream *is)
+{
+  int32_t x = T_FileStream_getc(is);
+
+  x = (x << 8) | T_FileStream_getc(is);
+  x = (x << 8) | T_FileStream_getc(is);
+  x = (x << 8) | T_FileStream_getc(is);
+
+  return x;
+}
+
+inline void
+writeUChar(FileStream *os,
+       UChar c)
+{
+  T_FileStream_putc(os, uprv_hibyte(c));
+  T_FileStream_putc(os, uprv_lobyte(c));
+}
+
+inline UChar
+readUChar(FileStream *is)
+{
+  UChar c = (UChar)T_FileStream_getc(is);
+
+  return (UChar)((c << 8) | T_FileStream_getc(is));
+}
+
+void
+UnicodeStringStreamer::streamOut(const UnicodeString *s,
+                 FileStream *os)
+{
+  if(!T_FileStream_error(os)) {
+    writeLong(os, s->fLength);
+  }
+
+  const UChar *c   = s->getArrayStart();
+  const UChar *end = c + s->fLength;
+
+  while(c != end && ! T_FileStream_error(os)) {
+    writeUChar(os, *c++);
+  }
+}
+
+void
+UnicodeStringStreamer::streamIn(UnicodeString *s,
+                FileStream *is)
+{
+  int32_t newSize;
+
+  // handle error conditions
+  if(T_FileStream_error(is) || T_FileStream_eof(is)) {
+    s->setToBogus();
+    return;
+  }
+  newSize = readLong(is);
+  if((newSize < 0) || T_FileStream_error(is)
+     || ((newSize > 0) && T_FileStream_eof(is))) {
+    s->setToBogus(); //error condition
+    return;
+  }
+
+  // clone s's array, if needed
+  if(!s->cloneArrayIfNeeded(newSize, newSize, FALSE)) {
+    return;
+  }
+
+  UChar *c = s->getArrayStart();
+  UChar *end = c + newSize;
+
+  while(c < end && ! (T_FileStream_error(is) || T_FileStream_eof(is))) {
+    *c++ = readUChar(is);
+  }
+
+  // couldn't read all chars
+  if(c < end) {
+    s->setToBogus();
+    return;
+  }
+
+  s->fLength = newSize;
+}
+
+void
+UnicodeStringStreamer::streamOut(const UnicodeString *s,
+                 UMemoryStream *os)
+{
+  if(!uprv_mstrm_error(os)) {
+    uprv_mstrm_write(os, (uint8_t*)&s->fLength, (int32_t)sizeof(s->fLength));
+  }
+
+  const UChar *c   = s->getArrayStart();
+  const UChar *end = c + s->fLength;
+
+  while(c != end && ! uprv_mstrm_error(os)) {
+    uprv_mstrm_write(os, (uint8_t*)c, (int32_t)sizeof(*c));
+    c++;
+  }
+}
+
+void
+UnicodeStringStreamer::streamIn(UnicodeString *s,
+                UMemoryStream *is)
+{
+  int32_t newSize;
+
+  // handle error conditions
+  if(uprv_mstrm_error(is) || uprv_mstrm_eof(is)) {
+    s->setToBogus();
+    return;
+  }
+  uprv_mstrm_read(is, (uint8_t *)&newSize, (int32_t)sizeof(int32_t));
+  if((newSize < 0) || uprv_mstrm_error(is)
+     || ((newSize > 0) && uprv_mstrm_eof(is))) {
+    s->setToBogus(); //error condition
+    return;
+  }
+
+  // clone s's array, if needed
+  if(!s->cloneArrayIfNeeded(newSize, newSize, FALSE)) {
+    return;
+  }
+
+  UChar *c = s->getArrayStart();
+  UChar *end = c + newSize;
+
+  while(c < end && ! (uprv_mstrm_error(is) || uprv_mstrm_eof(is))) {
+    uprv_mstrm_read(is, (uint8_t *)c, (int32_t)sizeof(*c));
+    c++;
+  }
+
+  // couldn't read all chars
+  if(c < end) {
+    s->setToBogus();
+    return;
+  }
+
+  s->fLength = newSize;
+}
+
+#endif

icu4c/source/test/intltest/ustrtest.cpp

@@ -8,6 +8,8 @@
 #include "unicode/unistr.h"
 #include "unicode/unicode.h"
 #include "unicode/locid.h"
+
+#if 0
 #include "unicode/ustream.h"
 
 #if U_IOSTREAM_SOURCE >= 199711
@@ -17,6 +19,8 @@ using namespace std;
 #include <iostream.h>
 #endif
 
+#endif
+
 UnicodeStringTest::UnicodeStringTest()
 {
 }
@@ -825,10 +829,12 @@ UnicodeStringTest::TestMiscellaneous()
             errln(UnicodeString("getUChars() failed: strings differ at position ") + i);
     }
 
+/*
 #if U_IOSTREAM_SOURCE
     logln("Testing the operator \"<<\" \n");
     cout<<"Testing the \"<<\" operator---test1="<<test1<<". "<<test3<<endl;
 #endif
+*/
 }
 
 void