--- parser3/src/include/pa_charset.h	2008/05/22 16:17:50	1.33
+++ parser3/src/include/pa_charset.h	2015/10/09 11:49:54	1.53
@@ -1,14 +1,14 @@
 /** @file
 	Parser: Charset connection decl.
 
-	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef PA_CHARSET_H
 #define PA_CHARSET_H
 
-static const char * const IDENT_CHARSET_H="$Date: 2008/05/22 16:17:50 $";
+#define IDENT_PA_CHARSET_H "$Id: pa_charset.h,v 1.53 2015/10/09 11:49:54 moko Exp $"
 
 
 #include "pa_exception.h"
@@ -16,11 +16,9 @@ static const char * const IDENT_CHARSET_
 #include "pa_hash.h"
 #include "pa_array.h"
 
-// hiding into namespace so to avoid stupid conflict
-namespace PCRE {
 #include "pcre.h"
-#	include "internal.h"
-};
+// we are using some pcre_internal.h stuff as well
+#include "../lib/pcre/pa_pcre_internal.h"
 
 #ifdef XML
 #include "libxml/encoding.h"
@@ -32,16 +30,16 @@ namespace PCRE {
 
 #define MAX_CHARSET_UNI_CODES 500
 
-#	ifndef XMLCh 
-		typedef unsigned int XMLCh;
-#	endif
-#	ifndef XMLByte
-		typedef unsigned char XMLByte;
-#	endif
+#ifndef XMLCh 
+	typedef unsigned int XMLCh;
+#endif
+#ifndef XMLByte
+	typedef unsigned char XMLByte;
+#endif
 
 // helpers
 
-typedef Hash<const String::Body, String::Body> HashStringString;
+typedef HashString<String::Body> HashStringString;
 
 /**	charset holds name & transcode tables 
 	registers libxml transcoders
@@ -56,28 +54,21 @@ public:
 
 	bool isUTF8() const { return fisUTF8; }
 
-	static String::C transcode(const String::C src,
-		const Charset& source_transcoder, 
-		const Charset& dest_transcoder
-	);
-
-	static String& transcode(const String& src,
-		const Charset& source_transcoder, 
-		const Charset& dest_transcoder);
-
-	static String::Body transcode(const String::Body src,
-		const Charset& source_transcoder, 
-		const Charset& dest_transcoder);
-
-	static void transcode(ArrayString& src,
-		const Charset& source_transcoder, 
-		const Charset& dest_transcoder);
-
-	static void transcode(HashStringString& src,
-		const Charset& source_transcoder, 
-		const Charset& dest_transcoder);
+	static String::C transcode(const String::C src, const Charset& source_charset, const Charset& dest_charset);
+	static String::Body transcode(const String::Body src, const Charset& source_transcoder, const Charset& dest_transcoder);
+	static String& transcode(const String& src, const Charset& source_transcoder, const Charset& dest_transcoder);
+	static void transcode(ArrayString& src, const Charset& source_transcoder, const Charset& dest_transcoder);
+	static void transcode(HashStringString& src, const Charset& source_transcoder, const Charset& dest_transcoder);
+
+	static String::C escape(const String::C src, const Charset& source_charset);
+	static String::Body escape(const String::Body src, const Charset& source_charset);
+	static String& escape(const String& src, const Charset& source_charset);
+
+	static String::C escape_JSON(const String::C src, const Charset& source_charset);
+	static String::Body escape_JSON(const String::Body src, const Charset& source_charset);
+	static String& escape_JSON(const String& src, const Charset& source_charset);
 
-	XMLByte transcodeCharFromUTF8(XMLCh utf8code, XMLByte not_found);
+	void store_Char(XMLByte*& outPtr, XMLCh src, XMLByte not_found);
 
 #ifdef XML
 	xmlCharEncodingHandler& transcoder(const String::Body NAME);
@@ -127,12 +118,24 @@ private:
 	bool fisUTF8;
 	Tables tables;
 
+	static size_t calc_escaped_length_UTF8(XMLByte* src, size_t src_length);
+	static size_t calc_escaped_length(const XMLByte* src, size_t src_length, const Charset::Tables& tables);
+	static size_t calc_escaped_length(const String::C src, const Charset& source_charset);
+	static size_t escape_UTF8(const XMLByte* src, size_t src_length, XMLByte* dest);
+	static size_t escape(const XMLByte* src, size_t src_length, XMLByte* dest, const Charset::Tables& tables);
+
+	static size_t calc_JSON_escaped_length_UTF8(XMLByte* src, size_t src_length);
+	static size_t calc_JSON_escaped_length(const XMLByte* src, size_t src_length, const Charset::Tables& tables);
+	static size_t calc_JSON_escaped_length(const String::C src, const Charset& source_charset);
+	static size_t escape_JSON_UTF8(const XMLByte* src, size_t src_length, XMLByte* dest);
+	static size_t escape_JSON(const XMLByte* src, size_t src_length, XMLByte* dest, const Charset::Tables& tables);
+
 #ifdef XML
 
 private:
 	void addEncoding(char* name_cstr);
 	void initTranscoder(const String::Body name, const char* name_cstr);
-	
+
 public:
 	/// converts xmlChar* null-terminated string to char* 
 	String::C transcode_cstr(const xmlChar* s);
@@ -162,7 +165,30 @@ private:
 extern Charset::UTF8CaseTable UTF8CaseToUpper;
 extern Charset::UTF8CaseTable UTF8CaseToLower;
 void change_case_UTF8(const XMLByte* srcData, size_t srcLen,
-					  XMLByte* toFill, size_t toFillLen,
-					  const Charset::UTF8CaseTable& table);
+					XMLByte* toFill, size_t toFillLen,
+					const Charset::UTF8CaseTable& table);
+size_t getUTF8BytePos(const XMLByte* srcBegin, const XMLByte* srcEnd, size_t charPos/*position in characters*/);
+size_t getUTF8CharPos(const XMLByte* srcBegin, const XMLByte* srcEnd, size_t bytePos/*position in bytes*/);
+size_t lengthUTF8(const XMLByte* srcBegin, const XMLByte* srcEnd);
+unsigned int lengthUTF8Char(const XMLByte c);
+
+const char *fixUTF8(const char *src);
+
+class UTF8_string_iterator {
+	public:
+		UTF8_string_iterator(const String& astring): fsrcPtr((XMLByte*)astring.cstr()), fsrcEnd(fsrcPtr + astring.length()) {}
+		UTF8_string_iterator(XMLByte* asrcPtr, size_t length): fsrcPtr(asrcPtr), fsrcEnd(fsrcPtr + length) {}
+
+		bool has_next();
+		XMLCh next() { return fUTF8Char; }
+		XMLByte getFirstByte(){ return ffirstByte; }
+		size_t getCharSize(){ return fcharSize; }
+	private:
+		const XMLByte* fsrcPtr;
+		const XMLByte* fsrcEnd;
+		size_t fcharSize;
+		XMLByte ffirstByte;
+		XMLCh fUTF8Char;
+};
 
 #endif