cchardet 0.2.0

data/ext/uchardet/src/nsEscCharsetProber.h

@@ -0,0 +1,70 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsEscCharSetProber_h__
+#define nsEscCharSetProber_h__
+
+#include <cstddef>
+
+#include "nsCharSetProber.h"
+#include "nsCodingStateMachine.h"
+
+#define NUM_OF_ESC_CHARSETS   4
+
+class nsEscCharSetProber: public nsCharSetProber {
+public:
+  nsEscCharSetProber(PRUint32 aLanguageFilter);
+  virtual ~nsEscCharSetProber(void);
+  nsProbingState HandleData(const char* aBuf, PRUint32 aLen);
+  const char* GetCharSetName() {return mDetectedCharset;}
+  const char* GetLanguage() {return NULL;}
+  nsProbingState GetState(void) {return mState;}
+  void      Reset(void);
+  float     GetConfidence(void){return (float)0.99;}
+  void      SetOpion() {}
+
+protected:
+  void      GetDistribution(PRUint32 aCharLen, const char* aStr);
+  
+  nsCodingStateMachine* mCodingSM[NUM_OF_ESC_CHARSETS] ;
+  PRUint32    mActiveSM;
+  nsProbingState mState;
+  const char *  mDetectedCharset;
+};
+
+#endif /* nsEscCharSetProber_h__ */
+

data/ext/uchardet/src/nsEscSM.cpp

@@ -0,0 +1,267 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#include "nsCodingStateMachine.h"
+
+static const PRUint32 HZ_cls[ 256 / 8 ] = {
+PCK4BITS(1,0,0,0,0,0,0,0),  // 00 - 07 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 08 - 0f 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 10 - 17 
+PCK4BITS(0,0,0,1,0,0,0,0),  // 18 - 1f 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 20 - 27 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 28 - 2f 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 30 - 37 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 38 - 3f 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 40 - 47 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 48 - 4f 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 50 - 57 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 58 - 5f 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 60 - 67 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 68 - 6f 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 70 - 77 
+PCK4BITS(0,0,0,4,0,5,2,0),  // 78 - 7f 
+PCK4BITS(1,1,1,1,1,1,1,1),  // 80 - 87 
+PCK4BITS(1,1,1,1,1,1,1,1),  // 88 - 8f 
+PCK4BITS(1,1,1,1,1,1,1,1),  // 90 - 97 
+PCK4BITS(1,1,1,1,1,1,1,1),  // 98 - 9f 
+PCK4BITS(1,1,1,1,1,1,1,1),  // a0 - a7 
+PCK4BITS(1,1,1,1,1,1,1,1),  // a8 - af 
+PCK4BITS(1,1,1,1,1,1,1,1),  // b0 - b7 
+PCK4BITS(1,1,1,1,1,1,1,1),  // b8 - bf 
+PCK4BITS(1,1,1,1,1,1,1,1),  // c0 - c7 
+PCK4BITS(1,1,1,1,1,1,1,1),  // c8 - cf 
+PCK4BITS(1,1,1,1,1,1,1,1),  // d0 - d7 
+PCK4BITS(1,1,1,1,1,1,1,1),  // d8 - df 
+PCK4BITS(1,1,1,1,1,1,1,1),  // e0 - e7 
+PCK4BITS(1,1,1,1,1,1,1,1),  // e8 - ef 
+PCK4BITS(1,1,1,1,1,1,1,1),  // f0 - f7 
+PCK4BITS(1,1,1,1,1,1,1,1)   // f8 - ff 
+};
+
+
+static const PRUint32 HZ_st [ 6] = {
+PCK4BITS(eStart,eError,     3,eStart,eStart,eStart,eError,eError),//00-07 
+PCK4BITS(eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe),//08-0f 
+PCK4BITS(eItsMe,eItsMe,eError,eError,eStart,eStart,     4,eError),//10-17 
+PCK4BITS(     5,eError,     6,eError,     5,     5,     4,eError),//18-1f 
+PCK4BITS(     4,eError,     4,     4,     4,eError,     4,eError),//20-27 
+PCK4BITS(     4,eItsMe,eStart,eStart,eStart,eStart,eStart,eStart) //28-2f 
+};
+
+static const PRUint32 HZCharLenTable[] = {0, 0, 0, 0, 0, 0};
+
+const SMModel HZSMModel = {
+  {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, HZ_cls },
+   6,
+  {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, HZ_st },
+  HZCharLenTable,
+  "HZ-GB-2312",
+};
+
+
+static const PRUint32 ISO2022CN_cls [ 256 / 8 ] = {
+PCK4BITS(2,0,0,0,0,0,0,0),  // 00 - 07 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 08 - 0f 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 10 - 17 
+PCK4BITS(0,0,0,1,0,0,0,0),  // 18 - 1f 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 20 - 27 
+PCK4BITS(0,3,0,0,0,0,0,0),  // 28 - 2f 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 30 - 37 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 38 - 3f 
+PCK4BITS(0,0,0,4,0,0,0,0),  // 40 - 47 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 48 - 4f 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 50 - 57 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 58 - 5f 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 60 - 67 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 68 - 6f 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 70 - 77 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 78 - 7f 
+PCK4BITS(2,2,2,2,2,2,2,2),  // 80 - 87 
+PCK4BITS(2,2,2,2,2,2,2,2),  // 88 - 8f 
+PCK4BITS(2,2,2,2,2,2,2,2),  // 90 - 97 
+PCK4BITS(2,2,2,2,2,2,2,2),  // 98 - 9f 
+PCK4BITS(2,2,2,2,2,2,2,2),  // a0 - a7 
+PCK4BITS(2,2,2,2,2,2,2,2),  // a8 - af 
+PCK4BITS(2,2,2,2,2,2,2,2),  // b0 - b7 
+PCK4BITS(2,2,2,2,2,2,2,2),  // b8 - bf 
+PCK4BITS(2,2,2,2,2,2,2,2),  // c0 - c7 
+PCK4BITS(2,2,2,2,2,2,2,2),  // c8 - cf 
+PCK4BITS(2,2,2,2,2,2,2,2),  // d0 - d7 
+PCK4BITS(2,2,2,2,2,2,2,2),  // d8 - df 
+PCK4BITS(2,2,2,2,2,2,2,2),  // e0 - e7 
+PCK4BITS(2,2,2,2,2,2,2,2),  // e8 - ef 
+PCK4BITS(2,2,2,2,2,2,2,2),  // f0 - f7 
+PCK4BITS(2,2,2,2,2,2,2,2)   // f8 - ff 
+};
+
+
+static const PRUint32 ISO2022CN_st [ 8] = {
+PCK4BITS(eStart,     3,eError,eStart,eStart,eStart,eStart,eStart),//00-07 
+PCK4BITS(eStart,eError,eError,eError,eError,eError,eError,eError),//08-0f 
+PCK4BITS(eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe),//10-17 
+PCK4BITS(eItsMe,eItsMe,eItsMe,eError,eError,eError,     4,eError),//18-1f 
+PCK4BITS(eError,eError,eError,eItsMe,eError,eError,eError,eError),//20-27 
+PCK4BITS(     5,     6,eError,eError,eError,eError,eError,eError),//28-2f 
+PCK4BITS(eError,eError,eError,eItsMe,eError,eError,eError,eError),//30-37 
+PCK4BITS(eError,eError,eError,eError,eError,eItsMe,eError,eStart) //38-3f 
+};
+
+static const PRUint32 ISO2022CNCharLenTable[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
+
+const SMModel ISO2022CNSMModel = {
+  {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, ISO2022CN_cls },
+  9,
+  {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, ISO2022CN_st },
+  ISO2022CNCharLenTable,
+  "ISO-2022-CN",
+};
+
+static const PRUint32 ISO2022JP_cls [ 256 / 8 ] = {
+PCK4BITS(2,0,0,0,0,0,0,0),  // 00 - 07 
+PCK4BITS(0,0,0,0,0,0,2,2),  // 08 - 0f 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 10 - 17 
+PCK4BITS(0,0,0,1,0,0,0,0),  // 18 - 1f 
+PCK4BITS(0,0,0,0,7,0,0,0),  // 20 - 27 
+PCK4BITS(3,0,0,0,0,0,0,0),  // 28 - 2f 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 30 - 37 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 38 - 3f 
+PCK4BITS(6,0,4,0,8,0,0,0),  // 40 - 47 
+PCK4BITS(0,9,5,0,0,0,0,0),  // 48 - 4f 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 50 - 57 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 58 - 5f 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 60 - 67 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 68 - 6f 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 70 - 77 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 78 - 7f 
+PCK4BITS(2,2,2,2,2,2,2,2),  // 80 - 87 
+PCK4BITS(2,2,2,2,2,2,2,2),  // 88 - 8f 
+PCK4BITS(2,2,2,2,2,2,2,2),  // 90 - 97 
+PCK4BITS(2,2,2,2,2,2,2,2),  // 98 - 9f 
+PCK4BITS(2,2,2,2,2,2,2,2),  // a0 - a7 
+PCK4BITS(2,2,2,2,2,2,2,2),  // a8 - af 
+PCK4BITS(2,2,2,2,2,2,2,2),  // b0 - b7 
+PCK4BITS(2,2,2,2,2,2,2,2),  // b8 - bf 
+PCK4BITS(2,2,2,2,2,2,2,2),  // c0 - c7 
+PCK4BITS(2,2,2,2,2,2,2,2),  // c8 - cf 
+PCK4BITS(2,2,2,2,2,2,2,2),  // d0 - d7 
+PCK4BITS(2,2,2,2,2,2,2,2),  // d8 - df 
+PCK4BITS(2,2,2,2,2,2,2,2),  // e0 - e7 
+PCK4BITS(2,2,2,2,2,2,2,2),  // e8 - ef 
+PCK4BITS(2,2,2,2,2,2,2,2),  // f0 - f7 
+PCK4BITS(2,2,2,2,2,2,2,2)   // f8 - ff 
+};
+
+
+static const PRUint32 ISO2022JP_st [ 9] = {
+PCK4BITS(eStart,     3,eError,eStart,eStart,eStart,eStart,eStart),//00-07 
+PCK4BITS(eStart,eStart,eError,eError,eError,eError,eError,eError),//08-0f 
+PCK4BITS(eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe),//10-17 
+PCK4BITS(eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eError,eError),//18-1f 
+PCK4BITS(eError,     5,eError,eError,eError,     4,eError,eError),//20-27 
+PCK4BITS(eError,eError,eError,     6,eItsMe,eError,eItsMe,eError),//28-2f 
+PCK4BITS(eError,eError,eError,eError,eError,eError,eItsMe,eItsMe),//30-37 
+PCK4BITS(eError,eError,eError,eItsMe,eError,eError,eError,eError),//38-3f 
+PCK4BITS(eError,eError,eError,eError,eItsMe,eError,eStart,eStart) //40-47 
+};
+
+/* XXX: I needed to complete the 2 last classes for this CharLenTable
+ * but I did it a bit randomly. Cf. bug 101030.
+ * Let's check this piece of code again later when I understand it
+ * better. */
+static const PRUint32 ISO2022JPCharLenTable[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+
+const SMModel ISO2022JPSMModel = {
+  {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, ISO2022JP_cls },
+  10,
+  {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, ISO2022JP_st },
+  ISO2022JPCharLenTable,
+  "ISO-2022-JP",
+};
+
+static const PRUint32 ISO2022KR_cls [ 256 / 8 ] = {
+PCK4BITS(2,0,0,0,0,0,0,0),  // 00 - 07 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 08 - 0f 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 10 - 17 
+PCK4BITS(0,0,0,1,0,0,0,0),  // 18 - 1f 
+PCK4BITS(0,0,0,0,3,0,0,0),  // 20 - 27 
+PCK4BITS(0,4,0,0,0,0,0,0),  // 28 - 2f 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 30 - 37 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 38 - 3f 
+PCK4BITS(0,0,0,5,0,0,0,0),  // 40 - 47 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 48 - 4f 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 50 - 57 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 58 - 5f 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 60 - 67 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 68 - 6f 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 70 - 77 
+PCK4BITS(0,0,0,0,0,0,0,0),  // 78 - 7f 
+PCK4BITS(2,2,2,2,2,2,2,2),  // 80 - 87 
+PCK4BITS(2,2,2,2,2,2,2,2),  // 88 - 8f 
+PCK4BITS(2,2,2,2,2,2,2,2),  // 90 - 97 
+PCK4BITS(2,2,2,2,2,2,2,2),  // 98 - 9f 
+PCK4BITS(2,2,2,2,2,2,2,2),  // a0 - a7 
+PCK4BITS(2,2,2,2,2,2,2,2),  // a8 - af 
+PCK4BITS(2,2,2,2,2,2,2,2),  // b0 - b7 
+PCK4BITS(2,2,2,2,2,2,2,2),  // b8 - bf 
+PCK4BITS(2,2,2,2,2,2,2,2),  // c0 - c7 
+PCK4BITS(2,2,2,2,2,2,2,2),  // c8 - cf 
+PCK4BITS(2,2,2,2,2,2,2,2),  // d0 - d7 
+PCK4BITS(2,2,2,2,2,2,2,2),  // d8 - df 
+PCK4BITS(2,2,2,2,2,2,2,2),  // e0 - e7 
+PCK4BITS(2,2,2,2,2,2,2,2),  // e8 - ef 
+PCK4BITS(2,2,2,2,2,2,2,2),  // f0 - f7 
+PCK4BITS(2,2,2,2,2,2,2,2)   // f8 - ff 
+};
+
+
+static const PRUint32 ISO2022KR_st [ 5] = {
+PCK4BITS(eStart,     3,eError,eStart,eStart,eStart,eError,eError),//00-07 
+PCK4BITS(eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe),//08-0f 
+PCK4BITS(eItsMe,eItsMe,eError,eError,eError,     4,eError,eError),//10-17 
+PCK4BITS(eError,eError,eError,eError,     5,eError,eError,eError),//18-1f 
+PCK4BITS(eError,eError,eError,eItsMe,eStart,eStart,eStart,eStart) //20-27 
+};
+
+static const PRUint32 ISO2022KRCharLenTable[] = {0, 0, 0, 0, 0, 0};
+
+const SMModel ISO2022KRSMModel = {
+  {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, ISO2022KR_cls },
+   6,
+  {eIdxSft4bits, eSftMsk4bits, eBitSft4bits, eUnitMsk4bits, ISO2022KR_st },
+  ISO2022KRCharLenTable,
+  "ISO-2022-KR",
+};
+

data/ext/uchardet/src/nsGB2312Prober.cpp

@@ -0,0 +1,96 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// for S-JIS encoding, obeserve characteristic:
+// 1, kana character (or hankaku?) often have hight frequency of appereance
+// 2, kana character often exist in group
+// 3, certain combination of kana is never used in japanese language
+
+#include "nsGB2312Prober.h"
+
+void  nsGB18030Prober::Reset(void)
+{
+  mCodingSM->Reset(); 
+  mState = eDetecting;
+  mDistributionAnalyser.Reset(mIsPreferredLanguage);
+  //mContextAnalyser.Reset();
+}
+
+nsProbingState nsGB18030Prober::HandleData(const char* aBuf, PRUint32 aLen)
+{
+  PRUint32 codingState;
+
+  for (PRUint32 i = 0; i < aLen; i++)
+  {
+    codingState = mCodingSM->NextState(aBuf[i]);
+    if (codingState == eItsMe)
+    {
+      mState = eFoundIt;
+      break;
+    }
+    if (codingState == eStart)
+    {
+      PRUint32 charLen = mCodingSM->GetCurrentCharLen();
+
+      if (i == 0)
+      {
+        mLastChar[1] = aBuf[0];
+        mDistributionAnalyser.HandleOneChar(mLastChar, charLen);
+      }
+      else
+        mDistributionAnalyser.HandleOneChar(aBuf+i-1, charLen);
+    }
+  }
+
+  mLastChar[0] = aBuf[aLen-1];
+
+  if (mState == eDetecting)
+    if (mDistributionAnalyser.GotEnoughData() && GetConfidence() > SHORTCUT_THRESHOLD)
+      mState = eFoundIt;
+//    else
+//      mDistributionAnalyser.HandleData(aBuf, aLen);
+
+  return mState;
+}
+
+float nsGB18030Prober::GetConfidence(void)
+{
+  float distribCf = mDistributionAnalyser.GetConfidence();
+
+  return (float)distribCf;
+}
+

data/ext/uchardet/src/nsGB2312Prober.h

@@ -0,0 +1,77 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsGB2312Prober_h__
+#define nsGB2312Prober_h__
+
+#include "nsCharSetProber.h"
+#include "nsCodingStateMachine.h"
+#include "CharDistribution.h"
+
+// We use GB18030 to replace GB2312, because 18030 is a superset.
+
+class nsGB18030Prober: public nsCharSetProber {
+public:
+  nsGB18030Prober(PRBool aIsPreferredLanguage)
+    :mIsPreferredLanguage(aIsPreferredLanguage)
+  {mCodingSM = new nsCodingStateMachine(&GB18030SMModel);
+    Reset();}
+  virtual ~nsGB18030Prober(void){delete mCodingSM;}
+  nsProbingState HandleData(const char* aBuf, PRUint32 aLen);
+  const char* GetCharSetName() {return "GB18030";}
+  const char* GetLanguage() {return "zh";}
+  nsProbingState GetState(void) {return mState;}
+  void      Reset(void);
+  float     GetConfidence(void);
+  void      SetOpion() {}
+
+protected:
+  void      GetDistribution(PRUint32 aCharLen, const char* aStr);
+  
+  nsCodingStateMachine* mCodingSM;
+  nsProbingState mState;
+
+  //GB2312ContextAnalysis mContextAnalyser;
+  GB2312DistributionAnalysis mDistributionAnalyser;
+  char mLastChar[2];
+  PRBool mIsPreferredLanguage;
+
+};
+
+
+#endif /* nsGB2312Prober_h__ */
+