script, src: generate more code for language and sequence model listing.

Right now, each time we add new language or new charset support, we have
too many pieces of code not to forget to edit. The script
script/BuildLangModel.py will now take care of the main parts: listing
the sequence models, listing the generic language models and computing
the numbers for each listing.

Furthermore the script will now end with a TODO list of the parts which
are still to be done manually (2 functions to edit and a CMakeLists).

Finally the script now allows to give a list of languages to edit rather
of having to run it with languages one by one. It also allows 2 special
code: "none", which will retrain none of the languages, but will
re-generate only the new generated listings; and "all" which will
retrain all models (useful in particulare when we change the model
formats or usage and want to regenerate everything).

script/header-template.cpp

@@ -34,6 +34,3 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-
-#include "../nsSBCharSetProber.h"
-#include "../nsLanguageDetector.h"

script/support.txt

@@ -0,0 +1,36 @@
+ar
+be
+bg
+cs
+da
+de
+el
+en
+eo
+es
+et
+fi
+fr
+ga
+he
+hi
+hr
+hu
+it
+lt
+lv
+mk
+mt
+no
+pl
+pt
+ro
+ru
+sk
+sl
+sr
+sv
+th
+tr
+uk
+vi

src/LangModels/LangArabicModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Arabic *********/
 

src/LangModels/LangBelarusianModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Belarusian *********/
 

src/LangModels/LangBulgarianModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Bulgarian *********/
 

src/LangModels/LangCroatianModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Croatian *********/
 

src/LangModels/LangCzechModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Czech *********/
 

src/LangModels/LangDanishModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Danish *********/
 

src/LangModels/LangEnglishModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: English *********/
 

src/LangModels/LangEsperantoModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Esperanto *********/
 

src/LangModels/LangEstonianModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Estonian *********/
 

src/LangModels/LangFinnishModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Finnish *********/
 

src/LangModels/LangFrenchModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: French *********/
 

src/LangModels/LangGermanModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: German *********/
 

src/LangModels/LangGreekModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Greek *********/
 

src/LangModels/LangHebrewModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Hebrew *********/
 

src/LangModels/LangHindiModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Hindi *********/
 

src/LangModels/LangHungarianModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Hungarian *********/
 

src/LangModels/LangIrishModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Irish *********/
 

src/LangModels/LangItalianModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Italian *********/
 

src/LangModels/LangLatvianModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Latvian *********/
 

src/LangModels/LangLithuanianModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Lithuanian *********/
 

src/LangModels/LangMacedonianModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Macedonian *********/
 

src/LangModels/LangMalteseModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Maltese *********/
 

src/LangModels/LangNorwegianModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Norwegian *********/
 

src/LangModels/LangPolishModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Polish *********/
 

src/LangModels/LangPortugueseModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Portuguese *********/
 

src/LangModels/LangRomanianModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Romanian *********/
 

src/LangModels/LangRussianModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Russian *********/
 

src/LangModels/LangSerbianModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Serbian *********/
 

src/LangModels/LangSlovakModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Slovak *********/
 

src/LangModels/LangSloveneModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Slovene *********/
 

src/LangModels/LangSpanishModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Spanish *********/
 

src/LangModels/LangSwedishModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Swedish *********/
 

src/LangModels/LangThaiModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Thai *********/
 

src/LangModels/LangTurkishModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Turkish *********/
 

src/LangModels/LangUkrainianModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Ukrainian *********/
 

src/LangModels/LangVietnameseModel.cpp

@@ -36,7 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "../nsSBCharSetProber.h"
+#include "../nsSBCharSetProber-generated.h"
 #include "../nsLanguageDetector.h"
+#include "../nsLanguageDetector-generated.h"
 
 /********* Language model for: Vietnamese *********/
 

src/nsLanguageDetector-generated.h

@@ -0,0 +1,80 @@
+/* -*- Mode: C++; tab-width: 2; 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 Communicator client 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 nsLanguageDetector_h_generated_h__
+#define nsLanguageDetector_h_generated_h__
+
+#define NUM_OF_LANGUAGE_MODELS 36
+
+extern const LanguageModel ArabicModel;
+extern const LanguageModel BelarusianModel;
+extern const LanguageModel BulgarianModel;
+extern const LanguageModel CzechModel;
+extern const LanguageModel DanishModel;
+extern const LanguageModel GermanModel;
+extern const LanguageModel GreekModel;
+extern const LanguageModel EnglishModel;
+extern const LanguageModel EsperantoModel;
+extern const LanguageModel SpanishModel;
+extern const LanguageModel EstonianModel;
+extern const LanguageModel FinnishModel;
+extern const LanguageModel FrenchModel;
+extern const LanguageModel IrishModel;
+extern const LanguageModel HebrewModel;
+extern const LanguageModel HindiModel;
+extern const LanguageModel CroatianModel;
+extern const LanguageModel HungarianModel;
+extern const LanguageModel ItalianModel;
+extern const LanguageModel LithuanianModel;
+extern const LanguageModel LatvianModel;
+extern const LanguageModel MacedonianModel;
+extern const LanguageModel MalteseModel;
+extern const LanguageModel NorwegianModel;
+extern const LanguageModel PolishModel;
+extern const LanguageModel PortugueseModel;
+extern const LanguageModel RomanianModel;
+extern const LanguageModel RussianModel;
+extern const LanguageModel SlovakModel;
+extern const LanguageModel SloveneModel;
+extern const LanguageModel SerbianModel;
+extern const LanguageModel SwedishModel;
+extern const LanguageModel ThaiModel;
+extern const LanguageModel TurkishModel;
+extern const LanguageModel UkrainianModel;
+extern const LanguageModel VietnameseModel;
+
+#endif /* nsLanguageDetector_h_generated_h__ */

src/nsLanguageDetector.h

@@ -125,41 +125,4 @@ private:
   int GetOrderFromCodePoint(int codePoint);
 };
 
-extern const LanguageModel ArabicModel;
-extern const LanguageModel BelarusianModel;
-extern const LanguageModel BulgarianModel;
-extern const LanguageModel CroatianModel;
-extern const LanguageModel CzechModel;
-extern const LanguageModel DanishModel;
-extern const LanguageModel EnglishModel;
-extern const LanguageModel EsperantoModel;
-extern const LanguageModel EstonianModel;
-extern const LanguageModel FinnishModel;
-extern const LanguageModel FrenchModel;
-extern const LanguageModel GermanModel;
-extern const LanguageModel GreekModel;
-extern const LanguageModel HebrewModel;
-extern const LanguageModel HindiModel;
-extern const LanguageModel HungarianModel;
-extern const LanguageModel IrishModel;
-extern const LanguageModel ItalianModel;
-extern const LanguageModel LatvianModel;
-extern const LanguageModel LithuanianModel;
-extern const LanguageModel MacedonianModel;
-extern const LanguageModel MalteseModel;
-extern const LanguageModel NorwegianModel;
-extern const LanguageModel PolishModel;
-extern const LanguageModel PortugueseModel;
-extern const LanguageModel RomanianModel;
-extern const LanguageModel RussianModel;
-extern const LanguageModel SerbianModel;
-extern const LanguageModel SlovakModel;
-extern const LanguageModel SloveneModel;
-extern const LanguageModel SpanishModel;
-extern const LanguageModel SwedishModel;
-extern const LanguageModel ThaiModel;
-extern const LanguageModel TurkishModel;
-extern const LanguageModel UkrainianModel;
-extern const LanguageModel VietnameseModel;
-
 #endif /* nsLanguageDetector_h__ */

src/nsMBCSGroupProber.h

@@ -48,8 +48,11 @@
 #include "nsBig5Prober.h"
 #include "nsEUCTWProber.h"
 
+#include "nsLanguageDetector-generated.h"
+
 #define NUM_OF_PROBERS    8
-#define NUM_OF_LANGUAGES  37
+/* All the generated language model + the CJK detector.  */
+#define NUM_OF_LANGUAGES  (NUM_OF_LANGUAGE_MODELS + 1)
 
 class nsMBCSGroupProber: public nsCharSetProber {
 public:

src/nsSBCSGroupProber.cpp

@@ -36,10 +36,12 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include <assert.h>
 #include <stdio.h>
 #include "prmem.h"
 
 #include "nsSBCharSetProber.h"
+#include "nsSBCharSetProber-generated.h"
 #include "nsSBCSGroupProber.h"
 
 #include "nsHebrewProber.h"
@@ -50,6 +52,14 @@ nsSBCSGroupProber::nsSBCSGroupProber()
   PRUint32        heb_prober_idx;
   PRUint32        n = 0;
 
+  /* We create more probers than sequence models because of Hebrew handling,
+   * making Windows_1255HebrewModel and Ibm862HebrewModel used twice, while
+   * Iso_8859_8HebrewModel is currently unused.
+   */
+  n_sbcs_probers = NUM_OF_SEQUENCE_MODELS + 2;
+  mProbers      = new nsCharSetProber*[n_sbcs_probers];
+  mIsActive     = new PRBool[n_sbcs_probers];
+
   mProbers[n++] = new nsSingleByteCharSetProber(&Windows_1251RussianModel);
   mProbers[n++] = new nsSingleByteCharSetProber(&Koi8_RRussianModel);
   mProbers[n++] = new nsSingleByteCharSetProber(&Iso_8859_5RussianModel);
@@ -226,15 +236,19 @@ nsSBCSGroupProber::nsSBCSGroupProber()
   mProbers[n++] = new nsSingleByteCharSetProber(&Ibm855MacedonianModel);
   mProbers[n++] = new nsSingleByteCharSetProber(&Iso_8859_5MacedonianModel);
 
+  assert (n_sbcs_probers == n);
+
   Reset();
 }
 
 nsSBCSGroupProber::~nsSBCSGroupProber()
 {
-  for (PRUint32 i = 0; i < NUM_OF_SBCS_PROBERS; i++)
+  for (PRUint32 i = 0; i < n_sbcs_probers; i++)
   {
     delete mProbers[i];
   }
+  delete mProbers;
+  delete mIsActive;
 }
 
 
@@ -266,7 +280,7 @@ const char* nsSBCSGroupProber::GetLanguage(int candidate)
 void  nsSBCSGroupProber::Reset(void)
 {
   mActiveNum = 0;
-  for (PRUint32 i = 0; i < NUM_OF_SBCS_PROBERS; i++)
+  for (PRUint32 i = 0; i < n_sbcs_probers; i++)
   {
     if (mProbers[i]) // not null
     {
@@ -303,7 +317,7 @@ nsProbingState nsSBCSGroupProber::HandleData(const char* aBuf, PRUint32 aLen,
   if (newLen1 == 0)
     goto done; // Nothing to see here, move on.
 
-  for (i = 0; i < NUM_OF_SBCS_PROBERS; i++)
+  for (i = 0; i < n_sbcs_probers; i++)
   {
      if (!mIsActive[i])
        continue;
@@ -344,7 +358,7 @@ float nsSBCSGroupProber::GetConfidence(int candidate)
   case eNotMe:
     return (float)0.01;  //sure no
   default:
-    for (i = 0; i < NUM_OF_SBCS_PROBERS; i++)
+    for (i = 0; i < n_sbcs_probers; i++)
     {
       if (!mIsActive[i])
         continue;
@@ -367,7 +381,7 @@ void nsSBCSGroupProber::DumpStatus()
   
   cf = GetConfidence(0);
   printf(" SBCS Group Prober --------begin status \r\n");
-  for (i = 0; i < NUM_OF_SBCS_PROBERS; i++)
+  for (i = 0; i < n_sbcs_probers; i++)
   {
     if (!mIsActive[i])
       printf("  inactive: [%s] (i.e. confidence is too low).\r\n", mProbers[i]->GetCharSetName(0));

src/nsSBCSGroupProber.h

@@ -39,9 +39,6 @@
 #ifndef nsSBCSGroupProber_h__
 #define nsSBCSGroupProber_h__
 
-
-#define NUM_OF_SBCS_PROBERS 117
-
 class nsCharSetProber;
 class nsSBCSGroupProber: public nsCharSetProber {
 public:
@@ -63,12 +60,12 @@ public:
 #endif
 
 protected:
-  nsProbingState mState;
+  nsProbingState    mState;
-  nsCharSetProber* mProbers[NUM_OF_SBCS_PROBERS];
+  nsCharSetProber **mProbers;
-  PRBool          mIsActive[NUM_OF_SBCS_PROBERS];
+  PRBool           *mIsActive;
-  PRInt32 mBestGuess;
+  PRInt32           mBestGuess;
-  PRUint32 mActiveNum;
+  PRUint32          mActiveNum;
+  PRUint32          n_sbcs_probers;
 };
 
 #endif /* nsSBCSGroupProber_h__ */
-

src/nsSBCharSetProber-generated.h

@@ -0,0 +1,194 @@
+/* -*- Mode: C++; tab-width: 2; 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 Communicator client 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 nsSingleByteCharSetProber_generated_h__
+#define nsSingleByteCharSetProber_generated_h__
+
+#define NUM_OF_SEQUENCE_MODELS 115
+
+extern const SequenceModel Iso_8859_6ArabicModel;
+extern const SequenceModel Windows_1256ArabicModel;
+
+extern const SequenceModel Windows_1251BelarusianModel;
+extern const SequenceModel Iso_8859_5BelarusianModel;
+
+extern const SequenceModel Windows_1251BulgarianModel;
+extern const SequenceModel Iso_8859_5BulgarianModel;
+
+extern const SequenceModel Iso_8859_2CzechModel;
+extern const SequenceModel Windows_1250CzechModel;
+extern const SequenceModel Ibm852CzechModel;
+extern const SequenceModel Mac_CentraleuropeCzechModel;
+
+extern const SequenceModel Iso_8859_15DanishModel;
+extern const SequenceModel Iso_8859_1DanishModel;
+extern const SequenceModel Windows_1252DanishModel;
+extern const SequenceModel Ibm865DanishModel;
+
+extern const SequenceModel Iso_8859_1GermanModel;
+extern const SequenceModel Windows_1252GermanModel;
+
+extern const SequenceModel Iso_8859_7GreekModel;
+extern const SequenceModel Windows_1253GreekModel;
+
+extern const SequenceModel Iso_8859_1EnglishModel;
+extern const SequenceModel Windows_1252EnglishModel;
+
+extern const SequenceModel Iso_8859_3EsperantoModel;
+
+extern const SequenceModel Iso_8859_15SpanishModel;
+extern const SequenceModel Iso_8859_1SpanishModel;
+extern const SequenceModel Windows_1252SpanishModel;
+
+extern const SequenceModel Iso_8859_4EstonianModel;
+extern const SequenceModel Iso_8859_13EstonianModel;
+extern const SequenceModel Iso_8859_15EstonianModel;
+extern const SequenceModel Windows_1252EstonianModel;
+extern const SequenceModel Windows_1257EstonianModel;
+
+extern const SequenceModel Iso_8859_1FinnishModel;
+extern const SequenceModel Iso_8859_4FinnishModel;
+extern const SequenceModel Iso_8859_9FinnishModel;
+extern const SequenceModel Iso_8859_13FinnishModel;
+extern const SequenceModel Iso_8859_15FinnishModel;
+extern const SequenceModel Windows_1252FinnishModel;
+
+extern const SequenceModel Iso_8859_15FrenchModel;
+extern const SequenceModel Iso_8859_1FrenchModel;
+extern const SequenceModel Windows_1252FrenchModel;
+
+extern const SequenceModel Iso_8859_15IrishModel;
+extern const SequenceModel Iso_8859_1IrishModel;
+extern const SequenceModel Iso_8859_9IrishModel;
+extern const SequenceModel Windows_1252IrishModel;
+
+extern const SequenceModel Iso_8859_8HebrewModel;
+extern const SequenceModel Windows_1255HebrewModel;
+extern const SequenceModel Ibm862HebrewModel;
+
+
+extern const SequenceModel Iso_8859_2CroatianModel;
+extern const SequenceModel Iso_8859_13CroatianModel;
+extern const SequenceModel Iso_8859_16CroatianModel;
+extern const SequenceModel Windows_1250CroatianModel;
+extern const SequenceModel Ibm852CroatianModel;
+extern const SequenceModel Mac_CentraleuropeCroatianModel;
+
+extern const SequenceModel Iso_8859_2HungarianModel;
+extern const SequenceModel Windows_1250HungarianModel;
+
+extern const SequenceModel Iso_8859_1ItalianModel;
+extern const SequenceModel Iso_8859_3ItalianModel;
+extern const SequenceModel Iso_8859_9ItalianModel;
+extern const SequenceModel Iso_8859_15ItalianModel;
+extern const SequenceModel Windows_1252ItalianModel;
+
+extern const SequenceModel Iso_8859_4LithuanianModel;
+extern const SequenceModel Iso_8859_10LithuanianModel;
+extern const SequenceModel Iso_8859_13LithuanianModel;
+
+extern const SequenceModel Iso_8859_4LatvianModel;
+extern const SequenceModel Iso_8859_10LatvianModel;
+extern const SequenceModel Iso_8859_13LatvianModel;
+
+extern const SequenceModel Windows_1251MacedonianModel;
+extern const SequenceModel Ibm855MacedonianModel;
+extern const SequenceModel Iso_8859_5MacedonianModel;
+
+extern const SequenceModel Iso_8859_3MalteseModel;
+
+extern const SequenceModel Ibm865NorwegianModel;
+extern const SequenceModel Iso_8859_15NorwegianModel;
+extern const SequenceModel Iso_8859_1NorwegianModel;
+extern const SequenceModel Windows_1252NorwegianModel;
+
+extern const SequenceModel Iso_8859_2PolishModel;
+extern const SequenceModel Iso_8859_13PolishModel;
+extern const SequenceModel Iso_8859_16PolishModel;
+extern const SequenceModel Windows_1250PolishModel;
+extern const SequenceModel Ibm852PolishModel;
+extern const SequenceModel Mac_CentraleuropePolishModel;
+
+extern const SequenceModel Iso_8859_15PortugueseModel;
+extern const SequenceModel Iso_8859_1PortugueseModel;
+extern const SequenceModel Windows_1252PortugueseModel;
+extern const SequenceModel Iso_8859_9PortugueseModel;
+
+extern const SequenceModel Iso_8859_2RomanianModel;
+extern const SequenceModel Iso_8859_16RomanianModel;
+extern const SequenceModel Windows_1250RomanianModel;
+extern const SequenceModel Ibm852RomanianModel;
+
+extern const SequenceModel Windows_1251RussianModel;
+extern const SequenceModel Iso_8859_5RussianModel;
+extern const SequenceModel Koi8_RRussianModel;
+extern const SequenceModel Ibm855RussianModel;
+extern const SequenceModel Ibm866RussianModel;
+extern const SequenceModel Mac_CyrillicRussianModel;
+
+extern const SequenceModel Iso_8859_2SlovakModel;
+extern const SequenceModel Windows_1250SlovakModel;
+extern const SequenceModel Ibm852SlovakModel;
+extern const SequenceModel Mac_CentraleuropeSlovakModel;
+
+extern const SequenceModel Iso_8859_2SloveneModel;
+extern const SequenceModel Iso_8859_16SloveneModel;
+extern const SequenceModel Windows_1250SloveneModel;
+extern const SequenceModel Ibm852SloveneModel;
+extern const SequenceModel Mac_CentraleuropeSloveneModel;
+
+extern const SequenceModel Windows_1251SerbianModel;
+extern const SequenceModel Iso_8859_5SerbianModel;
+
+extern const SequenceModel Iso_8859_1SwedishModel;
+extern const SequenceModel Iso_8859_4SwedishModel;
+extern const SequenceModel Iso_8859_9SwedishModel;
+extern const SequenceModel Iso_8859_15SwedishModel;
+extern const SequenceModel Windows_1252SwedishModel;
+
+extern const SequenceModel Iso_8859_11ThaiModel;
+extern const SequenceModel Tis_620ThaiModel;
+
+extern const SequenceModel Iso_8859_3TurkishModel;
+extern const SequenceModel Iso_8859_9TurkishModel;
+
+extern const SequenceModel Windows_1251UkrainianModel;
+
+extern const SequenceModel Windows_1258VietnameseModel;
+extern const SequenceModel VisciiVietnameseModel;
+
+#endif /* nsSingleByteCharSetProber_generated_h__ */

src/nsSBCharSetProber.h

@@ -131,154 +131,4 @@ protected:
 
 };
 
-extern const SequenceModel Windows_1256ArabicModel;
-extern const SequenceModel Iso_8859_6ArabicModel;
-
-extern const SequenceModel Koi8_RRussianModel;
-extern const SequenceModel Windows_1251RussianModel;
-extern const SequenceModel Iso_8859_5RussianModel;
-extern const SequenceModel Mac_CyrillicRussianModel;
-extern const SequenceModel Ibm866RussianModel;
-extern const SequenceModel Ibm855RussianModel;
-
-extern const SequenceModel Iso_8859_7GreekModel;
-extern const SequenceModel Windows_1253GreekModel;
-
-extern const SequenceModel Iso_8859_5BelarusianModel;
-extern const SequenceModel Windows_1251BelarusianModel;
-
-extern const SequenceModel Iso_8859_5BulgarianModel;
-extern const SequenceModel Windows_1251BulgarianModel;
-
-extern const SequenceModel Iso_8859_2HungarianModel;
-extern const SequenceModel Windows_1250HungarianModel;
-
-extern const SequenceModel Windows_1255HebrewModel;
-extern const SequenceModel Ibm862HebrewModel;
-
-extern const SequenceModel Tis_620ThaiModel;
-extern const SequenceModel Iso_8859_11ThaiModel;
-
-extern const SequenceModel Iso_8859_15FrenchModel;
-extern const SequenceModel Iso_8859_1FrenchModel;
-extern const SequenceModel Windows_1252FrenchModel;
-
-extern const SequenceModel Iso_8859_15SpanishModel;
-extern const SequenceModel Iso_8859_1SpanishModel;
-extern const SequenceModel Windows_1252SpanishModel;
-
-extern const SequenceModel Iso_8859_1GermanModel;
-extern const SequenceModel Windows_1252GermanModel;
-
-extern const SequenceModel Iso_8859_3EsperantoModel;
-
-extern const SequenceModel Iso_8859_3TurkishModel;
-extern const SequenceModel Iso_8859_9TurkishModel;
-
-extern const SequenceModel VisciiVietnameseModel;
-extern const SequenceModel Windows_1258VietnameseModel;
-
-extern const SequenceModel Iso_8859_15DanishModel;
-extern const SequenceModel Iso_8859_1DanishModel;
-extern const SequenceModel Windows_1252DanishModel;
-extern const SequenceModel Ibm865DanishModel;
-
-extern const SequenceModel Iso_8859_1EnglishModel;
-extern const SequenceModel Windows_1252EnglishModel;
-
-extern const SequenceModel Iso_8859_13LithuanianModel;
-extern const SequenceModel Iso_8859_10LithuanianModel;
-extern const SequenceModel Iso_8859_4LithuanianModel;
-
-extern const SequenceModel Iso_8859_13LatvianModel;
-extern const SequenceModel Iso_8859_10LatvianModel;
-extern const SequenceModel Iso_8859_4LatvianModel;
-
-extern const SequenceModel Iso_8859_1PortugueseModel;
-extern const SequenceModel Iso_8859_9PortugueseModel;
-extern const SequenceModel Iso_8859_15PortugueseModel;
-extern const SequenceModel Windows_1252PortugueseModel;
-
-extern const SequenceModel Iso_8859_3MalteseModel;
-
-extern const SequenceModel Windows_1250CzechModel;
-extern const SequenceModel Iso_8859_2CzechModel;
-extern const SequenceModel Ibm852CzechModel;
-extern const SequenceModel Mac_CentraleuropeCzechModel;
-
-extern const SequenceModel Windows_1250SlovakModel;
-extern const SequenceModel Iso_8859_2SlovakModel;
-extern const SequenceModel Ibm852SlovakModel;
-extern const SequenceModel Mac_CentraleuropeSlovakModel;
-
-extern const SequenceModel Windows_1250PolishModel;
-extern const SequenceModel Iso_8859_2PolishModel;
-extern const SequenceModel Iso_8859_13PolishModel;
-extern const SequenceModel Iso_8859_16PolishModel;
-extern const SequenceModel Ibm852PolishModel;
-extern const SequenceModel Mac_CentraleuropePolishModel;
-
-extern const SequenceModel Iso_8859_1FinnishModel;
-extern const SequenceModel Iso_8859_4FinnishModel;
-extern const SequenceModel Iso_8859_9FinnishModel;
-extern const SequenceModel Iso_8859_13FinnishModel;
-extern const SequenceModel Iso_8859_15FinnishModel;
-extern const SequenceModel Windows_1252FinnishModel;
-
-extern const SequenceModel Iso_8859_1ItalianModel;
-extern const SequenceModel Iso_8859_3ItalianModel;
-extern const SequenceModel Iso_8859_9ItalianModel;
-extern const SequenceModel Iso_8859_15ItalianModel;
-extern const SequenceModel Windows_1252ItalianModel;
-
-extern const SequenceModel Windows_1250CroatianModel;
-extern const SequenceModel Iso_8859_2CroatianModel;
-extern const SequenceModel Iso_8859_13CroatianModel;
-extern const SequenceModel Iso_8859_16CroatianModel;
-extern const SequenceModel Ibm852CroatianModel;
-extern const SequenceModel Mac_CentraleuropeCroatianModel;
-
-extern const SequenceModel Windows_1252EstonianModel;
-extern const SequenceModel Windows_1257EstonianModel;
-extern const SequenceModel Iso_8859_4EstonianModel;
-extern const SequenceModel Iso_8859_13EstonianModel;
-extern const SequenceModel Iso_8859_15EstonianModel;
-
-extern const SequenceModel Iso_8859_15IrishModel;
-extern const SequenceModel Iso_8859_9IrishModel;
-extern const SequenceModel Iso_8859_1IrishModel;
-extern const SequenceModel Windows_1252IrishModel;
-
-extern const SequenceModel Windows_1250RomanianModel;
-extern const SequenceModel Iso_8859_2RomanianModel;
-extern const SequenceModel Iso_8859_16RomanianModel;
-extern const SequenceModel Ibm852RomanianModel;
-
-extern const SequenceModel Windows_1250SloveneModel;
-extern const SequenceModel Iso_8859_2SloveneModel;
-extern const SequenceModel Iso_8859_16SloveneModel;
-extern const SequenceModel Ibm852SloveneModel;
-extern const SequenceModel Mac_CentraleuropeSloveneModel;
-
-extern const SequenceModel Iso_8859_1SwedishModel;
-extern const SequenceModel Iso_8859_4SwedishModel;
-extern const SequenceModel Iso_8859_9SwedishModel;
-extern const SequenceModel Iso_8859_15SwedishModel;
-extern const SequenceModel Windows_1252SwedishModel;
-
-extern const SequenceModel Iso_8859_15NorwegianModel;
-extern const SequenceModel Iso_8859_1NorwegianModel;
-extern const SequenceModel Windows_1252NorwegianModel;
-extern const SequenceModel Ibm865NorwegianModel;
-
-extern const SequenceModel Windows_1251UkrainianModel;
-
-extern const SequenceModel Windows_1251SerbianModel;
-extern const SequenceModel Iso_8859_5SerbianModel;
-
-extern const SequenceModel Windows_1251MacedonianModel;
-extern const SequenceModel Ibm855MacedonianModel;
-extern const SequenceModel Iso_8859_5MacedonianModel;
-
-
 #endif /* nsSingleByteCharSetProber_h__ */