Merge pull request #258 from Dmitry-Me/clarifyIsNameStart

Clarify IsNameStartChar() - resolve issue 250
2015-01-05 17:06:30 -08:00
parent 625402a01f ea617f9380
commit 59946f6f1a
1 changed files with 8 additions and 3 deletions
--- a/tinyxml2.h
+++ b/tinyxml2.h
@@ -552,9 +552,14 @@ public:
    }
    
    inline static bool IsNameStartChar( unsigned char ch ) {
-        return ( ( ch < 128 ) ? isalpha( ch ) : 1 )
-               || ch == ':'
-               || ch == '_';
+        if ( ch >= 128 ) {
+            // This is a heuristic guess in attempt to not implement Unicode-aware isalpha()
+            return true;
+        }
+        if ( isalpha( ch ) ) {
+            return true;
+        }
+        return ch == ':' || ch == '_';
    }
    
    inline static bool IsNameChar( unsigned char ch ) {