C++: Improve char_traits stubs

Author: lcartey

cpp/common/test/includes/standard-library/cwchar

@@ -0,0 +1,23 @@
+#ifndef _GHLIBCPP_CWCHAR
+#define _GHLIBCPP_CWCHAR
+
+#include "stddef.h"
+
+namespace std {
+// Character classification and conversion types
+typedef struct {
+  int __count;
+  union {
+    unsigned int __wch;
+    char __wchb[4];
+  } __value;
+} mbstate_t;
+
+typedef unsigned int wint_t;
+
+// Wide character constants
+static const wint_t WEOF = static_cast<wint_t>(-1);
+
+} // namespace std
+
+#endif // _GHLIBCPP_CWCHAR

cpp/common/test/includes/standard-library/ios.h

@@ -5,6 +5,9 @@
 namespace std {
 typedef size_t streamsize;
 typedef int pos_type;
+typedef long long streamoff;
+typedef pos_type streampos;
+typedef pos_type wstreampos;
 
 // Bitmask type as specified by [bitmask.types]
 // Operators omitted as not required for our test cases

cpp/common/test/includes/standard-library/string

@@ -1,12 +1,92 @@
 #ifndef _GHLIBCPP_STRING
 #define _GHLIBCPP_STRING
+#include "cwchar"
 #include "initializer_list"
+#include "ios.h"
 #include "iosfwd.h"
 #include "iterator.h"
 #include "stddef.h"
 
 namespace std {
-template <class charT> struct char_traits;
+template <class charT> struct char_traits {
+  typedef charT char_type;
+  typedef int int_type;
+  typedef streamoff off_type;
+  typedef streampos pos_type;
+  typedef mbstate_t state_type;
+
+  static void assign(char_type &c1, const char_type &c2);
+  static bool eq(const char_type &c1, const char_type &c2);
+  static bool lt(const char_type &c1, const char_type &c2);
+
+  static int compare(const char_type *s1, const char_type *s2, size_t n);
+  static size_t length(const char_type *s);
+  static const char_type *find(const char_type *s, size_t n,
+                               const char_type &a);
+  static char_type *move(char_type *s1, const char_type *s2, size_t n);
+  static char_type *copy(char_type *s1, const char_type *s2, size_t n);
+  static char_type *assign(char_type *s, size_t n, char_type a);
+
+  static int_type not_eof(const int_type &c);
+  static char_type to_char_type(const int_type &c);
+  static int_type to_int_type(const char_type &c);
+  static bool eq_int_type(const int_type &c1, const int_type &c2);
+  static int_type eof();
+};
+
+// Specialization for char
+template <> struct char_traits<char> {
+  typedef char char_type;
+  typedef int int_type;
+  typedef streamoff off_type;
+  typedef streampos pos_type;
+  typedef mbstate_t state_type;
+
+  static void assign(char_type &c1, const char_type &c2);
+  static bool eq(const char_type &c1, const char_type &c2);
+  static bool lt(const char_type &c1, const char_type &c2);
+
+  static int compare(const char_type *s1, const char_type *s2, size_t n);
+  static size_t length(const char_type *s);
+  static const char_type *find(const char_type *s, size_t n,
+                               const char_type &a);
+  static char_type *move(char_type *s1, const char_type *s2, size_t n);
+  static char_type *copy(char_type *s1, const char_type *s2, size_t n);
+  static char_type *assign(char_type *s, size_t n, char_type a);
+
+  static int_type not_eof(const int_type &c);
+  static char_type to_char_type(const int_type &c);
+  static int_type to_int_type(const char_type &c);
+  static bool eq_int_type(const int_type &c1, const int_type &c2);
+  static int_type eof();
+};
+
+// Specialization for wchar_t
+template <> struct char_traits<wchar_t> {
+  typedef wchar_t char_type;
+  typedef wint_t int_type;
+  typedef streamoff off_type;
+  typedef wstreampos pos_type;
+  typedef mbstate_t state_type;
+
+  static void assign(char_type &c1, const char_type &c2);
+  static bool eq(const char_type &c1, const char_type &c2);
+  static bool lt(const char_type &c1, const char_type &c2);
+
+  static int compare(const char_type *s1, const char_type *s2, size_t n);
+  static size_t length(const char_type *s);
+  static const char_type *find(const char_type *s, size_t n,
+                               const char_type &a);
+  static char_type *move(char_type *s1, const char_type *s2, size_t n);
+  static char_type *copy(char_type *s1, const char_type *s2, size_t n);
+  static char_type *assign(char_type *s, size_t n, char_type a);
+
+  static int_type not_eof(const int_type &c);
+  static char_type to_char_type(const int_type &c);
+  static int_type to_int_type(const char_type &c);
+  static bool eq_int_type(const int_type &c1, const int_type &c2);
+  static int_type eof();
+};
 
 template <class T> class allocator {
 public:
@@ -114,14 +194,15 @@ public:
   basic_string &replace(size_type pos, size_type n1, size_type n2, charT c);
   basic_string &replace(__const_iterator i1, __const_iterator i2,
                         const basic_string &str);
-  basic_string &replace(__const_iterator i1, __const_iterator i2, const charT *s,
-                        size_type n);
-  basic_string &replace(__const_iterator i1, __const_iterator i2, const charT *s);
+  basic_string &replace(__const_iterator i1, __const_iterator i2,
+                        const charT *s, size_type n);
+  basic_string &replace(__const_iterator i1, __const_iterator i2,
+                        const charT *s);
   basic_string &replace(__const_iterator i1, __const_iterator i2, size_type n,
                         charT c);
   template <class InputIterator>
-  basic_string &replace(__const_iterator i1, __const_iterator i2, InputIterator j1,
-                        InputIterator j2);
+  basic_string &replace(__const_iterator i1, __const_iterator i2,
+                        InputIterator j1, InputIterator j2);
   basic_string &replace(__const_iterator, __const_iterator,
                         initializer_list<charT>);