first cut at case-insensitive wrappers for ns*Strings - not part of build

intl/unicharutil/util/makefile.win

@@ -0,0 +1,39 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..\..
+
+MODULE=unicharutil
+LIBRARY_NAME=unicharutil_s
+REQUIRES =	\
+			xpcom \
+			string \
+			$(NULL)
+
+CPP_OBJS=\
+		.\$(OBJDIR)\nsUnicharUtils.obj \
+		$(NULL)
+
+EXPORTS=\
+		nsUnicharUtils.h \
+		$(NULL)
+
+include <$(DEPTH)\config\rules.mak>

intl/unicharutil/util/nsUnicharUtils.cpp

@@ -0,0 +1,103 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *  Alec Flett <alecf@netscape.com>
+ */
+
+#include "nsUnicharUtils.h"
+#include "nsUnicharUtilCIID.h"
+#include "nsICaseConversion.h"
+#include "nsIServiceManager.h"
+
+// global cache of the case conversion service
+static nsICaseConversion *gCaseConv = nsnull;
+static NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID);
+
+nsresult NS_InitCaseConversion() {
+    if (gCaseConv) return NS_OK;
+
+    return nsServiceManager::GetService(kUnicharUtilCID,
+                                        NS_GET_IID(nsICaseConversion),
+                                        (nsISupports**)&gCaseConv);
+
+}
+
+class ConvertToLowerCase
+{
+public:
+    typedef PRUnichar value_type;
+    
+    PRUint32 write( const PRUnichar* aSource, PRUint32 aSourceLength)
+    {
+        gCaseConv->ToLower(aSource, NS_CONST_CAST(PRUnichar*,aSource), aSourceLength);
+        return 0;
+    }
+};
+
+void
+ToLowerCase( nsAString& aString)
+  {
+    nsAString::iterator fromBegin, fromEnd;
+    ConvertToLowerCase converter;
+    copy_string(aString.BeginWriting(fromBegin), aString.EndWriting(fromEnd), converter);
+  }
+
+class ConvertToUpperCase
+{
+public:
+    typedef PRUnichar value_type;
+    
+    PRUint32 write( const PRUnichar* aSource, PRUint32 aSourceLength)
+    {
+        gCaseConv->ToUpper(aSource, NS_CONST_CAST(PRUnichar*,aSource), aSourceLength);
+        return 0;
+    }
+};
+
+void
+ToUpperCase( nsAString& aString )
+  {
+    nsAString::iterator fromBegin, fromEnd;
+    ConvertToUpperCase converter;
+    copy_string(aString.BeginWriting(fromBegin), aString.EndWriting(fromEnd), converter);
+  }
+
+
+class CaseInsensitivePRUnicharComparator
+  {
+    public:
+      PRBool operator()( PRUnichar lhs, PRUnichar rhs ) const {
+          PRUnichar lhsUpper; PRUnichar rhsUpper;
+          gCaseConv->ToUpper(lhs, &lhsUpper);
+          gCaseConv->ToUpper(rhs, &rhsUpper);
+          return lhsUpper = rhsUpper;
+      }
+  };
+
+PRBool
+CaseInsensitiveFindInReadable( const nsAString& aPattern, nsReadingIterator<PRUnichar>& aSearchStart, nsReadingIterator<PRUnichar>& aSearchEnd )
+  {
+      NS_NOTYETIMPLEMENTED("Need to copy over string code");
+#if 0
+      return FindInReadable_Impl(aPattern, aSearchStart, aSearchEnd, CaseInsensitivePRUnicharComparator());
+#endif
+      return PR_FALSE;
+  }
+

intl/unicharutil/util/nsUnicharUtils.h

@@ -0,0 +1,28 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsAString.h"
+
+void ToLowerCase( nsAString& );
+void ToUpperCase( nsAString& );
+
+PRBool CaseInsensitiveFindInReadable( const nsAString& aPattern, nsReadingIterator<PRUnichar>&, nsReadingIterator<PRUnichar>& );