Introduce characters utilities in rtl/character.hxx

Signed-off-by: Stephan Bergmann <sbergman@redhat.com>, with slight modifications
to sal/inc/rtl/character.hxx:
* Replaced "#pragma once" with explicit include guard for now.
* Missing includes.
* Cosmetic clean-up.

Change-Id: I94d01cd4e766f92c70f941839a67101fa2c97654

2 files changed, 10 insertions, 29 deletions

diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index c0d93b6a85af..590ea0ee46b0 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -22,6 +22,7 @@
 
 #include "osl/diagnose.h"
 #include "rtl/alloc.h"
+#include "rtl/character.hxx"
 #include "rtl/math.hxx"
 #include "rtl/strbuf.h"
 #include "rtl/string.h"
@@ -689,13 +690,6 @@ inline bool long10Overflow( long& nExp, int nAdd )
     return false;
 }
 
-// We are only concerned about ASCII arabic numerical digits here
-template< typename CharT >
-inline bool isDigit( CharT c )
-{
-    return 0x30 <= c && c <= 0x39;
-}
-
 template< typename CharT >
 inline double stringToDouble(CharT const * pBegin, CharT const * pEnd,
                              CharT cDecSeparator, CharT cGroupSeparator,
@@ -755,7 +749,7 @@ inline double stringToDouble(CharT const * pBegin, CharT const * pEnd,
         for (; p != pEnd; ++p)
         {
             CharT c = *p;
-            if (isDigit(c))
+            if (rtl::isAsciiDigit(c))
             {
                 fVal = fVal * 10.0 + static_cast< double >( c - CharT('0') );
                 ++nValExp;
@@ -783,7 +777,7 @@ inline double stringToDouble(CharT const * pBegin, CharT const * pEnd,
             for (; p != pEnd; ++p)
             {
                 CharT c = *p;
-                if (!isDigit(c))
+                if (!rtl::isAsciiDigit(c))
                     break;
                 if ( nDigs < nSigs )
                 {   // further digits (more than nSigs) don't have any
@@ -821,7 +815,7 @@ inline double stringToDouble(CharT const * pBegin, CharT const * pEnd,
             if ( fVal == 0.0 )
             {   // no matter what follows, zero stays zero, but carry on the
                 // offset
-                while (p != pEnd && isDigit(*p))
+                while (p != pEnd && rtl::isAsciiDigit(*p))
                     ++p;
             }
             else
@@ -831,7 +825,7 @@ inline double stringToDouble(CharT const * pBegin, CharT const * pEnd,
                 for (; p != pEnd; ++p)
                 {
                     CharT c = *p;
-                    if (!isDigit(c))
+                    if (!rtl::isAsciiDigit(c))
                         break;
                     int i = c - CharT('0');
                     if ( long10Overflow( nExp, i ) )
@@ -876,7 +870,7 @@ inline double stringToDouble(CharT const * pBegin, CharT const * pEnd,
                 fVal = HUGE_VAL;
                 eStatus = rtl_math_ConversionStatus_OutOfRange;
                 // Eat any further digits:
-                while (p != pEnd && isDigit(*p))
+                while (p != pEnd && rtl::isAsciiDigit(*p))
                     ++p;
             }
             else if (pEnd - p >= 4 && p[1] == CharT('N') && p[2] == CharT('A')
@@ -897,7 +891,7 @@ inline double stringToDouble(CharT const * pBegin, CharT const * pEnd,
                     bSign = false; // don't negate again
                 }
                 // Eat any further digits:
-                while (p != pEnd && isDigit(*p))
+                while (p != pEnd && rtl::isAsciiDigit(*p))
                     ++p;
             }
         }
diff --git a/sal/rtl/uri.cxx b/sal/rtl/uri.cxx
index 9edd087ca335..7e4402f785c8 100644
--- a/sal/rtl/uri.cxx
+++ b/sal/rtl/uri.cxx
@@ -20,6 +20,7 @@
 #include "surrogates.hxx"
 
 #include "osl/diagnose.h"
+#include "rtl/character.hxx"
 #include "rtl/strbuf.hxx"
 #include "rtl/textenc.h"
 #include "rtl/textcvt.h"
@@ -39,20 +40,6 @@ std::size_t const nCharClassSize = 128;
 
 sal_Unicode const cEscapePrefix = 0x25; // '%'
 
-inline bool isDigit(sal_uInt32 nUtf32)
-{
-    return nUtf32 >= 0x30 && nUtf32 <= 0x39; // '0'--'9'
-}
-
-inline bool isAlpha(sal_uInt32 nUtf32)
-{
-    // 'A'--'Z', 'a'--'z'
-    return (
-            (nUtf32 >= 0x41 && nUtf32 <= 0x5A) ||
-            (nUtf32 >= 0x61 && nUtf32 <= 0x7A)
-           );
-}
-
 inline bool isHighSurrogate(sal_uInt32 nUtf16)
 {
     return SAL_RTL_IS_HIGH_SURROGATE(nUtf16);
@@ -376,7 +363,7 @@ void parseUriRef(rtl_uString const * pUriRef, Components * pComponents)
     sal_Unicode const * pEnd = pBegin + pUriRef->length;
     sal_Unicode const * pPos = pBegin;
 
-    if (pPos != pEnd && isAlpha(*pPos))
+    if (pPos != pEnd && rtl::isAsciiAlpha(*pPos))
     {
         for (sal_Unicode const * p = pPos + 1; p != pEnd; ++p)
         {
@@ -387,7 +374,7 @@ void parseUriRef(rtl_uString const * pUriRef, Components * pComponents)
                 pPos = p;
                 break;
             }
-            else if (!isAlpha(*p) && !isDigit(*p) && *p != '+' && *p != '-'
+            else if (!rtl::isAsciiAlphanumeric(*p) && *p != '+' && *p != '-'
                      && *p != '.')
             {
                 break;